From b826c1a18b51f20f71fccabc054b166e1e020d85 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Wed, 1 May 2024 01:12:19 +0800 Subject: [PATCH] singsound和cocos2d 混编 导致的openssl崩溃， --- ios/Runner.xcodeproj/project.pbxproj | 9 --------- ios/cocos2d/external/CMakeLists.txt | 6 ------ ios/cocos2d/external/websockets/include/ios/lws_config.h | 2 +- ios/cocosgame/engine/cocos/core/cocos2d_libs.xcodeproj/project.pbxproj | 163 ++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------- 4 files changed, 13 insertions(+), 167 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 048dce2..31e368d 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -2353,8 +2353,6 @@ $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a, $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a, $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a, - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libssl.a, - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libcrypto.a, $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a, $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a, $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a, @@ -2480,7 +2478,6 @@ $SRCROOT/cocos2d/external/bullet/include, $SRCROOT/cocos2d/external/bullet/include/bullet, $SRCROOT/cocos2d/external/jpeg/include/ios, - $SRCROOT/cocos2d/external/openssl/include/ios, $SRCROOT/cocos2d/external/uv/include, $SRCROOT/cocos2d/external/webp/include/ios, $SRCROOT/cocos2d/external/websockets/include/ios, @@ -2717,8 +2714,6 @@ $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a, $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a, $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a, - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libssl.a, - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libcrypto.a, $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a, $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a, $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a, @@ -2845,7 +2840,6 @@ $SRCROOT/cocos2d/external/bullet/include, $SRCROOT/cocos2d/external/bullet/include/bullet, $SRCROOT/cocos2d/external/jpeg/include/ios, - $SRCROOT/cocos2d/external/openssl/include/ios, $SRCROOT/cocos2d/external/uv/include, $SRCROOT/cocos2d/external/webp/include/ios, $SRCROOT/cocos2d/external/websockets/include/ios, @@ -2908,8 +2902,6 @@ $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a, $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a, $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a, - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libssl.a, - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libcrypto.a, $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a, $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a, $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a, @@ -3035,7 +3027,6 @@ $SRCROOT/cocos2d/external/bullet/include, $SRCROOT/cocos2d/external/bullet/include/bullet, $SRCROOT/cocos2d/external/jpeg/include/ios, - $SRCROOT/cocos2d/external/openssl/include/ios, $SRCROOT/cocos2d/external/uv/include, $SRCROOT/cocos2d/external/webp/include/ios, $SRCROOT/cocos2d/external/websockets/include/ios, diff --git a/ios/cocos2d/external/CMakeLists.txt b/ios/cocos2d/external/CMakeLists.txt index 04f8cdd..708710c 100644 --- a/ios/cocos2d/external/CMakeLists.txt +++ b/ios/cocos2d/external/CMakeLists.txt @@ -7,7 +7,6 @@ option(BUILD_EXT_FREETYPE2 "Build with internal freetype2 support" ON) option(BUILD_EXT_RECAST "Build with internal recast support" ON) option(BUILD_EXT_BULLET "Build with internal bullet support" ON) option(BUILD_EXT_JPEG "Build with internal jpeg support" ON) -option(BUILD_EXT_OPENSSL "Build with internal openssl support" ON) option(BUILD_EXT_UV "Build with internal uv support" ON) option(BUILD_EXT_WEBP "Build with internal webp support" ON) option(BUILD_EXT_WEBSOCKETS "Build with internal websockets support" ON) @@ -49,11 +48,6 @@ if(BUILD_EXT_JPEG) add_subdirectory(jpeg) target_link_libraries(external ext_jpeg) endif(BUILD_EXT_JPEG) -if(BUILD_EXT_OPENSSL) - add_subdirectory(openssl) - target_link_libraries(external ext_ssl) - target_link_libraries(external ext_crypto) -endif(BUILD_EXT_OPENSSL) if(BUILD_EXT_UV) add_subdirectory(uv) target_link_libraries(external ext_uv) diff --git a/ios/cocos2d/external/websockets/include/ios/lws_config.h b/ios/cocos2d/external/websockets/include/ios/lws_config.h index 88b0dda..af6bfbb 100644 --- a/ios/cocos2d/external/websockets/include/ios/lws_config.h +++ b/ios/cocos2d/external/websockets/include/ios/lws_config.h @@ -38,7 +38,7 @@ #define LWS_BUILD_HASH "cocos@cocoss-MacBook-Pro.local-v3.4-182-g408ba56" /* Build with OpenSSL support */ -#define LWS_OPENSSL_SUPPORT +//#define LWS_OPENSSL_SUPPORT /* The client should load and trust CA root certs it finds in the OS */ #define LWS_SSL_CLIENT_USE_OS_CA_CERTS diff --git a/ios/cocosgame/engine/cocos/core/cocos2d_libs.xcodeproj/project.pbxproj b/ios/cocosgame/engine/cocos/core/cocos2d_libs.xcodeproj/project.pbxproj index 4901fe4..95120d6 100644 --- a/ios/cocosgame/engine/cocos/core/cocos2d_libs.xcodeproj/project.pbxproj +++ b/ios/cocosgame/engine/cocos/core/cocos2d_libs.xcodeproj/project.pbxproj @@ -26,22 +26,10 @@ ACD85EEA01BC4C9E8C7FBC94 /* PBXTargetDependency */, C8B35E45428B42469218B3FF /* PBXTargetDependency */, 540FC533FDB24B0283D960CF /* PBXTargetDependency */, - FD5DC33359A34C3C88679BC4 /* PBXTargetDependency */, ); name = ALL_BUILD; productName = ALL_BUILD; }; - 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 49CE71CEE7C845BE8AD863B0 /* Build configuration list for PBXAggregateTarget "ZERO_CHECK" */; - buildPhases = ( - 6EB92A468BED48F49B4FC969 /* CMake Rules */, - ); - dependencies = ( - ); - name = ZERO_CHECK; - productName = ZERO_CHECK; - }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -793,13 +781,6 @@ remoteGlobalIDString = 8C44DCE97EE54C668F009408; remoteInfo = ext_poly2tri; }; - CBDF8624F6E443CFA4DB96F7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8F7FA0988CE64ED38E569C92; - remoteInfo = ZERO_CHECK; - }; CEE8D56C9C334D53B7CA26DA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */; @@ -807,13 +788,6 @@ remoteGlobalIDString = 618D32556072465F93DE7875; remoteInfo = ext_md5; }; - DA8CC347870044C3B5AEF520 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8F7FA0988CE64ED38E569C92; - remoteInfo = ZERO_CHECK; - }; DAD44184AF6F4E26924EA0EA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */; @@ -4144,7 +4118,6 @@ 0B55F17591C84A5788E14B07 /* PBXTargetDependency */, 22BDA12A4EC54A18BA4AF0D1 /* PBXTargetDependency */, 91D5400466D341A49AA1E800 /* PBXTargetDependency */, - 24DB3CE87FCA4BDB8F0B1E9A /* PBXTargetDependency */, ); name = cocos2d; productName = cocos2d; @@ -4292,7 +4265,6 @@ projectRoot = ""; targets = ( 3C5CDAB10E9949E4AF0D8989 /* ALL_BUILD */, - 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */, 3807F551AD064687B13953E9 /* cocos2d */, 93D47B87033C4D7FAE278F63 /* ext_clipper */, 9B5B61961265480B9501BB85 /* ext_convertUTF */, @@ -4320,16 +4292,6 @@ shellPath = /bin/sh; shellScript = "make -C /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/core -f /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/core/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.make$CONFIGURATION OBJDIR=$(basename \"$OBJECT_FILE_DIR_normal\") all\n"; }; - 6EB92A468BED48F49B4FC969 /* CMake Rules */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - name = "CMake Rules"; - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "make -C /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/core -f /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/core/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.make$CONFIGURATION OBJDIR=$(basename \"$OBJECT_FILE_DIR_normal\") all\n"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -5008,11 +4970,6 @@ target = 618D32556072465F93DE7875 /* ext_md5 */; targetProxy = CEE8D56C9C334D53B7CA26DA /* PBXContainerItemProxy */; }; - 24DB3CE87FCA4BDB8F0B1E9A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */; - targetProxy = DA8CC347870044C3B5AEF520 /* PBXContainerItemProxy */; - }; 3B5AE48906884AB9A9C9843E /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9B5B61961265480B9501BB85 /* ext_convertUTF */; @@ -5148,11 +5105,6 @@ target = 7D4C0E93B1B6458FB6F41437 /* ext_tinyxml2 */; targetProxy = F91AC1BB6B424966B7B543C8 /* PBXContainerItemProxy */; }; - FD5DC33359A34C3C88679BC4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */; - targetProxy = CBDF8624F6E443CFA4DB96F7 /* PBXContainerItemProxy */; - }; FE77006306E74DD6AE1D137C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 640C23AC632B46BCB77CCD82 /* ext_edtaa3func */; @@ -5260,7 +5212,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; PRODUCT_NAME = "Steve and Maggie Food App"; SDKROOT = iphoneos; - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -5355,26 +5307,6 @@ }; name = RelWithDebInfo; }; - 25F8294DD68A48A2885516BE /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INSTALL_PATH = ""; - OTHER_LDFLAGS = " "; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ZERO_CHECK; - SECTORDER_FLAGS = ""; - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - USE_HEADERMAP = NO; - WARNING_CFLAGS = "$(inherited)"; - }; - name = Release; - }; 2662387F41514C7BBB0C2569 /* RelWithDebInfo */ = { isa = XCBuildConfiguration; buildSettings = { @@ -5443,7 +5375,7 @@ PRODUCT_NAME = external; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -5745,26 +5677,6 @@ }; name = MinSizeRel; }; - 5CE0E60DE7794B26B4BA209D /* MinSizeRel */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INSTALL_PATH = ""; - OTHER_LDFLAGS = " "; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ZERO_CHECK; - SECTORDER_FLAGS = ""; - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - USE_HEADERMAP = NO; - WARNING_CFLAGS = "$(inherited)"; - }; - name = MinSizeRel; - }; 5D546E5BBE134436AA28F76A /* RelWithDebInfo */ = { isa = XCBuildConfiguration; buildSettings = { @@ -5835,7 +5747,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; PRODUCT_NAME = "Steve and Maggie Food App"; SDKROOT = iphoneos; - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build; TARGETED_DEVICE_FAMILY = "1,2"; }; name = RelWithDebInfo; @@ -5911,7 +5823,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; PRODUCT_NAME = "Steve and Maggie Food App"; SDKROOT = iphoneos; - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build; TARGETED_DEVICE_FAMILY = "1,2"; }; name = MinSizeRel; @@ -5963,7 +5875,7 @@ PRODUCT_NAME = cocos2d; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -6009,7 +5921,7 @@ PRODUCT_NAME = external; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -6023,7 +5935,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; PRODUCT_NAME = "Steve and Maggie Food App"; SDKROOT = iphoneos; - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -6059,26 +5971,6 @@ }; name = Release; }; - 8B20D80D7A40473396066F25 /* RelWithDebInfo */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INSTALL_PATH = ""; - OTHER_LDFLAGS = " "; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ZERO_CHECK; - SECTORDER_FLAGS = ""; - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - USE_HEADERMAP = NO; - WARNING_CFLAGS = "$(inherited)"; - }; - name = RelWithDebInfo; - }; 9E00099B0261484CAE648280 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -6251,7 +6143,7 @@ PRODUCT_NAME = external; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -6340,7 +6232,7 @@ PRODUCT_NAME = cocos2d; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -6429,7 +6321,7 @@ PRODUCT_NAME = cocos2d; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -6563,26 +6455,6 @@ }; name = MinSizeRel; }; - D29F9DAF953C46E088FA1D5A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - INSTALL_PATH = ""; - OTHER_LDFLAGS = " "; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ZERO_CHECK; - SECTORDER_FLAGS = ""; - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - USE_HEADERMAP = NO; - WARNING_CFLAGS = "$(inherited)"; - }; - name = Debug; - }; D6AC19F5D46F43CE95293A92 /* MinSizeRel */ = { isa = XCBuildConfiguration; buildSettings = { @@ -6761,7 +6633,7 @@ PRODUCT_NAME = external; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -6819,7 +6691,7 @@ PRODUCT_NAME = cocos2d; SECTORDER_FLAGS = ""; SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; - SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/openssl/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; + SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../cocos2d/external/Box2D/include $(SRCROOT)/../../cocos2d/external/chipmunk/include $(SRCROOT)/../../cocos2d/external/freetype2/include/ios/freetype2 $(SRCROOT)/../../cocos2d/external/bullet/include $(SRCROOT)/../../cocos2d/external/bullet/include/bullet $(SRCROOT)/../../cocos2d/external/jpeg/include/ios $(SRCROOT)/../../cocos2d/external/uv/include $(SRCROOT)/../../cocos2d/external/webp/include/ios $(SRCROOT)/../../cocos2d/external/websockets/include/ios $(SRCROOT)/../../cocos2d/external/curl/include/ios $(SRCROOT)/../../cocos2d/external/png/include/ios $(SRCROOT)/../../cocos2d/external/glsl-optimizer/include"; USE_HEADERMAP = NO; WARNING_CFLAGS = "$(inherited)"; }; @@ -7053,17 +6925,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 49CE71CEE7C845BE8AD863B0 /* Build configuration list for PBXAggregateTarget "ZERO_CHECK" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D29F9DAF953C46E088FA1D5A /* Debug */, - 25F8294DD68A48A2885516BE /* Release */, - 5CE0E60DE7794B26B4BA209D /* MinSizeRel */, - 8B20D80D7A40473396066F25 /* RelWithDebInfo */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; 4A88FE3109F34B16AF627065 /* Build configuration list for PBXNativeTarget "ext_xxtea" */ = { isa = XCConfigurationList; buildConfigurations = ( -- libgit2 0.22.2