Skip to content

Commit f088bc9

Browse files
authored
Merge pull request #1752 from bruvzg/rem_libs
[macOS] Remove unnecessary Cocoa reference.
2 parents f08e781 + d239da3 commit f088bc9

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

cmake/macos.cmake

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_ARCHITECTURES.html
1717
# Find Requirements
1818
if(APPLE)
1919
set(CMAKE_OSX_SYSROOT $ENV{SDKROOT})
20-
find_library(
21-
COCOA_LIBRARY
22-
REQUIRED
23-
NAMES Cocoa
24-
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
25-
PATH_SUFFIXES Frameworks
26-
NO_DEFAULT_PATH
27-
)
2820
endif(APPLE)
2921

3022
#[=============================[ MacOS Options ]=============================]
@@ -45,9 +37,5 @@ endfunction()
4537
function(macos_generate)
4638
target_compile_definitions(godot-cpp PUBLIC MACOS_ENABLED UNIX_ENABLED)
4739

48-
target_link_options(godot-cpp PUBLIC -Wl,-undefined,dynamic_lookup)
49-
50-
target_link_libraries(godot-cpp INTERFACE ${COCOA_LIBRARY})
51-
5240
common_compiler_flags()
5341
endfunction()

tools/macos.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,6 @@ def generate(env):
6363
env.Append(CCFLAGS=["-isysroot", env["macos_sdk_path"]])
6464
env.Append(LINKFLAGS=["-isysroot", env["macos_sdk_path"]])
6565

66-
env.Append(
67-
LINKFLAGS=[
68-
"-framework",
69-
"Cocoa",
70-
"-Wl,-undefined,dynamic_lookup",
71-
]
72-
)
73-
7466
env.Append(CPPDEFINES=["MACOS_ENABLED", "UNIX_ENABLED"])
7567

7668
# Refer to https://github.com/godotengine/godot/blob/master/platform/macos/detect.py

0 commit comments

Comments
 (0)