diff options
| author | 2020-12-12 20:00:04 -0500 | |
|---|---|---|
| committer | 2020-12-12 20:00:04 -0500 | |
| commit | 2c63fde1d0c5ef63daa9351a6e549386ce617a48 (patch) | |
| tree | f1ced5194317220aff3404a4232d8df9dd9c8c5d /scripts/toolchain.lua | |
| parent | 95c64299888cf365c20a3b7da1c0b717cd4e050b (diff) | |
Add macosx_arm64_clang target support [R. Belmont, Miodrag Milanovic]
Diffstat (limited to 'scripts/toolchain.lua')
| -rw-r--r-- | scripts/toolchain.lua | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 3eb2acf0e0b..e8f1c3caa31 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -1054,27 +1054,39 @@ function toolchain(_buildDir, _subDir) configuration { "pnacl", "Release" } libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" } - configuration { "osx*", "x32" } + configuration { "osx*", "x32", "not arm64" } objdir (_buildDir .. "osx_clang" .. "/obj") buildoptions { "-m32", } - configuration { "osx*", "x32", "Release" } + configuration { "osx*", "x32", "not arm64", "Release" } targetdir (_buildDir .. "osx_clang" .. "/bin/x32/Release") - configuration { "osx*", "x32", "Debug" } + configuration { "osx*", "x32", "not arm64", "Debug" } targetdir (_buildDir .. "osx_clang" .. "/bin/x32/Debug") - configuration { "osx*", "x64" } + configuration { "osx*", "x64", "not arm64" } objdir (_buildDir .. "osx_clang" .. "/obj") buildoptions { "-m64", "-DHAVE_IMMINTRIN_H=1", } - configuration { "osx*", "x64", "Release" } + configuration { "osx*", "x64", "not arm64", "Release" } targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release") - configuration { "osx*", "x64", "Debug" } + configuration { "osx*", "x64", "not arm64", "Debug" } + targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug") + + configuration { "osx*", "arm64" } + objdir (_buildDir .. "osx_clang" .. "/obj") + buildoptions { + "-m64", "-DHAVE_IMMINTRIN_H=0", "-DSDL_DISABLE_IMMINTRIN_H=1", "-DHAVE_SSE=0" + } + + configuration { "osx*", "arm64", "Release" } + targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release") + + configuration { "osx*", "arm64", "Debug" } targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug") configuration { "ios-arm" } |
