Update version to macosx 11 for runtime.
Sorry for the churn in the premake file, someone didn't use the right formatter in a previous commit.
We had to bump to 11 for this:
```
../../../../../../pls/renderer/metal/background_shader_compiler.mm:215:42: error: 'MTLLanguageVersion2_3' is only available on macOS 11.0 or newer [-Werror,-Wunguarded-availability-new]
compileOptions.languageVersion = MTLLanguageVersion2_3; // On mac, we need version 2.3+
^~~~~~~~~~~~~~~~~~~~~
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk/System/Library/Frameworks/Metal.framework/Headers/MTLLibrary.h:190:5: note: 'MTLLanguageVersion2_3' has been marked as being introduced in macOS 11.0 here, but the deployment target is macOS 10.6.0
MTLLanguageVersion2_3 API_AVAILABLE(macos(11.0), ios(14.0)) = (2 << 16) + 3,
^
../../../../../../pls/renderer/metal/background_shader_compiler.mm:215:42: note: enclose 'MTLLanguageVersion2_3' in an @available check to silence this warning
compileOptions.languageVersion = MTLLanguageVersion2_3; // On mac, we need version 2.3+
^~~~~~~~~~~~~~~~~~~~~
../../../../../../pls/renderer/metal/background_shader_compiler.mm:220:28: error: 'setPreserveInvariance:' is only available on macOS 11.0 or newer [-Werror,-Wunguarded-availability-new]
compileOptions.preserveInvariance = YES;
```
Diffs=
e75b8fa63 Update version to macosx 11 for runtime. (#7829)
Co-authored-by: Luigi Rosso <luigi-rosso@users.noreply.github.com>
diff --git a/.rive_head b/.rive_head
index 27941d2..1b18626 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-55de8286c5ba680de950a3a0aac26e13bb890d6b
+e75b8fa633a4f8eb102e669ac1308b1d1151fed1
diff --git a/build/rive_build_config.lua b/build/rive_build_config.lua
index 55ebd5c..9e2a7bf 100644
--- a/build/rive_build_config.lua
+++ b/build/rive_build_config.lua
@@ -1,9 +1,9 @@
if _ACTION == 'ninja' then
- require "ninja"
+ require('ninja')
end
if _ACTION == 'export-compile-commands' then
- require "export-compile-commands"
+ require('export-compile-commands')
end
workspace('rive')
@@ -409,12 +409,16 @@
if os.host() == 'macosx' then
iphoneos_sysroot = os.outputof('xcrun --sdk iphoneos --show-sdk-path')
if iphoneos_sysroot == nil then
- error('Unable to locate iphoneos sdk. Please ensure Xcode Command Line Tools are installed.')
+ error(
+ 'Unable to locate iphoneos sdk. Please ensure Xcode Command Line Tools are installed.'
+ )
end
iphonesimulator_sysroot = os.outputof('xcrun --sdk iphonesimulator --show-sdk-path')
if iphonesimulator_sysroot == nil then
- error('Unable to locate iphonesimulator sdk. Please ensure Xcode Command Line Tools are installed.')
+ error(
+ 'Unable to locate iphonesimulator sdk. Please ensure Xcode Command Line Tools are installed.'
+ )
end
filter('system:ios')
@@ -445,6 +449,21 @@
buildoptions({ '-fobjc-arc' })
end
+ filter({ 'system:macosx' })
+ do
+ buildoptions({
+ '-mmacosx-version-min=11.0',
+ })
+ end
+
+ filter({ 'system:macosx', 'options:arch=host', 'action:xcode4' })
+ do
+ -- xcode tries to specify a target...
+ buildoptions({
+ '--target=' .. os.outputof('uname -m') .. '-apple-macos11.0',
+ })
+ end
+
filter({ 'system:macosx', 'options:arch=arm64 or arch=universal' })
do
buildoptions({ '-arch arm64' })