@@ -24,7 +24,6 @@ macro(cocos2dx_depend)
24
24
elseif (APPLE )
25
25
26
26
include_directories (/System/Library/Frameworks )
27
- find_library (ICONV_LIBRARY iconv )
28
27
find_library (AUDIOTOOLBOX_LIBRARY AudioToolbox )
29
28
find_library (FOUNDATION_LIBRARY Foundation )
30
29
find_library (OPENAL_LIBRARY OpenAL )
@@ -36,7 +35,6 @@ macro(cocos2dx_depend)
36
35
${AUDIOTOOLBOX_LIBRARY}
37
36
${QUARTZCORE_LIBRARY}
38
37
${FOUNDATION_LIBRARY}
39
- ${ICONV_LIBRARY}
40
38
${GAMECONTROLLER_LIBRARY}
41
39
${METAL_LIBRARY}
42
40
)
@@ -49,13 +47,15 @@ macro(cocos2dx_depend)
49
47
find_library (APPLICATIONSERVICES_LIBRARY ApplicationServices )
50
48
find_library (IOKIT_LIBRARY IOKit )
51
49
find_library (APPKIT_LIBRARY AppKit )
50
+ find_library (ICONV_LIBRARY iconv )
52
51
list (APPEND PLATFORM_SPECIFIC_LIBS
53
52
${COCOA_LIBRARY}
54
53
${OPENGL_LIBRARY}
55
54
${APPLICATIONSERVICES_LIBRARY}
56
55
${IOKIT_LIBRARY}
57
56
${COCOS_APPLE_LIBS}
58
57
${APPKIT_LIBRARY}
58
+ ${ICONV_LIBRARY}
59
59
)
60
60
elseif (IOS )
61
61
# Locate system libraries on iOS
@@ -68,7 +68,6 @@ macro(cocos2dx_depend)
68
68
find_library (SECURITY_LIBRARY Security )
69
69
find_library (CORE_GRAPHICS_LIBRARY CoreGraphics )
70
70
find_library (AV_FOUNDATION_LIBRARY AVFoundation )
71
- find_library (Z_LIBRARY z )
72
71
find_library (WEBKIT_LIBRARY WebKit )
73
72
list (APPEND PLATFORM_SPECIFIC_LIBS
74
73
${UIKIT_LIBRARY}
@@ -80,9 +79,10 @@ macro(cocos2dx_depend)
80
79
${SECURITY_LIBRARY}
81
80
${CORE_GRAPHICS_LIBRARY}
82
81
${AV_FOUNDATION_LIBRARY}
83
- ${Z_LIBRARY}
84
82
${WEBKIT_LIBRARY}
85
83
${COCOS_APPLE_LIBS}
84
+ "/usr/lib/libz.dylib"
85
+ "/usr/lib/libiconv.dylib"
86
86
)
87
87
endif ()
88
88
endif ()
0 commit comments