From 33d6d4bdf718c9d71e9e97339a5181ae53706880 Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Tue, 25 Jan 2022 10:07:01 +0200 Subject: [macOS] Enable Objective-C ARC --- platform/osx/detect.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'platform/osx/detect.py') diff --git a/platform/osx/detect.py b/platform/osx/detect.py index c67791b340..cf601eaa7f 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -86,6 +86,8 @@ def configure(env): 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") -- cgit v1.2.3 From b84ef16aa7ef7a871ccc3a06aca52fe820b47967 Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:01:27 +0200 Subject: [macOS] Cleanup and split Objective-C objects to the separate files --- platform/osx/detect.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'platform/osx/detect.py') diff --git a/platform/osx/detect.py b/platform/osx/detect.py index cf601eaa7f..e7fe37d4b5 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -78,9 +78,9 @@ 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"]) @@ -190,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"]) -- cgit v1.2.3