Skip to content

Commit 774a907

Browse files
authored
fix link error on iOS simulator (#20172)
1 parent 42c43a5 commit 774a907

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cmake/Modules/CocosConfigDepend.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ macro(cocos2dx_depend)
2424
elseif(APPLE)
2525

2626
include_directories(/System/Library/Frameworks)
27-
find_library(ICONV_LIBRARY iconv)
2827
find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
2928
find_library(FOUNDATION_LIBRARY Foundation)
3029
find_library(OPENAL_LIBRARY OpenAL)
@@ -36,7 +35,6 @@ macro(cocos2dx_depend)
3635
${AUDIOTOOLBOX_LIBRARY}
3736
${QUARTZCORE_LIBRARY}
3837
${FOUNDATION_LIBRARY}
39-
${ICONV_LIBRARY}
4038
${GAMECONTROLLER_LIBRARY}
4139
${METAL_LIBRARY}
4240
)
@@ -49,13 +47,15 @@ macro(cocos2dx_depend)
4947
find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
5048
find_library(IOKIT_LIBRARY IOKit)
5149
find_library(APPKIT_LIBRARY AppKit)
50+
find_library(ICONV_LIBRARY iconv)
5251
list(APPEND PLATFORM_SPECIFIC_LIBS
5352
${COCOA_LIBRARY}
5453
${OPENGL_LIBRARY}
5554
${APPLICATIONSERVICES_LIBRARY}
5655
${IOKIT_LIBRARY}
5756
${COCOS_APPLE_LIBS}
5857
${APPKIT_LIBRARY}
58+
${ICONV_LIBRARY}
5959
)
6060
elseif(IOS)
6161
# Locate system libraries on iOS
@@ -68,7 +68,6 @@ macro(cocos2dx_depend)
6868
find_library(SECURITY_LIBRARY Security)
6969
find_library(CORE_GRAPHICS_LIBRARY CoreGraphics)
7070
find_library(AV_FOUNDATION_LIBRARY AVFoundation)
71-
find_library(Z_LIBRARY z)
7271
find_library(WEBKIT_LIBRARY WebKit)
7372
list(APPEND PLATFORM_SPECIFIC_LIBS
7473
${UIKIT_LIBRARY}
@@ -80,9 +79,10 @@ macro(cocos2dx_depend)
8079
${SECURITY_LIBRARY}
8180
${CORE_GRAPHICS_LIBRARY}
8281
${AV_FOUNDATION_LIBRARY}
83-
${Z_LIBRARY}
8482
${WEBKIT_LIBRARY}
8583
${COCOS_APPLE_LIBS}
84+
"/usr/lib/libz.dylib"
85+
"/usr/lib/libiconv.dylib"
8686
)
8787
endif()
8888
endif()

0 commit comments

Comments
 (0)