diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-07 13:36:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-07 13:36:09 +0100 |
| commit | 1694626e03639cdf6879117e00772bdcc6bad594 (patch) | |
| tree | 62adf8ae26624568f06bf01d3209581750afd44c /platform/osx/detect.py | |
| parent | bc1a3d791d8797071844ca5ac3d15aee59b361f9 (diff) | |
| parent | b84ef16aa7ef7a871ccc3a06aca52fe820b47967 (diff) | |
Merge pull request #57305 from bruvzg/macos_cleanup
Diffstat (limited to 'platform/osx/detect.py')
| -rw-r--r-- | platform/osx/detect.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index c67791b340..e7fe37d4b5 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -78,14 +78,16 @@ def configure(env): env["osxcross"] = True if env["arch"] == "arm64": - print("Building for macOS 10.15+, platform arm64.") - env.Append(CCFLAGS=["-arch", "arm64", "-mmacosx-version-min=10.15"]) - env.Append(LINKFLAGS=["-arch", "arm64", "-mmacosx-version-min=10.15"]) + print("Building for macOS 11.00+, platform arm64.") + env.Append(CCFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.00"]) + env.Append(LINKFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.00"]) else: print("Building for macOS 10.12+, platform x86_64.") env.Append(CCFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"]) env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"]) + env.Append(CCFLAGS=["-fobjc-arc"]) + if not "osxcross" in env: # regular native build if env["macports_clang"] != "no": mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local") @@ -188,6 +190,8 @@ def configure(env): env.Append(CCFLAGS=["-Wno-deprecated-declarations"]) # Disable deprecation warnings env.Append(LINKFLAGS=["-framework", "OpenGL"]) + env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"]) + if env["vulkan"]: env.Append(CPPDEFINES=["VULKAN_ENABLED"]) env.Append(LINKFLAGS=["-framework", "Metal", "-framework", "QuartzCore", "-framework", "IOSurface"]) |