liangchengyou / wow_english

Commit b826c1a18b51f20f71fccabc054b166e1e020d85

Authored by xiaoyu
1 parent 02cc9589

singsound和cocos2d 混编 导致的openssl崩溃， 

现移除掉cocos2d的openssl支持，目前接入的游戏不需要openssl
Inline Side-by-side
Showing 4 changed files with 13 additions and 167 deletions
ios/Runner.xcodeproj/project.pbxproj
  View file @b826c1a
@@ -2353,8 +2353,6 @@ @@ -2353,8 +2353,6 @@
2353 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a, 2353 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a,
2354 $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a, 2354 $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a,
2355 $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a, 2355 $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a,
2356 - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libssl.a,  
2357 - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libcrypto.a,  
2358 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a, 2356 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a,
2359 $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a, 2357 $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a,
2360 $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a, 2358 $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a,
@@ -2480,7 +2478,6 @@ @@ -2480,7 +2478,6 @@
2480 $SRCROOT/cocos2d/external/bullet/include, 2478 $SRCROOT/cocos2d/external/bullet/include,
2481 $SRCROOT/cocos2d/external/bullet/include/bullet, 2479 $SRCROOT/cocos2d/external/bullet/include/bullet,
2482 $SRCROOT/cocos2d/external/jpeg/include/ios, 2480 $SRCROOT/cocos2d/external/jpeg/include/ios,
2483 - $SRCROOT/cocos2d/external/openssl/include/ios,  
2484 $SRCROOT/cocos2d/external/uv/include, 2481 $SRCROOT/cocos2d/external/uv/include,
2485 $SRCROOT/cocos2d/external/webp/include/ios, 2482 $SRCROOT/cocos2d/external/webp/include/ios,
2486 $SRCROOT/cocos2d/external/websockets/include/ios, 2483 $SRCROOT/cocos2d/external/websockets/include/ios,
@@ -2717,8 +2714,6 @@ @@ -2717,8 +2714,6 @@
2717 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a, 2714 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a,
2718 $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a, 2715 $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a,
2719 $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a, 2716 $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a,
2720 - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libssl.a,  
2721 - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libcrypto.a,  
2722 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a, 2717 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a,
2723 $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a, 2718 $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a,
2724 $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a, 2719 $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a,
@@ -2845,7 +2840,6 @@ @@ -2845,7 +2840,6 @@
2845 $SRCROOT/cocos2d/external/bullet/include, 2840 $SRCROOT/cocos2d/external/bullet/include,
2846 $SRCROOT/cocos2d/external/bullet/include/bullet, 2841 $SRCROOT/cocos2d/external/bullet/include/bullet,
2847 $SRCROOT/cocos2d/external/jpeg/include/ios, 2842 $SRCROOT/cocos2d/external/jpeg/include/ios,
2848 - $SRCROOT/cocos2d/external/openssl/include/ios,  
2849 $SRCROOT/cocos2d/external/uv/include, 2843 $SRCROOT/cocos2d/external/uv/include,
2850 $SRCROOT/cocos2d/external/webp/include/ios, 2844 $SRCROOT/cocos2d/external/webp/include/ios,
2851 $SRCROOT/cocos2d/external/websockets/include/ios, 2845 $SRCROOT/cocos2d/external/websockets/include/ios,
@@ -2908,8 +2902,6 @@ @@ -2908,8 +2902,6 @@
2908 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a, 2902 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libMiniCL.a,
2909 $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a, 2903 $SRCROOT/cocos2d/external/jpeg/prebuilt/ios/libjpeg.a,
2910 $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a, 2904 $SRCROOT/cocos2d/external/websockets/prebuilt/ios/libwebsockets.a,
2911 - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libssl.a,  
2912 - $SRCROOT/cocos2d/external/openssl/prebuilt/ios/libcrypto.a,  
2913 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a, 2905 $SRCROOT/cocos2d/external/bullet/prebuilt/ios/libBulletDynamics.a,
2914 $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a, 2906 $SRCROOT/cocos2d/external/uv/prebuilt/ios/libuv_a.a,
2915 $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a, 2907 $SRCROOT/cocos2d/external/curl/prebuilt/ios/libcurl.a,
@@ -3035,7 +3027,6 @@ @@ -3035,7 +3027,6 @@
3035 $SRCROOT/cocos2d/external/bullet/include, 3027 $SRCROOT/cocos2d/external/bullet/include,
3036 $SRCROOT/cocos2d/external/bullet/include/bullet, 3028 $SRCROOT/cocos2d/external/bullet/include/bullet,
3037 $SRCROOT/cocos2d/external/jpeg/include/ios, 3029 $SRCROOT/cocos2d/external/jpeg/include/ios,
3038 - $SRCROOT/cocos2d/external/openssl/include/ios,  
3039 $SRCROOT/cocos2d/external/uv/include, 3030 $SRCROOT/cocos2d/external/uv/include,
3040 $SRCROOT/cocos2d/external/webp/include/ios, 3031 $SRCROOT/cocos2d/external/webp/include/ios,
3041 $SRCROOT/cocos2d/external/websockets/include/ios, 3032 $SRCROOT/cocos2d/external/websockets/include/ios,
ios/cocos2d/external/CMakeLists.txt
  View file @b826c1a
@@ -7,7 +7,6 @@ option(BUILD_EXT_FREETYPE2 "Build with internal freetype2 support" ON) @@ -7,7 +7,6 @@ option(BUILD_EXT_FREETYPE2 "Build with internal freetype2 support" ON)
7 option(BUILD_EXT_RECAST "Build with internal recast support" ON) 7 option(BUILD_EXT_RECAST "Build with internal recast support" ON)
8 option(BUILD_EXT_BULLET "Build with internal bullet support" ON) 8 option(BUILD_EXT_BULLET "Build with internal bullet support" ON)
9 option(BUILD_EXT_JPEG "Build with internal jpeg support" ON) 9 option(BUILD_EXT_JPEG "Build with internal jpeg support" ON)
10 -option(BUILD_EXT_OPENSSL "Build with internal openssl support" ON)  
11 option(BUILD_EXT_UV "Build with internal uv support" ON) 10 option(BUILD_EXT_UV "Build with internal uv support" ON)
12 option(BUILD_EXT_WEBP "Build with internal webp support" ON) 11 option(BUILD_EXT_WEBP "Build with internal webp support" ON)
13 option(BUILD_EXT_WEBSOCKETS "Build with internal websockets support" ON) 12 option(BUILD_EXT_WEBSOCKETS "Build with internal websockets support" ON)
@@ -49,11 +48,6 @@ if(BUILD_EXT_JPEG) @@ -49,11 +48,6 @@ if(BUILD_EXT_JPEG)
49 add_subdirectory(jpeg) 48 add_subdirectory(jpeg)
50 target_link_libraries(external ext_jpeg) 49 target_link_libraries(external ext_jpeg)
51 endif(BUILD_EXT_JPEG) 50 endif(BUILD_EXT_JPEG)
52 -if(BUILD_EXT_OPENSSL)  
53 - add_subdirectory(openssl)  
54 - target_link_libraries(external ext_ssl)  
55 - target_link_libraries(external ext_crypto)  
56 -endif(BUILD_EXT_OPENSSL)  
57 if(BUILD_EXT_UV) 51 if(BUILD_EXT_UV)
58 add_subdirectory(uv) 52 add_subdirectory(uv)
59 target_link_libraries(external ext_uv) 53 target_link_libraries(external ext_uv)
ios/cocos2d/external/websockets/include/ios/lws_config.h
  View file @b826c1a
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 #define LWS_BUILD_HASH "cocos@cocoss-MacBook-Pro.local-v3.4-182-g408ba56" 38 #define LWS_BUILD_HASH "cocos@cocoss-MacBook-Pro.local-v3.4-182-g408ba56"
39 39
40 /* Build with OpenSSL support */ 40 /* Build with OpenSSL support */
41 -#define LWS_OPENSSL_SUPPORT 41 +//#define LWS_OPENSSL_SUPPORT
42 42
43 /* The client should load and trust CA root certs it finds in the OS */ 43 /* The client should load and trust CA root certs it finds in the OS */
44 #define LWS_SSL_CLIENT_USE_OS_CA_CERTS 44 #define LWS_SSL_CLIENT_USE_OS_CA_CERTS
ios/cocosgame/engine/cocos/core/cocos2d_libs.xcodeproj/project.pbxproj
  View file @b826c1a
@@ -26,22 +26,10 @@ @@ -26,22 +26,10 @@
26 ACD85EEA01BC4C9E8C7FBC94 /* PBXTargetDependency */, 26 ACD85EEA01BC4C9E8C7FBC94 /* PBXTargetDependency */,
27 C8B35E45428B42469218B3FF /* PBXTargetDependency */, 27 C8B35E45428B42469218B3FF /* PBXTargetDependency */,
28 540FC533FDB24B0283D960CF /* PBXTargetDependency */, 28 540FC533FDB24B0283D960CF /* PBXTargetDependency */,
29 - FD5DC33359A34C3C88679BC4 /* PBXTargetDependency */,  
30 ); 29 );
31 name = ALL_BUILD; 30 name = ALL_BUILD;
32 productName = ALL_BUILD; 31 productName = ALL_BUILD;
33 }; 32 };
34 - 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */ = {  
35 - isa = PBXAggregateTarget;  
36 - buildConfigurationList = 49CE71CEE7C845BE8AD863B0 /* Build configuration list for PBXAggregateTarget "ZERO_CHECK" */;  
37 - buildPhases = (  
38 - 6EB92A468BED48F49B4FC969 /* CMake Rules */,  
39 - );  
40 - dependencies = (  
41 - );  
42 - name = ZERO_CHECK;  
43 - productName = ZERO_CHECK;  
44 - };  
45 /* End PBXAggregateTarget section */ 33 /* End PBXAggregateTarget section */
46 34
47 /* Begin PBXBuildFile section */ 35 /* Begin PBXBuildFile section */
@@ -793,13 +781,6 @@ @@ -793,13 +781,6 @@
793 remoteGlobalIDString = 8C44DCE97EE54C668F009408; 781 remoteGlobalIDString = 8C44DCE97EE54C668F009408;
794 remoteInfo = ext_poly2tri; 782 remoteInfo = ext_poly2tri;
795 }; 783 };
796 - CBDF8624F6E443CFA4DB96F7 /* PBXContainerItemProxy */ = {  
797 - isa = PBXContainerItemProxy;  
798 - containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */;  
799 - proxyType = 1;  
800 - remoteGlobalIDString = 8F7FA0988CE64ED38E569C92;  
801 - remoteInfo = ZERO_CHECK;  
802 - };  
803 CEE8D56C9C334D53B7CA26DA /* PBXContainerItemProxy */ = { 784 CEE8D56C9C334D53B7CA26DA /* PBXContainerItemProxy */ = {
804 isa = PBXContainerItemProxy; 785 isa = PBXContainerItemProxy;
805 containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */; 786 containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */;
@@ -807,13 +788,6 @@ @@ -807,13 +788,6 @@
807 remoteGlobalIDString = 618D32556072465F93DE7875; 788 remoteGlobalIDString = 618D32556072465F93DE7875;
808 remoteInfo = ext_md5; 789 remoteInfo = ext_md5;
809 }; 790 };
810 - DA8CC347870044C3B5AEF520 /* PBXContainerItemProxy */ = {  
811 - isa = PBXContainerItemProxy;  
812 - containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */;  
813 - proxyType = 1;  
814 - remoteGlobalIDString = 8F7FA0988CE64ED38E569C92;  
815 - remoteInfo = ZERO_CHECK;  
816 - };  
817 DAD44184AF6F4E26924EA0EA /* PBXContainerItemProxy */ = { 791 DAD44184AF6F4E26924EA0EA /* PBXContainerItemProxy */ = {
818 isa = PBXContainerItemProxy; 792 isa = PBXContainerItemProxy;
819 containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */; 793 containerPortal = 7A3362A3C39D44E7BF9A02A7 /* Project object */;
@@ -4144,7 +4118,6 @@ @@ -4144,7 +4118,6 @@
4144 0B55F17591C84A5788E14B07 /* PBXTargetDependency */, 4118 0B55F17591C84A5788E14B07 /* PBXTargetDependency */,
4145 22BDA12A4EC54A18BA4AF0D1 /* PBXTargetDependency */, 4119 22BDA12A4EC54A18BA4AF0D1 /* PBXTargetDependency */,
4146 91D5400466D341A49AA1E800 /* PBXTargetDependency */, 4120 91D5400466D341A49AA1E800 /* PBXTargetDependency */,
4147 - 24DB3CE87FCA4BDB8F0B1E9A /* PBXTargetDependency */,  
4148 ); 4121 );
4149 name = cocos2d; 4122 name = cocos2d;
4150 productName = cocos2d; 4123 productName = cocos2d;
@@ -4292,7 +4265,6 @@ @@ -4292,7 +4265,6 @@
4292 projectRoot = ""; 4265 projectRoot = "";
4293 targets = ( 4266 targets = (
4294 3C5CDAB10E9949E4AF0D8989 /* ALL_BUILD */, 4267 3C5CDAB10E9949E4AF0D8989 /* ALL_BUILD */,
4295 - 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */,  
4296 3807F551AD064687B13953E9 /* cocos2d */, 4268 3807F551AD064687B13953E9 /* cocos2d */,
4297 93D47B87033C4D7FAE278F63 /* ext_clipper */, 4269 93D47B87033C4D7FAE278F63 /* ext_clipper */,
4298 9B5B61961265480B9501BB85 /* ext_convertUTF */, 4270 9B5B61961265480B9501BB85 /* ext_convertUTF */,
@@ -4320,16 +4292,6 @@ @@ -4320,16 +4292,6 @@
4320 shellPath = /bin/sh; 4292 shellPath = /bin/sh;
4321 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"; 4293 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";
4322 }; 4294 };
4323 - 6EB92A468BED48F49B4FC969 /* CMake Rules */ = {  
4324 - isa = PBXShellScriptBuildPhase;  
4325 - buildActionMask = 2147483647;  
4326 - files = (  
4327 - );  
4328 - name = "CMake Rules";  
4329 - runOnlyForDeploymentPostprocessing = 0;  
4330 - shellPath = /bin/sh;  
4331 - 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";  
4332 - };  
4333 /* End PBXShellScriptBuildPhase section */ 4295 /* End PBXShellScriptBuildPhase section */
4334 4296
4335 /* Begin PBXSourcesBuildPhase section */ 4297 /* Begin PBXSourcesBuildPhase section */
@@ -5008,11 +4970,6 @@ @@ -5008,11 +4970,6 @@
5008 target = 618D32556072465F93DE7875 /* ext_md5 */; 4970 target = 618D32556072465F93DE7875 /* ext_md5 */;
5009 targetProxy = CEE8D56C9C334D53B7CA26DA /* PBXContainerItemProxy */; 4971 targetProxy = CEE8D56C9C334D53B7CA26DA /* PBXContainerItemProxy */;
5010 }; 4972 };
5011 - 24DB3CE87FCA4BDB8F0B1E9A /* PBXTargetDependency */ = {  
5012 - isa = PBXTargetDependency;  
5013 - target = 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */;  
5014 - targetProxy = DA8CC347870044C3B5AEF520 /* PBXContainerItemProxy */;  
5015 - };  
5016 3B5AE48906884AB9A9C9843E /* PBXTargetDependency */ = { 4973 3B5AE48906884AB9A9C9843E /* PBXTargetDependency */ = {
5017 isa = PBXTargetDependency; 4974 isa = PBXTargetDependency;
5018 target = 9B5B61961265480B9501BB85 /* ext_convertUTF */; 4975 target = 9B5B61961265480B9501BB85 /* ext_convertUTF */;
@@ -5148,11 +5105,6 @@ @@ -5148,11 +5105,6 @@
5148 target = 7D4C0E93B1B6458FB6F41437 /* ext_tinyxml2 */; 5105 target = 7D4C0E93B1B6458FB6F41437 /* ext_tinyxml2 */;
5149 targetProxy = F91AC1BB6B424966B7B543C8 /* PBXContainerItemProxy */; 5106 targetProxy = F91AC1BB6B424966B7B543C8 /* PBXContainerItemProxy */;
5150 }; 5107 };
5151 - FD5DC33359A34C3C88679BC4 /* PBXTargetDependency */ = {  
5152 - isa = PBXTargetDependency;  
5153 - target = 8F7FA0988CE64ED38E569C92 /* ZERO_CHECK */;  
5154 - targetProxy = CBDF8624F6E443CFA4DB96F7 /* PBXContainerItemProxy */;  
5155 - };  
5156 FE77006306E74DD6AE1D137C /* PBXTargetDependency */ = { 5108 FE77006306E74DD6AE1D137C /* PBXTargetDependency */ = {
5157 isa = PBXTargetDependency; 5109 isa = PBXTargetDependency;
5158 target = 640C23AC632B46BCB77CCD82 /* ext_edtaa3func */; 5110 target = 640C23AC632B46BCB77CCD82 /* ext_edtaa3func */;
@@ -5260,7 +5212,7 @@ @@ -5260,7 +5212,7 @@
5260 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; 5212 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp;
5261 PRODUCT_NAME = "Steve and Maggie Food App"; 5213 PRODUCT_NAME = "Steve and Maggie Food App";
5262 SDKROOT = iphoneos; 5214 SDKROOT = iphoneos;
5263 - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; 5215 + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build;
5264 TARGETED_DEVICE_FAMILY = "1,2"; 5216 TARGETED_DEVICE_FAMILY = "1,2";
5265 }; 5217 };
5266 name = Debug; 5218 name = Debug;
@@ -5355,26 +5307,6 @@ @@ -5355,26 +5307,6 @@
5355 }; 5307 };
5356 name = RelWithDebInfo; 5308 name = RelWithDebInfo;
5357 }; 5309 };
5358 - 25F8294DD68A48A2885516BE /* Release */ = {  
5359 - isa = XCBuildConfiguration;  
5360 - buildSettings = {  
5361 - COMBINE_HIDPI_IMAGES = YES;  
5362 - GCC_GENERATE_DEBUGGING_SYMBOLS = YES;  
5363 - GCC_INLINES_ARE_PRIVATE_EXTERN = NO;  
5364 - GCC_OPTIMIZATION_LEVEL = 0;  
5365 - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'";  
5366 - GCC_SYMBOLS_PRIVATE_EXTERN = NO;  
5367 - INSTALL_PATH = "";  
5368 - OTHER_LDFLAGS = " ";  
5369 - OTHER_REZFLAGS = "";  
5370 - PRODUCT_NAME = ZERO_CHECK;  
5371 - SECTORDER_FLAGS = "";  
5372 - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";  
5373 - USE_HEADERMAP = NO;  
5374 - WARNING_CFLAGS = "$(inherited)";  
5375 - };  
5376 - name = Release;  
5377 - };  
5378 2662387F41514C7BBB0C2569 /* RelWithDebInfo */ = { 5310 2662387F41514C7BBB0C2569 /* RelWithDebInfo */ = {
5379 isa = XCBuildConfiguration; 5311 isa = XCBuildConfiguration;
5380 buildSettings = { 5312 buildSettings = {
@@ -5443,7 +5375,7 @@ @@ -5443,7 +5375,7 @@
5443 PRODUCT_NAME = external; 5375 PRODUCT_NAME = external;
5444 SECTORDER_FLAGS = ""; 5376 SECTORDER_FLAGS = "";
5445 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; 5377 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external";
5446 - 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"; 5378 + 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";
5447 USE_HEADERMAP = NO; 5379 USE_HEADERMAP = NO;
5448 WARNING_CFLAGS = "$(inherited)"; 5380 WARNING_CFLAGS = "$(inherited)";
5449 }; 5381 };
@@ -5745,26 +5677,6 @@ @@ -5745,26 +5677,6 @@
5745 }; 5677 };
5746 name = MinSizeRel; 5678 name = MinSizeRel;
5747 }; 5679 };
5748 - 5CE0E60DE7794B26B4BA209D /* MinSizeRel */ = {  
5749 - isa = XCBuildConfiguration;  
5750 - buildSettings = {  
5751 - COMBINE_HIDPI_IMAGES = YES;  
5752 - GCC_GENERATE_DEBUGGING_SYMBOLS = YES;  
5753 - GCC_INLINES_ARE_PRIVATE_EXTERN = NO;  
5754 - GCC_OPTIMIZATION_LEVEL = 0;  
5755 - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'";  
5756 - GCC_SYMBOLS_PRIVATE_EXTERN = NO;  
5757 - INSTALL_PATH = "";  
5758 - OTHER_LDFLAGS = " ";  
5759 - OTHER_REZFLAGS = "";  
5760 - PRODUCT_NAME = ZERO_CHECK;  
5761 - SECTORDER_FLAGS = "";  
5762 - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";  
5763 - USE_HEADERMAP = NO;  
5764 - WARNING_CFLAGS = "$(inherited)";  
5765 - };  
5766 - name = MinSizeRel;  
5767 - };  
5768 5D546E5BBE134436AA28F76A /* RelWithDebInfo */ = { 5680 5D546E5BBE134436AA28F76A /* RelWithDebInfo */ = {
5769 isa = XCBuildConfiguration; 5681 isa = XCBuildConfiguration;
5770 buildSettings = { 5682 buildSettings = {
@@ -5835,7 +5747,7 @@ @@ -5835,7 +5747,7 @@
5835 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; 5747 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp;
5836 PRODUCT_NAME = "Steve and Maggie Food App"; 5748 PRODUCT_NAME = "Steve and Maggie Food App";
5837 SDKROOT = iphoneos; 5749 SDKROOT = iphoneos;
5838 - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; 5750 + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build;
5839 TARGETED_DEVICE_FAMILY = "1,2"; 5751 TARGETED_DEVICE_FAMILY = "1,2";
5840 }; 5752 };
5841 name = RelWithDebInfo; 5753 name = RelWithDebInfo;
@@ -5911,7 +5823,7 @@ @@ -5911,7 +5823,7 @@
5911 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; 5823 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp;
5912 PRODUCT_NAME = "Steve and Maggie Food App"; 5824 PRODUCT_NAME = "Steve and Maggie Food App";
5913 SDKROOT = iphoneos; 5825 SDKROOT = iphoneos;
5914 - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; 5826 + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build;
5915 TARGETED_DEVICE_FAMILY = "1,2"; 5827 TARGETED_DEVICE_FAMILY = "1,2";
5916 }; 5828 };
5917 name = MinSizeRel; 5829 name = MinSizeRel;
@@ -5963,7 +5875,7 @@ @@ -5963,7 +5875,7 @@
5963 PRODUCT_NAME = cocos2d; 5875 PRODUCT_NAME = cocos2d;
5964 SECTORDER_FLAGS = ""; 5876 SECTORDER_FLAGS = "";
5965 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; 5877 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";
5966 - 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"; 5878 + 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";
5967 USE_HEADERMAP = NO; 5879 USE_HEADERMAP = NO;
5968 WARNING_CFLAGS = "$(inherited)"; 5880 WARNING_CFLAGS = "$(inherited)";
5969 }; 5881 };
@@ -6009,7 +5921,7 @@ @@ -6009,7 +5921,7 @@
6009 PRODUCT_NAME = external; 5921 PRODUCT_NAME = external;
6010 SECTORDER_FLAGS = ""; 5922 SECTORDER_FLAGS = "";
6011 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; 5923 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external";
6012 - 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"; 5924 + 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";
6013 USE_HEADERMAP = NO; 5925 USE_HEADERMAP = NO;
6014 WARNING_CFLAGS = "$(inherited)"; 5926 WARNING_CFLAGS = "$(inherited)";
6015 }; 5927 };
@@ -6023,7 +5935,7 @@ @@ -6023,7 +5935,7 @@
6023 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp; 5935 PRODUCT_BUNDLE_IDENTIFIER = com.wattsenglish.WattsenglishFoodApp;
6024 PRODUCT_NAME = "Steve and Maggie Food App"; 5936 PRODUCT_NAME = "Steve and Maggie Food App";
6025 SDKROOT = iphoneos; 5937 SDKROOT = iphoneos;
6026 - SYMROOT = "/Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build"; 5938 + SYMROOT = /Users/xiaoyu/xiaoyu/code/go/ishow/wow_english/ios/cocosgame/engine/cocos/build;
6027 TARGETED_DEVICE_FAMILY = "1,2"; 5939 TARGETED_DEVICE_FAMILY = "1,2";
6028 }; 5940 };
6029 name = Release; 5941 name = Release;
@@ -6059,26 +5971,6 @@ @@ -6059,26 +5971,6 @@
6059 }; 5971 };
6060 name = Release; 5972 name = Release;
6061 }; 5973 };
6062 - 8B20D80D7A40473396066F25 /* RelWithDebInfo */ = {  
6063 - isa = XCBuildConfiguration;  
6064 - buildSettings = {  
6065 - COMBINE_HIDPI_IMAGES = YES;  
6066 - GCC_GENERATE_DEBUGGING_SYMBOLS = YES;  
6067 - GCC_INLINES_ARE_PRIVATE_EXTERN = NO;  
6068 - GCC_OPTIMIZATION_LEVEL = 0;  
6069 - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'";  
6070 - GCC_SYMBOLS_PRIVATE_EXTERN = NO;  
6071 - INSTALL_PATH = "";  
6072 - OTHER_LDFLAGS = " ";  
6073 - OTHER_REZFLAGS = "";  
6074 - PRODUCT_NAME = ZERO_CHECK;  
6075 - SECTORDER_FLAGS = "";  
6076 - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";  
6077 - USE_HEADERMAP = NO;  
6078 - WARNING_CFLAGS = "$(inherited)";  
6079 - };  
6080 - name = RelWithDebInfo;  
6081 - };  
6082 9E00099B0261484CAE648280 /* Release */ = { 5974 9E00099B0261484CAE648280 /* Release */ = {
6083 isa = XCBuildConfiguration; 5975 isa = XCBuildConfiguration;
6084 buildSettings = { 5976 buildSettings = {
@@ -6251,7 +6143,7 @@ @@ -6251,7 +6143,7 @@
6251 PRODUCT_NAME = external; 6143 PRODUCT_NAME = external;
6252 SECTORDER_FLAGS = ""; 6144 SECTORDER_FLAGS = "";
6253 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; 6145 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external";
6254 - 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"; 6146 + 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";
6255 USE_HEADERMAP = NO; 6147 USE_HEADERMAP = NO;
6256 WARNING_CFLAGS = "$(inherited)"; 6148 WARNING_CFLAGS = "$(inherited)";
6257 }; 6149 };
@@ -6340,7 +6232,7 @@ @@ -6340,7 +6232,7 @@
6340 PRODUCT_NAME = cocos2d; 6232 PRODUCT_NAME = cocos2d;
6341 SECTORDER_FLAGS = ""; 6233 SECTORDER_FLAGS = "";
6342 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; 6234 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";
6343 - 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"; 6235 + 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";
6344 USE_HEADERMAP = NO; 6236 USE_HEADERMAP = NO;
6345 WARNING_CFLAGS = "$(inherited)"; 6237 WARNING_CFLAGS = "$(inherited)";
6346 }; 6238 };
@@ -6429,7 +6321,7 @@ @@ -6429,7 +6321,7 @@
6429 PRODUCT_NAME = cocos2d; 6321 PRODUCT_NAME = cocos2d;
6430 SECTORDER_FLAGS = ""; 6322 SECTORDER_FLAGS = "";
6431 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; 6323 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";
6432 - 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"; 6324 + 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";
6433 USE_HEADERMAP = NO; 6325 USE_HEADERMAP = NO;
6434 WARNING_CFLAGS = "$(inherited)"; 6326 WARNING_CFLAGS = "$(inherited)";
6435 }; 6327 };
@@ -6563,26 +6455,6 @@ @@ -6563,26 +6455,6 @@
6563 }; 6455 };
6564 name = MinSizeRel; 6456 name = MinSizeRel;
6565 }; 6457 };
6566 - D29F9DAF953C46E088FA1D5A /* Debug */ = {  
6567 - isa = XCBuildConfiguration;  
6568 - buildSettings = {  
6569 - COMBINE_HIDPI_IMAGES = YES;  
6570 - GCC_GENERATE_DEBUGGING_SYMBOLS = YES;  
6571 - GCC_INLINES_ARE_PRIVATE_EXTERN = NO;  
6572 - GCC_OPTIMIZATION_LEVEL = 0;  
6573 - GCC_PREPROCESSOR_DEFINITIONS = "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'";  
6574 - GCC_SYMBOLS_PRIVATE_EXTERN = NO;  
6575 - INSTALL_PATH = "";  
6576 - OTHER_LDFLAGS = " ";  
6577 - OTHER_REZFLAGS = "";  
6578 - PRODUCT_NAME = ZERO_CHECK;  
6579 - SECTORDER_FLAGS = "";  
6580 - SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";  
6581 - USE_HEADERMAP = NO;  
6582 - WARNING_CFLAGS = "$(inherited)";  
6583 - };  
6584 - name = Debug;  
6585 - };  
6586 D6AC19F5D46F43CE95293A92 /* MinSizeRel */ = { 6458 D6AC19F5D46F43CE95293A92 /* MinSizeRel */ = {
6587 isa = XCBuildConfiguration; 6459 isa = XCBuildConfiguration;
6588 buildSettings = { 6460 buildSettings = {
@@ -6761,7 +6633,7 @@ @@ -6761,7 +6633,7 @@
6761 PRODUCT_NAME = external; 6633 PRODUCT_NAME = external;
6762 SECTORDER_FLAGS = ""; 6634 SECTORDER_FLAGS = "";
6763 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external"; 6635 SYMROOT = "$(SRCROOT)/../cocosgame/engine/external";
6764 - 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"; 6636 + 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";
6765 USE_HEADERMAP = NO; 6637 USE_HEADERMAP = NO;
6766 WARNING_CFLAGS = "$(inherited)"; 6638 WARNING_CFLAGS = "$(inherited)";
6767 }; 6639 };
@@ -6819,7 +6691,7 @@ @@ -6819,7 +6691,7 @@
6819 PRODUCT_NAME = cocos2d; 6691 PRODUCT_NAME = cocos2d;
6820 SECTORDER_FLAGS = ""; 6692 SECTORDER_FLAGS = "";
6821 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core"; 6693 SYMROOT = "$(SRCROOT)/../cocosgame/engine/cocos/core";
6822 - 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"; 6694 + 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";
6823 USE_HEADERMAP = NO; 6695 USE_HEADERMAP = NO;
6824 WARNING_CFLAGS = "$(inherited)"; 6696 WARNING_CFLAGS = "$(inherited)";
6825 }; 6697 };
@@ -7053,17 +6925,6 @@ @@ -7053,17 +6925,6 @@
7053 defaultConfigurationIsVisible = 0; 6925 defaultConfigurationIsVisible = 0;
7054 defaultConfigurationName = Debug; 6926 defaultConfigurationName = Debug;
7055 }; 6927 };
7056 - 49CE71CEE7C845BE8AD863B0 /* Build configuration list for PBXAggregateTarget "ZERO_CHECK" */ = {  
7057 - isa = XCConfigurationList;  
7058 - buildConfigurations = (  
7059 - D29F9DAF953C46E088FA1D5A /* Debug */,  
7060 - 25F8294DD68A48A2885516BE /* Release */,  
7061 - 5CE0E60DE7794B26B4BA209D /* MinSizeRel */,  
7062 - 8B20D80D7A40473396066F25 /* RelWithDebInfo */,  
7063 - );  
7064 - defaultConfigurationIsVisible = 0;  
7065 - defaultConfigurationName = Debug;  
7066 - };  
7067 4A88FE3109F34B16AF627065 /* Build configuration list for PBXNativeTarget "ext_xxtea" */ = { 6928 4A88FE3109F34B16AF627065 /* Build configuration list for PBXNativeTarget "ext_xxtea" */ = {
7068 isa = XCConfigurationList; 6929 isa = XCConfigurationList;
7069 buildConfigurations = ( 6930 buildConfigurations = (