mirror of
https://github.com/godotengine/godot-cpp.git
synced 2025-12-31 01:48:45 +03:00
[macOS] Remove unnecessary Cocoa reference.
(cherry picked from commit d239da3221)
This commit is contained in:
committed by
David Snopek
parent
0a39efe3d3
commit
6917c1ea17
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user