From b6d6abe8a0d21084a52f187fff0d6e4a2b522588 Mon Sep 17 00:00:00 2001 From: T-rvw <429601557@qq.com> Date: Thu, 11 Jan 2024 12:30:22 +0800 Subject: [PATCH] remove vs2019 ci and adjust 3rd build process --- .github/workflows/win64_vs2019_msvc.yml | 32 ------------------------- Engine/Auto/MakeThirdParty_Windows.bat | 14 +++++------ MakeEngine_vs2019.bat | 15 ------------ MakeEngine_vs2022_android.bat | 17 ------------- MakeThirdParty_vs2019.bat | 10 -------- MakeThirdParty_vs2022-clang.bat | 4 ++++ MakeThirdParty_vs2022.bat | 4 ++++ 7 files changed, 15 insertions(+), 81 deletions(-) delete mode 100644 .github/workflows/win64_vs2019_msvc.yml delete mode 100644 MakeEngine_vs2019.bat delete mode 100644 MakeEngine_vs2022_android.bat delete mode 100644 MakeThirdParty_vs2019.bat diff --git a/.github/workflows/win64_vs2019_msvc.yml b/.github/workflows/win64_vs2019_msvc.yml deleted file mode 100644 index afff21d2..00000000 --- a/.github/workflows/win64_vs2019_msvc.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: win64_vs2019_msvc - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build-engine: - runs-on: windows-2019 - - steps: - - name: Checkout repository - uses: actions/checkout@v3.2.0 - with: - submodules: recursive - - - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.1 - - - name: Make 3rdParty - run: ${{github.workspace}}/MakeThirdParty_vs2019.bat - - - name: Make Engine - run: ${{github.workspace}}/MakeEngine_vs2019.bat - - - name: Build Debugx64 - run: msbuild ${{github.workspace}}/CatDogEngine.sln /p:Configuration=Debug /p:Platform=x64 - - - name: Build Releasex64 - run: msbuild ${{github.workspace}}/CatDogEngine.sln /p:Configuration=Release /p:Platform=x64 diff --git a/Engine/Auto/MakeThirdParty_Windows.bat b/Engine/Auto/MakeThirdParty_Windows.bat index 8bb81632..91d7496a 100644 --- 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 deleted file mode 100644 index 3ab073d3..00000000 --- a/MakeEngine_vs2019.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off - -Set BUILD_IDE_NAME=vs2019 -Set CMAKE_IDE_FULL_NAME="Visual Studio 16 2019" - -if exist "./Engine/Auto/commercial_sdk_locations.bat" ( - call "./Engine/Auto/commercial_sdk_locations.bat" -) else ( - echo commercial_sdk_locations does not exist, skipped -) - -cd "./Engine/Auto/Scripts" -"../Programs/Windows/premake5.exe" "vs2019" - -pause \ No newline at end of file diff --git a/MakeEngine_vs2022_android.bat b/MakeEngine_vs2022_android.bat deleted file mode 100644 index 15a07277..00000000 --- a/MakeEngine_vs2022_android.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off - -Set BUILD_IDE_NAME=vs2022_android -Set CD_PLATFORM=Android -Set CMAKE_IDE_FULL_NAME="Visual Studio 17 2022" - -if exist "./Engine/Auto/commercial_sdk_locations.bat" ( - call "./Engine/Auto/commercial_sdk_locations.bat" -) else ( - echo commercial_sdk_locations does not exist, skipped -) - -cd "./Engine/Auto/Scripts" -Set USE_CLANG_TOOLSET=1 -"../Programs/Windows/premake5.exe" --os=android vs2022 - -pause \ No newline at end of file diff --git a/MakeThirdParty_vs2019.bat b/MakeThirdParty_vs2019.bat deleted file mode 100644 index f10e472c..00000000 --- a/MakeThirdParty_vs2019.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off - -Set ROOT_PATH=%~dp0 -Set BGFX_BUILD_OPTIONS=vs2019 -Set CMAKE_IDE_FULL_NAME="Visual Studio 16 2019" - -rem VS_VERSION will be used inside assimp makefile -Set VS_VERSION=vs2019 - -call ./Engine/Auto/MakeThirdParty_Windows.bat \ No newline at end of file diff --git a/MakeThirdParty_vs2022-clang.bat b/MakeThirdParty_vs2022-clang.bat index 2217b4c0..f285fe31 100644 --- 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 \ No newline at end of file diff --git a/MakeThirdParty_vs2022.bat b/MakeThirdParty_vs2022.bat index de0c6639..cdfa9bd2 100644 --- 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 \ No newline at end of file