diff options
author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2024-06-17 18:21:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-17 18:21:10 +0200 |
commit | effada6b452472f001bd0bb5b3b6b828343760be (patch) | |
tree | 89cfbaf0db40ede5a4ca5a0e1aff64db6c14ab9f /tools/cmake.py | |
parent | 44ee53715d1645b8d14cf8a28f1822981e5628eb (diff) | |
parent | 26bc56f934fc11ca3e213ca2d12dc4977e42d192 (diff) | |
download | fork-godot-webrtc-native-effada6b452472f001bd0bb5b3b6b828343760be.tar.gz fork-godot-webrtc-native-effada6b452472f001bd0bb5b3b6b828343760be.tar.bz2 fork-godot-webrtc-native-effada6b452472f001bd0bb5b3b6b828343760be.zip |
Merge pull request #148 from Faless/build/better_macos_ios_targets
[SCons] Improve CMake and OpenSSL macOS/iOS targets
Diffstat (limited to 'tools/cmake.py')
-rw-r--r-- | tools/cmake.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/cmake.py b/tools/cmake.py index 2911011..3ab7921 100644 --- a/tools/cmake.py +++ b/tools/cmake.py @@ -49,10 +49,9 @@ def cmake_default_flags(env): config["CMAKE_OSX_ARCHITECTURES"] = '"x86_64;arm64"' else: config["CMAKE_OSX_ARCHITECTURES"] = env["arch"] - if env["macos_deployment_target"] != "default": + if env.get("macos_deployment_target", "default") != "default": config["CMAKE_OSX_DEPLOYMENT_TARGET"] = env["macos_deployment_target"] - - if env["platform"] == "macos" and sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ: + if sys.platform != "darwin" and "OSXCROSS_ROOT" in os.environ: config["CMAKE_AR"] = env["AR"] config["CMAKE_RANLIB"] = env["RANLIB"] if env["arch"] == "universal": |