diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index a77044ee..d350cad1 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -15,14 +15,14 @@ jobs: platform: - macOS xcode: - - ^11 + - ^15 configuration: - Debug - Release type: - Editor - Game_macOS - runs-on: macos-11 + runs-on: macos-13 steps: - uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0 diff --git a/ThirdParty/Lib/BGFX/macOS/Debug/libbgfxDebug.a b/ThirdParty/Lib/BGFX/macOS/Debug/libbgfxDebug.a index 29452433..c3943f22 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Debug/libbgfxDebug.a and b/ThirdParty/Lib/BGFX/macOS/Debug/libbgfxDebug.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Debug/libbimgDebug.a b/ThirdParty/Lib/BGFX/macOS/Debug/libbimgDebug.a index 602fe937..e8d610ff 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Debug/libbimgDebug.a and b/ThirdParty/Lib/BGFX/macOS/Debug/libbimgDebug.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_decodeDebug.a b/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_decodeDebug.a index e5755687..1a04ae25 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_decodeDebug.a and b/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_decodeDebug.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_encodeDebug.a b/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_encodeDebug.a index a952ac3e..7da83ad8 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_encodeDebug.a and b/ThirdParty/Lib/BGFX/macOS/Debug/libbimg_encodeDebug.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Debug/libbxDebug.a b/ThirdParty/Lib/BGFX/macOS/Debug/libbxDebug.a index 342897f0..4888edfa 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Debug/libbxDebug.a and b/ThirdParty/Lib/BGFX/macOS/Debug/libbxDebug.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Release/libbgfxRelease.a b/ThirdParty/Lib/BGFX/macOS/Release/libbgfxRelease.a index 072adf17..6388dc51 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Release/libbgfxRelease.a and b/ThirdParty/Lib/BGFX/macOS/Release/libbgfxRelease.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Release/libbimgRelease.a b/ThirdParty/Lib/BGFX/macOS/Release/libbimgRelease.a index c7f93aa5..7f5c4876 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Release/libbimgRelease.a and b/ThirdParty/Lib/BGFX/macOS/Release/libbimgRelease.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Release/libbimg_decodeRelease.a b/ThirdParty/Lib/BGFX/macOS/Release/libbimg_decodeRelease.a index bb524d7b..c02f4914 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Release/libbimg_decodeRelease.a and b/ThirdParty/Lib/BGFX/macOS/Release/libbimg_decodeRelease.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Release/libbimg_encodeRelease.a b/ThirdParty/Lib/BGFX/macOS/Release/libbimg_encodeRelease.a index e7fe2b0e..d63cb76e 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Release/libbimg_encodeRelease.a and b/ThirdParty/Lib/BGFX/macOS/Release/libbimg_encodeRelease.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a b/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a index 6f5aaca0..5b1767d5 100644 Binary files a/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a and b/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a differ diff --git a/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a.2NDHKU b/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a.2NDHKU deleted file mode 100644 index 1fc7ce24..00000000 Binary files a/ThirdParty/Lib/BGFX/macOS/Release/libbxRelease.a.2NDHKU and /dev/null differ diff --git a/ThirdParty/UltralightSDK b/ThirdParty/UltralightSDK index cdeccfa3..a286eb52 160000 --- a/ThirdParty/UltralightSDK +++ b/ThirdParty/UltralightSDK @@ -1 +1 @@ -Subproject commit cdeccfa38f01acdd062c496b792f60d454eb2384 +Subproject commit a286eb525b37987bf2032e22e4c897ce2d004d82 diff --git a/Tools/BaseProject.sharpmake.cs b/Tools/BaseProject.sharpmake.cs index 87c8c8ef..e75f77d9 100644 --- a/Tools/BaseProject.sharpmake.cs +++ b/Tools/BaseProject.sharpmake.cs @@ -178,6 +178,7 @@ public virtual void ConfigureMac(Configuration conf, CommonTarget target) conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("CoreVideo")); //conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Foundation")); conf.Options.Add(new Options.XCode.Compiler.SystemFrameworks("Quartz")); + conf.Options.Add(new Options.XCode.Compiler.OnlyActiveArch()); conf.Defines.Add("DEFINE_ME_PLATFORM_MACOS"); diff --git a/Tools/macOS/shaderc b/Tools/macOS/shaderc index c1854cb9..ccc0665f 100755 Binary files a/Tools/macOS/shaderc and b/Tools/macOS/shaderc differ diff --git a/Tools/macOS/shadercDebug b/Tools/macOS/shadercDebug new file mode 100755 index 00000000..f8115a40 Binary files /dev/null and b/Tools/macOS/shadercDebug differ diff --git a/Tools/macOS/texturec b/Tools/macOS/texturec index 30d4f749..6b3c0299 100755 Binary files a/Tools/macOS/texturec and b/Tools/macOS/texturec differ diff --git a/Tools/macOS/texturecDebug b/Tools/macOS/texturecDebug new file mode 100755 index 00000000..b988b008 Binary files /dev/null and b/Tools/macOS/texturecDebug differ