Cleanup.

bkaradzic · Dec 16, 2024 · bcaffd4 · bcaffd4
1 parent 336cb9f
commit bcaffd4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 69 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,10 +14,10 @@ jobs:
       fail-fast: true
       matrix:
         include: [
-          { config: Debug, platform: Win32, bindir: 'win32_vs2019' },
-          { config: Debug, platform: x64, bindir: 'win64_vs2019' },
-          { config: Release, platform: Win32, bindir: 'win32_vs2019' },
-          { config: Release, platform: x64, bindir: 'win64_vs2019' },
+          { config: Debug, platform: Win32, bindir: 'win32_vs2022' },
+          { config: Debug, platform: x64, bindir: 'win64_vs2022' },
+          { config: Release, platform: Win32, bindir: 'win32_vs2022' },
+          { config: Release, platform: x64, bindir: 'win64_vs2022' },
         ]
     name: msvc-${{ matrix.config }}-${{ matrix.platform }}
     runs-on: windows-2022
@@ -42,8 +42,8 @@ jobs:
         shell: cmd
         run: |
           cd bgfx
-          ..\bx\tools\bin\windows\genie.exe --with-tools --with-combined-examples --with-shared-lib vs2019
-          msbuild ".build/projects/vs2019/bgfx.sln" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
+          ..\bx\tools\bin\windows\genie.exe --with-tools --with-combined-examples --with-shared-lib vs2022
+          msbuild ".build/projects/vs2022/bgfx.sln" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
       - name: Check
         shell: cmd
         run: |

diff --git a/makefile b/makefile
@@ -36,35 +36,22 @@ clean: ## Clean all intermediate files.
 	@mkdir .build
 
 projgen: ## Generate project files for all configurations.
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib                       vs2019
+	$(GENIE) --with-tools --with-combined-examples --with-shared-lib                       vs2022
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-gcc       gmake
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-clang     gmake
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-gcc       gmake
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=linux-clang     gmake
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-x64         gmake
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-arm64       gmake
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --xcode=osx           xcode9
 	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --xcode=ios           xcode9
-	$(GENIE)              --with-combined-examples --with-shared-lib --gcc=android-arm     gmake
 	$(GENIE)              --with-combined-examples --with-shared-lib --gcc=android-arm64   gmake
-	$(GENIE)              --with-combined-examples --with-shared-lib --gcc=android-x86     gmake
-	$(GENIE)              --with-combined-examples --with-shared-lib --gcc=android-x86_64  gmake
-	$(GENIE)              --with-combined-examples                   --gcc=ios-arm         gmake
 	$(GENIE)              --with-combined-examples                   --gcc=ios-arm64       gmake
 	$(GENIE)              --with-combined-examples                   --gcc=rpi             gmake
 
 idl: ## Generate code from IDL.
 	@echo Generating code from IDL.
 	cd scripts && ../$(GENIE) idl
 
-.build/projects/gmake-android-arm:
-	$(GENIE) --gcc=android-arm --with-combined-examples --with-shared-lib gmake
-android-arm-debug: .build/projects/gmake-android-arm ## Build - Android ARM Debug
-	$(MAKE) -R -C .build/projects/gmake-android-arm config=debug
-android-arm-release: .build/projects/gmake-android-arm ## Build - Android ARM Release
-	$(MAKE) -R -C .build/projects/gmake-android-arm config=release
-android-arm: android-arm-debug android-arm-release ## Build - Android ARM Debug and Release
-
 .build/projects/gmake-android-arm64:
 	$(GENIE) --gcc=android-arm64 --with-combined-examples --with-shared-lib gmake
 android-arm64-debug: .build/projects/gmake-android-arm64 ## Build - Android ARM64 Debug
@@ -73,22 +60,6 @@ android-arm64-release: .build/projects/gmake-android-arm64 ## Build - Android AR
 	$(MAKE) -R -C .build/projects/gmake-android-arm64 config=release
 android-arm64: android-arm64-debug android-arm64-release ## Build - Android ARM64 Debug and Release
 
-.build/projects/gmake-android-x86:
-	$(GENIE) --gcc=android-x86 --with-combined-examples --with-shared-lib gmake
-android-x86-debug: .build/projects/gmake-android-x86 ## Build - Android x86 Debug and Release
-	$(MAKE) -R -C .build/projects/gmake-android-x86 config=debug
-android-x86-release: .build/projects/gmake-android-x86 ## Build - Android x86 Debug and Release
-	$(MAKE) -R -C .build/projects/gmake-android-x86 config=release
-android-x86: android-x86-debug android-x86-release ## Build - Android x86 Debug and Release
-
-.build/projects/gmake-android-x86_64:
-	$(GENIE) --gcc=android-x86_64 --with-combined-examples --with-shared-lib gmake
-android-x86_64-debug: .build/projects/gmake-android-x86_64 ## Build - Android x86_64 Debug and Release
-	$(MAKE) -R -C .build/projects/gmake-android-x86_64 config=debug
-android-x86_64-release: .build/projects/gmake-android-x86_64 ## Build - Android x86_64 Debug and Release
-	$(MAKE) -R -C .build/projects/gmake-android-x86_64 config=release
-android-x86_64: android-x86_64-debug android-x86_64-release ## Build - Android x86_64 Debug and Release
-
 .build/projects/gmake-wasm:
 	$(GENIE) --gcc=wasm --with-combined-examples gmake
 wasm-debug: .build/projects/gmake-wasm ## Build - Emscripten Debug
@@ -137,47 +108,28 @@ mingw-clang-release64: .build/projects/gmake-mingw-clang ## Build - MinGW Clang
 	$(MAKE) -R -C .build/projects/gmake-mingw-clang config=release64
 mingw-clang: mingw-clang-debug32 mingw-clang-release32 mingw-clang-debug64 mingw-clang-release64 ## Build - MinGW Clang x86/x64 Debug and Release
 
-.build/projects/vs2019:
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2019
-vs2019-debug32: .build/projects/vs2019 ## Build - vs2019 x86 Debug
-	devenv .build/projects/vs2019/bgfx.sln /Build "Debug|Win32"
-vs2019-release32: .build/projects/vs2019 ## Build - vs2019 x86 Release
-	devenv .build/projects/vs2019/bgfx.sln /Build "Release|Win32"
-vs2019-debug64: .build/projects/vs2019 ## Build - vs2019 x64 Debug
-	devenv .build/projects/vs2019/bgfx.sln /Build "Debug|x64"
-vs2019-release64: .build/projects/vs2019 ## Build - vs2019 x64 Release
-	devenv .build/projects/vs2019/bgfx.sln /Build "Release|x64"
-vs2019: vs2019-debug32 vs2019-release32 vs2019-debug64 vs2019-release64 ## Build - vs2019 x86/x64 Debug and Release
-
-.build/projects/gmake-osx-x64:
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-x64 gmake
-.build/projects/gmake-osx-arm64:
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-arm64 gmake
-
-osx-debug: osx-x64-debug osx-arm64-debug ## Build - macOS Universal Debug
-osx-release: osx-x64-release osx-arm64-release ## Build - macOS Universal Release
+.build/projects/vs2022:
+	$(GENIE) --with-tools --with-combined-examples --with-shared-lib vs2022
+vs2022-debug32: .build/projects/vs2022 ## Build - vs2022 x86 Debug
+	devenv .build/projects/vs2022/bgfx.sln /Build "Debug|Win32"
+vs2022-release32: .build/projects/vs2022 ## Build - vs2022 x86 Release
+	devenv .build/projects/vs2022/bgfx.sln /Build "Release|Win32"
+vs2022-debug64: .build/projects/vs2022 ## Build - vs2022 x64 Debug
+	devenv .build/projects/vs2022/bgfx.sln /Build "Debug|x64"
+vs2022-release64: .build/projects/vs2022 ## Build - vs2022 x64 Release
+	devenv .build/projects/vs2022/bgfx.sln /Build "Release|x64"
+vs2022: vs2022-debug32 vs2022-release32 vs2022-debug64 vs2022-release64 ## Build - vs2022 x86/x64 Debug and Release
+
+osx-debug: osx-arm64-debug ## Build - macOS Universal Debug
+osx-release: osx-arm64-release ## Build - macOS Universal Release
 osx: osx-debug osx-release ## Build - macOS Universal Debug and Release
 
-osx-x64-debug: .build/projects/gmake-osx-x64 ## Build - macOS x64 Debug
-	$(MAKE) -C .build/projects/gmake-osx-x64 config=debug
-osx-x64-release: .build/projects/gmake-osx-x64 ## Build - macOS x64 Release
-	$(MAKE) -C .build/projects/gmake-osx-x64 config=release
-osx-x64: osx-x64-debug osx-x64-release ## Build - macOS x64 Debug and Release
-
 osx-arm64-debug: .build/projects/gmake-osx-arm64 ## Build - macOS ARM Debug
 	$(MAKE) -C .build/projects/gmake-osx-arm64 config=debug
 osx-arm64-release: .build/projects/gmake-osx-arm64 ## Build - macOS ARM Release
 	$(MAKE) -C .build/projects/gmake-osx-arm64 config=release
 osx-arm64: osx-arm64-debug osx-arm64-release ## Build - macOS ARM Debug and Release
 
-.build/projects/gmake-ios-arm:
-	$(GENIE) --gcc=ios-arm gmake
-ios-arm-debug: .build/projects/gmake-ios-arm ## Build - iOS ARM Debug
-	$(MAKE) -R -C .build/projects/gmake-ios-arm config=debug
-ios-arm-release: .build/projects/gmake-ios-arm ## Build - iOS ARM Release
-	$(MAKE) -R -C .build/projects/gmake-ios-arm config=release
-ios-arm: ios-arm-debug ios-arm-release ## Build - iOS ARM Debug and Release
-
 .build/projects/gmake-ios-arm64:
 	$(GENIE) --gcc=ios-arm64 gmake
 ios-arm64-debug: .build/projects/gmake-ios-arm64 ## Build - iOS ARM64 Debug