Browse Source

Merge pull request #1752 from bruvzg/rem_libs

[macOS] Remove unnecessary Cocoa reference.
David Snopek 4 months ago
parent
commit
f088bc9b25
2 changed files with 0 additions and 20 deletions
  1. 0 12
      cmake/macos.cmake
  2. 0 8
      tools/macos.py

+ 0 - 12
cmake/macos.cmake

@@ -17,14 +17,6 @@ https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_ARCHITECTURES.html
 # Find Requirements
 if(APPLE)
     set(CMAKE_OSX_SYSROOT $ENV{SDKROOT})
-    find_library(
-        COCOA_LIBRARY
-        REQUIRED
-        NAMES Cocoa
-        PATHS ${CMAKE_OSX_SYSROOT}/System/Library
-        PATH_SUFFIXES Frameworks
-        NO_DEFAULT_PATH
-    )
 endif(APPLE)
 
 #[=============================[ MacOS Options ]=============================]
@@ -45,9 +37,5 @@ endfunction()
 function(macos_generate)
     target_compile_definitions(godot-cpp PUBLIC MACOS_ENABLED UNIX_ENABLED)
 
-    target_link_options(godot-cpp PUBLIC -Wl,-undefined,dynamic_lookup)
-
-    target_link_libraries(godot-cpp INTERFACE ${COCOA_LIBRARY})
-
     common_compiler_flags()
 endfunction()

+ 0 - 8
tools/macos.py

@@ -63,14 +63,6 @@ def generate(env):
         env.Append(CCFLAGS=["-isysroot", env["macos_sdk_path"]])
         env.Append(LINKFLAGS=["-isysroot", env["macos_sdk_path"]])
 
-    env.Append(
-        LINKFLAGS=[
-            "-framework",
-            "Cocoa",
-            "-Wl,-undefined,dynamic_lookup",
-        ]
-    )
-
     env.Append(CPPDEFINES=["MACOS_ENABLED", "UNIX_ENABLED"])
 
     # Refer to https://github.com/godotengine/godot/blob/master/platform/macos/detect.py