MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

partial update to build with vs2022

develop
Kelly Kinkade 2022-12-07 12:17:31 -06:00
parent e1330a602e
commit 3552269b46
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
Unescape Escape View File

@ -61,8 +61,8 @@ if(UNIX)
endif()
if(WIN32)
if((NOT MSVC) OR (MSVC_VERSION LESS 1900) OR (MSVC_VERSION GREATER 1919))
message(SEND_ERROR "MSVC 2015 or 2017 is required")
if((NOT MSVC) OR (MSVC_VERSION LESS 1930) OR (MSVC_VERSION GREATER 1934))
message(SEND_ERROR "MSVC 2022 is required")
endif()
endif()

1
build/.gitignore vendored
Unescape Escape View File

@ -1,6 +1,7 @@
VC2010
VC2015
VC2015_32
VC2022
DF_PATH.txt
_CPack_Packages
*.tar.*

4
build/win64/build-debug.bat
Unescape Escape View File

@ -1,4 +1,4 @@
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
cd VC2015
call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
cd VC2022
msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
cd ..

6
build/win64/generate-MSVC-all.bat
Unescape Escape View File

@ -1,6 +1,6 @@
IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
mkdir VC2015
cd VC2015
mkdir VC2022
cd VC2022
echo generating a build folder
cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1

2
build/win64/generate-MSVC-gui.bat
Unescape Escape View File

@ -3,5 +3,5 @@ IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
mkdir VC2015
cd VC2015
echo Pre-generating a build folder
cmake ..\..\.. -G"Visual Studio 14 Win64" -T v140_xp -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
cmake ..\..\.. -G"Visual Studio 17" -A x64 -T v190 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
cmake-gui .

2
library/xml

@ -1 +1 @@
Subproject commit a446b5c957d9106785e584d2d78760d5e40e06da
Subproject commit cc7c6b149d9c0916aafa36702879700cd24aed68