diff --git a/samples/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj b/samples/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj index 8e0c4bd6f6..3e9f986059 100644 --- a/samples/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj +++ b/samples/MoonWarriors/proj.ios/MoonWarriors.xcodeproj/project.pbxproj @@ -23,14 +23,9 @@ 15675007163E737B0002AD61 /* CocosDenshion.m in Sources */ = {isa = PBXBuildFile; fileRef = 15674FA7163E737B0002AD61 /* CocosDenshion.m */; }; 15675008163E737B0002AD61 /* SimpleAudioEngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15674FA8163E737B0002AD61 /* SimpleAudioEngine.mm */; }; 15675009163E737B0002AD61 /* SimpleAudioEngine_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 15674FAA163E737B0002AD61 /* SimpleAudioEngine_objc.m */; }; - 15675108163E73B10002AD61 /* Android.mk in Resources */ = {isa = PBXBuildFile; fileRef = 1567502C163E73B10002AD61 /* Android.mk */; }; - 15675109163E73B10002AD61 /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1567502D163E73B10002AD61 /* CCPhysicsSprite.cpp */; }; 1567510A163E73B10002AD61 /* cocos2d_specifics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1567502F163E73B10002AD61 /* cocos2d_specifics.cpp */; }; - 1567510B163E73B10002AD61 /* cocosjs_manual_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15675031163E73B10002AD61 /* cocosjs_manual_conversions.cpp */; }; 1567510C163E73B10002AD61 /* cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15675034163E73B10002AD61 /* cocos2dx.cpp */; }; 1567510E163E73B10002AD61 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 15675037163E73B10002AD61 /* README */; }; - 1567510F163E73B10002AD61 /* js_bindings_ccbreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15675038163E73B10002AD61 /* js_bindings_ccbreader.cpp */; }; - 15675112163E73B10002AD61 /* js_manual_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1567503F163E73B10002AD61 /* js_manual_conversions.cpp */; }; 15675113163E73B10002AD61 /* ScriptingCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15675041163E73B10002AD61 /* ScriptingCore.cpp */; }; 15675125163E74050002AD61 /* js in Resources */ = {isa = PBXBuildFile; fileRef = 15675124163E74050002AD61 /* js */; }; 1567516D163E741E0002AD61 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15675164163E741E0002AD61 /* Default-568h@2x.png */; }; @@ -122,11 +117,6 @@ 156752F9163E82D40002AD61 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 156752F8163E82D40002AD61 /* libz.dylib */; }; 15675300163E870E0002AD61 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 156752FF163E870E0002AD61 /* libxml2.dylib */; }; 1A4C5FDD164362D800509019 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 1A4C5FDC164362D800509019 /* res */; }; - 263B99141655694D00228D8A /* js_bindings_chipmunk_auto_classes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263B990B1655694D00228D8A /* js_bindings_chipmunk_auto_classes.cpp */; }; - 263B99151655694D00228D8A /* js_bindings_chipmunk_registration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263B99101655694D00228D8A /* js_bindings_chipmunk_registration.cpp */; }; - 263B99161655694D00228D8A /* js_bindings_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 263B99121655694D00228D8A /* js_bindings_core.cpp */; }; - 26DAC48616556C2B00EE807D /* js_bindings_chipmunk_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DAC48516556C2B00EE807D /* js_bindings_chipmunk_manual.cpp */; }; - 26DAC48D16556FFB00EE807D /* js_bindings_chipmunk_functions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DAC48C16556FFB00EE807D /* js_bindings_chipmunk_functions.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -175,22 +165,12 @@ 15674FA8163E737B0002AD61 /* SimpleAudioEngine.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimpleAudioEngine.mm; sourceTree = ""; }; 15674FA9163E737B0002AD61 /* SimpleAudioEngine_objc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleAudioEngine_objc.h; sourceTree = ""; }; 15674FAA163E737B0002AD61 /* SimpleAudioEngine_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleAudioEngine_objc.m; sourceTree = ""; }; - 1567502C163E73B10002AD61 /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = ""; }; - 1567502D163E73B10002AD61 /* CCPhysicsSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsSprite.cpp; sourceTree = ""; }; - 1567502E163E73B10002AD61 /* CCPhysicsSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsSprite.h; sourceTree = ""; }; 1567502F163E73B10002AD61 /* cocos2d_specifics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocos2d_specifics.cpp; sourceTree = ""; }; 15675030163E73B10002AD61 /* cocos2d_specifics.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cocos2d_specifics.hpp; sourceTree = ""; }; - 15675031163E73B10002AD61 /* cocosjs_manual_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocosjs_manual_conversions.cpp; sourceTree = ""; }; - 15675032163E73B10002AD61 /* cocosjs_manual_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocosjs_manual_conversions.h; sourceTree = ""; }; 15675034163E73B10002AD61 /* cocos2dx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocos2dx.cpp; sourceTree = ""; }; 15675035163E73B10002AD61 /* cocos2dx.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cocos2dx.hpp; sourceTree = ""; }; 15675036163E73B10002AD61 /* cocos2dxapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = cocos2dxapi.js; sourceTree = ""; }; 15675037163E73B10002AD61 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; - 15675038163E73B10002AD61 /* js_bindings_ccbreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_ccbreader.cpp; sourceTree = ""; }; - 15675039163E73B10002AD61 /* js_bindings_ccbreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_ccbreader.h; sourceTree = ""; }; - 1567503E163E73B10002AD61 /* js_bindings_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_config.h; sourceTree = ""; }; - 1567503F163E73B10002AD61 /* js_manual_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_manual_conversions.cpp; sourceTree = ""; }; - 15675040163E73B10002AD61 /* js_manual_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_manual_conversions.h; sourceTree = ""; }; 15675041163E73B10002AD61 /* ScriptingCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptingCore.cpp; sourceTree = ""; }; 15675042163E73B10002AD61 /* ScriptingCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptingCore.h; sourceTree = ""; }; 15675043163E73B10002AD61 /* spidermonkey_specifics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spidermonkey_specifics.h; sourceTree = ""; }; @@ -363,18 +343,6 @@ 156752F8163E82D40002AD61 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 156752FF163E870E0002AD61 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; }; 1A4C5FDC164362D800509019 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../Resources/res; sourceTree = ""; }; - 263B990A1655694D00228D8A /* js_bindings_chipmunk_auto_classes_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_auto_classes_registration.h; sourceTree = ""; }; - 263B990B1655694D00228D8A /* js_bindings_chipmunk_auto_classes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_auto_classes.cpp; sourceTree = ""; }; - 263B990C1655694D00228D8A /* js_bindings_chipmunk_auto_classes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_auto_classes.h; sourceTree = ""; }; - 263B990D1655694D00228D8A /* js_bindings_chipmunk_functions_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_functions_registration.h; sourceTree = ""; }; - 263B990E1655694D00228D8A /* js_bindings_chipmunk_functions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_functions.h; sourceTree = ""; }; - 263B990F1655694D00228D8A /* js_bindings_chipmunk_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_manual.h; sourceTree = ""; }; - 263B99101655694D00228D8A /* js_bindings_chipmunk_registration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_registration.cpp; sourceTree = ""; }; - 263B99111655694D00228D8A /* js_bindings_chipmunk_registration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_chipmunk_registration.h; sourceTree = ""; }; - 263B99121655694D00228D8A /* js_bindings_core.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_core.cpp; sourceTree = ""; }; - 263B99131655694D00228D8A /* js_bindings_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_core.h; sourceTree = ""; }; - 26DAC48516556C2B00EE807D /* js_bindings_chipmunk_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_manual.cpp; sourceTree = ""; }; - 26DAC48C16556FFB00EE807D /* js_bindings_chipmunk_functions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_functions.cpp; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -521,31 +489,9 @@ 1567502B163E73B10002AD61 /* bindings */ = { isa = PBXGroup; children = ( - 26DAC48C16556FFB00EE807D /* js_bindings_chipmunk_functions.cpp */, - 26DAC48516556C2B00EE807D /* js_bindings_chipmunk_manual.cpp */, - 263B990A1655694D00228D8A /* js_bindings_chipmunk_auto_classes_registration.h */, - 263B990B1655694D00228D8A /* js_bindings_chipmunk_auto_classes.cpp */, - 263B990C1655694D00228D8A /* js_bindings_chipmunk_auto_classes.h */, - 263B990D1655694D00228D8A /* js_bindings_chipmunk_functions_registration.h */, - 263B990E1655694D00228D8A /* js_bindings_chipmunk_functions.h */, - 263B990F1655694D00228D8A /* js_bindings_chipmunk_manual.h */, - 263B99101655694D00228D8A /* js_bindings_chipmunk_registration.cpp */, - 263B99111655694D00228D8A /* js_bindings_chipmunk_registration.h */, - 263B99121655694D00228D8A /* js_bindings_core.cpp */, - 263B99131655694D00228D8A /* js_bindings_core.h */, - 1567502C163E73B10002AD61 /* Android.mk */, - 1567502D163E73B10002AD61 /* CCPhysicsSprite.cpp */, - 1567502E163E73B10002AD61 /* CCPhysicsSprite.h */, 1567502F163E73B10002AD61 /* cocos2d_specifics.cpp */, 15675030163E73B10002AD61 /* cocos2d_specifics.hpp */, - 15675031163E73B10002AD61 /* cocosjs_manual_conversions.cpp */, - 15675032163E73B10002AD61 /* cocosjs_manual_conversions.h */, 15675033163E73B10002AD61 /* generated */, - 15675038163E73B10002AD61 /* js_bindings_ccbreader.cpp */, - 15675039163E73B10002AD61 /* js_bindings_ccbreader.h */, - 1567503E163E73B10002AD61 /* js_bindings_config.h */, - 1567503F163E73B10002AD61 /* js_manual_conversions.cpp */, - 15675040163E73B10002AD61 /* js_manual_conversions.h */, 15675041163E73B10002AD61 /* ScriptingCore.cpp */, 15675042163E73B10002AD61 /* ScriptingCore.h */, 15675043163E73B10002AD61 /* spidermonkey_specifics.h */, @@ -898,7 +844,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15675108163E73B10002AD61 /* Android.mk in Resources */, 1567510E163E73B10002AD61 /* README in Resources */, 15675125163E74050002AD61 /* js in Resources */, 1567516D163E741E0002AD61 /* Default-568h@2x.png in Resources */, @@ -931,12 +876,8 @@ 15675007163E737B0002AD61 /* CocosDenshion.m in Sources */, 15675008163E737B0002AD61 /* SimpleAudioEngine.mm in Sources */, 15675009163E737B0002AD61 /* SimpleAudioEngine_objc.m in Sources */, - 15675109163E73B10002AD61 /* CCPhysicsSprite.cpp in Sources */, 1567510A163E73B10002AD61 /* cocos2d_specifics.cpp in Sources */, - 1567510B163E73B10002AD61 /* cocosjs_manual_conversions.cpp in Sources */, 1567510C163E73B10002AD61 /* cocos2dx.cpp in Sources */, - 1567510F163E73B10002AD61 /* js_bindings_ccbreader.cpp in Sources */, - 15675112163E73B10002AD61 /* js_manual_conversions.cpp in Sources */, 15675113163E73B10002AD61 /* ScriptingCore.cpp in Sources */, 156751F4163E765D0002AD61 /* CCBAnimationManager.cpp in Sources */, 156751F5163E765D0002AD61 /* CCBFileLoader.cpp in Sources */, @@ -1011,11 +952,6 @@ 156752A5163E77A90002AD61 /* cpSweep1D.c in Sources */, 156752A6163E77A90002AD61 /* cpVect.c in Sources */, 156752A9163E78180002AD61 /* RootViewController.mm in Sources */, - 263B99141655694D00228D8A /* js_bindings_chipmunk_auto_classes.cpp in Sources */, - 263B99151655694D00228D8A /* js_bindings_chipmunk_registration.cpp in Sources */, - 263B99161655694D00228D8A /* js_bindings_core.cpp in Sources */, - 26DAC48616556C2B00EE807D /* js_bindings_chipmunk_manual.cpp in Sources */, - 26DAC48D16556FFB00EE807D /* js_bindings_chipmunk_functions.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1098,7 +1034,8 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Prefix.pch; - "GCC_THUMB_SUPPORT[arch=armv6]" = ""; + GCC_THUMB_SUPPORT = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", "\"$(SRCROOT)/../../../cocos2dx\"", @@ -1134,7 +1071,8 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Prefix.pch; - "GCC_THUMB_SUPPORT[arch=armv6]" = ""; + GCC_THUMB_SUPPORT = NO; + GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", "\"$(SRCROOT)/../../../cocos2dx\"", diff --git a/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj b/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj index 0799045f70..f3ce9968f1 100644 --- a/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj +++ b/samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj @@ -1142,7 +1142,8 @@ USE_FILE32API, TARGET_OS_IPHONE, ); - "GCC_THUMB_SUPPORT[arch=armv6]" = ""; + GCC_THUMB_SUPPORT = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", @@ -1181,7 +1182,7 @@ USE_FILE32API, TARGET_OS_IPHONE, ); - "GCC_THUMB_SUPPORT[arch=armv6]" = ""; + GCC_THUMB_SUPPORT = NO; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",