Cleanup.

bkaradzic · Dec 16, 2024 · 3b63b47 · 3b63b47
1 parent bcaffd4
commit 3b63b47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -142,7 +142,7 @@ jobs:
           { config: debug, binsuffix: Debug },
           { config: release, binsuffix: Release },
         ]
-    name: osx-x64-${{ matrix.config }}
+    name: osx-arm64-${{ matrix.config }}
     runs-on: macos-14
     steps:
       - name: Checkout bgfx
@@ -162,14 +162,14 @@ jobs:
       - name: Build
         run: |
           cd bgfx
-          make -j$(sysctl -n hw.physicalcpu) osx-x64-${{ matrix.config }}
+          make -j$(sysctl -n hw.physicalcpu) osx-arm64-${{ matrix.config }}
       - name: Check
         run: |
           cd bgfx
-          ls -lash ".build/osx-x64/bin"
-          ".build/osx-x64/bin/geometryc${{ matrix.binsuffix}}" --version
-          ".build/osx-x64/bin/shaderc${{ matrix.binsuffix}}" --version
-          ".build/osx-x64/bin/texturec${{ matrix.binsuffix}}" --version
+          ls -lash ".build/osx-arm64/bin"
+          ".build/osx-arm64/bin/geometryc${{ matrix.binsuffix}}" --version
+          ".build/osx-arm64/bin/shaderc${{ matrix.binsuffix}}" --version
+          ".build/osx-arm64/bin/texturec${{ matrix.binsuffix}}" --version
   android:
     strategy:
       fail-fast: true

diff --git a/makefile b/makefile
@@ -85,7 +85,7 @@ linux-clang-release64: .build/projects/gmake-linux-clang ## Build - Linux Clang
 linux-clang: linux-clang-debug64 linux-clang-release64 ## Build - Linux Clang x86/x64 Debug and Release
 
 .build/projects/gmake-mingw-gcc:
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --os=windows --gcc=mingw-gcc gmake
+	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-gcc gmake
 mingw-gcc-debug32: .build/projects/gmake-mingw-gcc ## Build - MinGW GCC x86 Debug
 	$(MAKE) -R -C .build/projects/gmake-mingw-gcc config=debug32
 mingw-gcc-release32: .build/projects/gmake-mingw-gcc ## Build - MinGW GCC x86 Release
@@ -97,7 +97,7 @@ mingw-gcc-release64: .build/projects/gmake-mingw-gcc ## Build - MinGW GCC x64 Re
 mingw-gcc: mingw-gcc-debug32 mingw-gcc-release32 mingw-gcc-debug64 mingw-gcc-release64 ## Build - MinGW GCC x86/x64 Debug and Release
 
 .build/projects/gmake-mingw-clang:
-	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --os=windows --gcc=mingw-clang gmake
+	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=mingw-clang gmake
 mingw-clang-debug32: .build/projects/gmake-mingw-clang ## Build - MinGW Clang x86 Debug
 	$(MAKE) -R -C .build/projects/gmake-mingw-clang config=debug32
 mingw-clang-release32: .build/projects/gmake-mingw-clang ## Build - MinGW Clang x86 Release
@@ -120,10 +120,8 @@ 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
-
+.build/projects/gmake-osx-arm64:
+	$(GENIE) --with-tools --with-combined-examples --with-shared-lib --gcc=osx-arm64 gmake
 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