remove vs2019 ci and adjust 3rd build process

meta4d-me · Jan 11, 2024 · b6d6abe · b6d6abe
1 parent 1aa85d0
commit b6d6abe
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 81 deletions.
diff --git a/.github/workflows/win64_vs2019_msvc.yml b/.github/workflows/win64_vs2019_msvc.yml
diff --git a/Engine/Auto/MakeThirdParty_Windows.bat b/Engine/Auto/MakeThirdParty_Windows.bat
@@ -25,9 +25,9 @@ echo [ SDL ] Start making project...
 cd sdl
 if not exist build mkdir build
 cd build
-%CMAKE_EXE% .. -G %CMAKE_IDE_FULL_NAME% %CMAKE_TOOLSET_OPTION% -DSDL_FORCE_STATIC_VCRT=ON -D CMAKE_CONFIGURATION_TYPES="Debug;Release"
-start /b %CMAKE_EXE% --build . --config Debug
-start /b %CMAKE_EXE% --build . --config Release
+%CMAKE_EXE% .. -G %CMAKE_IDE_FULL_NAME% %CMAKE_TOOLSET_OPTION% -DSDL_FORCE_STATIC_VCRT=ON -D CMAKE_CONFIGURATION_TYPES="%CD_BUILD_TYPE%"
+if "%CD_BUILD_TYPE%" EQU "Debug" start /b %CMAKE_EXE% --build . --config Debug
+if "%CD_BUILD_TYPE%" EQU "Release" start /b %CMAKE_EXE% --build . --config Release
 cd %ThirdPartyProjectsPath%
 echo\
 
@@ -36,8 +36,8 @@ cd freetype
 if not exist build mkdir build
 cd build
 %CMAKE_EXE% .. -G %CMAKE_IDE_FULL_NAME% %CMAKE_TOOLSET_OPTION% -DCMAKE_CXX_FLAGS="/MT"
-start /b %CMAKE_EXE% --build . --config Debug
-start /b %CMAKE_EXE% --build . --config Release
+if "%CD_BUILD_TYPE%" EQU "Debug" start /b %CMAKE_EXE% --build . --config Debug
+if "%CD_BUILD_TYPE%" EQU "Release" start /b %CMAKE_EXE% --build . --config Release
 cd %ThirdPartyProjectsPath%
 echo\
 
@@ -53,8 +53,8 @@ if "%VS_VERSION%" EQU "vs2022" (
 )
 
 cd %MSBUILD_FOLDER%
-"%MSBUILD_PATH%" -m %ThirdPartyProjectsPath%/AssetPipeline/AssetPipeline.sln /p:Configuration=Debug /p:Platform=x64
-"%MSBUILD_PATH%" -m %ThirdPartyProjectsPath%/AssetPipeline/AssetPipeline.sln /p:Configuration=Release /p:Platform=x64
+if "%CD_BUILD_TYPE%" EQU "Debug" "%MSBUILD_PATH%" -m %ThirdPartyProjectsPath%/AssetPipeline/AssetPipeline.sln /p:Configuration=Debug /p:Platform=x64
+if "%CD_BUILD_TYPE%" EQU "Release" "%MSBUILD_PATH%" -m %ThirdPartyProjectsPath%/AssetPipeline/AssetPipeline.sln /p:Configuration=Release /p:Platform=x64
 cd %ThirdPartyProjectsPath%
 echo\
 

diff --git a/MakeEngine_vs2019.bat b/MakeEngine_vs2019.bat
diff --git a/MakeEngine_vs2022_android.bat b/MakeEngine_vs2022_android.bat
diff --git a/MakeThirdParty_vs2019.bat b/MakeThirdParty_vs2019.bat
diff --git a/MakeThirdParty_vs2022-clang.bat b/MakeThirdParty_vs2022-clang.bat
@@ -11,4 +11,8 @@ rem Enable Clang toolsets
 Set USE_CLANG_TOOLSET=1
 Set CMAKE_TOOLSET_OPTION=-T ClangCL
 
+Set CD_BUILD_TYPE=Debug
+call ./Engine/Auto/MakeThirdParty_Windows.bat
+
+Set CD_BUILD_TYPE=Release
 call ./Engine/Auto/MakeThirdParty_Windows.bat
diff --git a/MakeThirdParty_vs2022.bat b/MakeThirdParty_vs2022.bat
@@ -7,4 +7,8 @@ Set CMAKE_IDE_FULL_NAME="Visual Studio 17 2022"
 rem VS_VERSION will be used inside assimp makefile
 Set VS_VERSION=vs2022
 
+Set CD_BUILD_TYPE=Debug
+call ./Engine/Auto/MakeThirdParty_Windows.bat
+
+Set CD_BUILD_TYPE=Release
 call ./Engine/Auto/MakeThirdParty_Windows.bat