diff --git a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp b/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp index 76171578ab..3959a7467c 100644 --- a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp +++ b/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp @@ -145,9 +145,9 @@ bool UpdateLayer::init() Size size = Director::sharedDirector()->getWinSize(); - pItemReset = MenuItemFont::create("reset", this, menu_selector(UpdateLayer::reset)); - pItemEnter = MenuItemFont::create("enter", this, menu_selector(UpdateLayer::enter)); - pItemUpdate = MenuItemFont::create("update", this, menu_selector(UpdateLayer::update)); + pItemReset = MenuItemFont::create("reset", CC_CALLBACK_1(UpdateLayer::reset,this)); + pItemEnter = MenuItemFont::create("enter", CC_CALLBACK_1(UpdateLayer::enter, this)); + pItemUpdate = MenuItemFont::create("update", CC_CALLBACK_1(UpdateLayer::update, this)); pItemEnter->setPosition(ccp(size.width/2, size.height/2 + 50)); pItemReset->setPosition(ccp(size.width/2, size.height/2)); diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/AssetsManagerTest.xcodeproj/project.pbxproj b/samples/Cpp/AssetsManagerTest/proj.ios/AssetsManagerTest.xcodeproj/project.pbxproj index 5521e1bb7b..37c00a1cfc 100644 --- a/samples/Cpp/AssetsManagerTest/proj.ios/AssetsManagerTest.xcodeproj/project.pbxproj +++ b/samples/Cpp/AssetsManagerTest/proj.ios/AssetsManagerTest.xcodeproj/project.pbxproj @@ -7,11 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1A6B059A177828E700FFE52B /* libchipmunk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B0595177828E700FFE52B /* libchipmunk.a */; }; - 1A6B059B177828E700FFE52B /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B0596177828E700FFE52B /* libcocos2dx.a */; }; - 1A6B059C177828E700FFE52B /* libCocosDenshion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B0597177828E700FFE52B /* libCocosDenshion.a */; }; - 1A6B059D177828E700FFE52B /* libextensions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B0598177828E700FFE52B /* libextensions.a */; }; - 1A6B059E177828E700FFE52B /* libjsbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6B0599177828E700FFE52B /* libjsbindings.a */; }; 1A6B05B81778293600FFE52B /* jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A6B05A01778291500FFE52B /* jsb.js */; }; 1A6B05B91778293600FFE52B /* jsb_chipmunk.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A6B05A11778291500FFE52B /* jsb_chipmunk.js */; }; 1A6B05BA1778293600FFE52B /* jsb_chipmunk_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1A6B05A21778291500FFE52B /* jsb_chipmunk_constants.js */; }; @@ -50,14 +45,15 @@ 46A212B316D4A43400723F2B /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 46A212B116D4A41700723F2B /* main.js */; }; 46A212BE16D4A4C000723F2B /* myApp.js in Resources */ = {isa = PBXBuildFile; fileRef = 46A212BC16D4A4B100723F2B /* myApp.js */; }; 46A2146116D4B04A00723F2B /* Background.png in Resources */ = {isa = PBXBuildFile; fileRef = 46A2146016D4B04A00723F2B /* Background.png */; }; + A0C2189D1779272900BE78B5 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A0C2189C1779272900BE78B5 /* Default-568h@2x.png */; }; + A0F3A9B8177905F600CF0EB6 /* libchipmunk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9B3177905F600CF0EB6 /* libchipmunk.a */; }; + A0F3A9B9177905F600CF0EB6 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9B4177905F600CF0EB6 /* libcocos2dx.a */; }; + A0F3A9BA177905F600CF0EB6 /* libCocosDenshion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9B5177905F600CF0EB6 /* libCocosDenshion.a */; }; + A0F3A9BB177905F600CF0EB6 /* libextensions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9B6177905F600CF0EB6 /* libextensions.a */; }; + A0F3A9BC177905F600CF0EB6 /* libjsbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9B7177905F600CF0EB6 /* libjsbindings.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1A6B0595177828E700FFE52B /* libchipmunk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libchipmunk.a; path = "../../../../external/chipmunk/proj.ios/build/Release-iphoneos/libchipmunk.a"; sourceTree = ""; }; - 1A6B0596177828E700FFE52B /* libcocos2dx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcocos2dx.a; path = "../../../../cocos2dx/proj.ios/build/Release-iphoneos/libcocos2dx.a"; sourceTree = ""; }; - 1A6B0597177828E700FFE52B /* libCocosDenshion.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCocosDenshion.a; path = "../../../../CocosDenshion/proj.ios/build/Release-iphoneos/libCocosDenshion.a"; sourceTree = ""; }; - 1A6B0598177828E700FFE52B /* libextensions.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libextensions.a; path = "../../../../extensions/proj.ios/build/Release-iphoneos/libextensions.a"; sourceTree = ""; }; - 1A6B0599177828E700FFE52B /* libjsbindings.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsbindings.a; path = "../../../../scripting/javascript/bindings/proj.ios/build/Release-iphoneos/libjsbindings.a"; sourceTree = ""; }; 1A6B05A01778291500FFE52B /* jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb.js; sourceTree = ""; }; 1A6B05A11778291500FFE52B /* jsb_chipmunk.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_chipmunk.js; sourceTree = ""; }; 1A6B05A21778291500FFE52B /* jsb_chipmunk_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_chipmunk_constants.js; sourceTree = ""; }; @@ -99,6 +95,12 @@ 46A212B116D4A41700723F2B /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = main.js; sourceTree = ""; }; 46A212BC16D4A4B100723F2B /* myApp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = myApp.js; sourceTree = ""; }; 46A2146016D4B04A00723F2B /* Background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Background.png; sourceTree = ""; }; + A0C2189C1779272900BE78B5 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + A0F3A9B3177905F600CF0EB6 /* libchipmunk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libchipmunk.a; path = "../../../../external/chipmunk/proj.ios/build/Release-iphoneos/libchipmunk.a"; sourceTree = ""; }; + A0F3A9B4177905F600CF0EB6 /* libcocos2dx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcocos2dx.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libcocos2dx.a"; sourceTree = ""; }; + A0F3A9B5177905F600CF0EB6 /* libCocosDenshion.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCocosDenshion.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libCocosDenshion.a"; sourceTree = ""; }; + A0F3A9B6177905F600CF0EB6 /* libextensions.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libextensions.a; path = "../../../../extensions/proj.ios/build/Release-iphoneos/libextensions.a"; sourceTree = ""; }; + A0F3A9B7177905F600CF0EB6 /* libjsbindings.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsbindings.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libjsbindings.a"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -106,13 +108,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A0F3A9B8177905F600CF0EB6 /* libchipmunk.a in Frameworks */, + A0F3A9B9177905F600CF0EB6 /* libcocos2dx.a in Frameworks */, + A0F3A9BA177905F600CF0EB6 /* libCocosDenshion.a in Frameworks */, + A0F3A9BB177905F600CF0EB6 /* libextensions.a in Frameworks */, + A0F3A9BC177905F600CF0EB6 /* libjsbindings.a in Frameworks */, 1A6B05CB17782B8700FFE52B /* libsqlite3.dylib in Frameworks */, 1A6B05C917782B8100FFE52B /* libz.dylib in Frameworks */, - 1A6B059A177828E700FFE52B /* libchipmunk.a in Frameworks */, - 1A6B059B177828E700FFE52B /* libcocos2dx.a in Frameworks */, - 1A6B059C177828E700FFE52B /* libCocosDenshion.a in Frameworks */, - 1A6B059D177828E700FFE52B /* libextensions.a in Frameworks */, - 1A6B059E177828E700FFE52B /* libjsbindings.a in Frameworks */, 469A7A0216C0F242006FFCB2 /* QuartzCore.framework in Frameworks */, 469A7A0416C0F242006FFCB2 /* OpenGLES.framework in Frameworks */, 469A7A0616C0F242006FFCB2 /* OpenAL.framework in Frameworks */, @@ -150,6 +152,7 @@ 469A79F516C0F242006FFCB2 = { isa = PBXGroup; children = ( + A0C2189C1779272900BE78B5 /* Default-568h@2x.png */, 469A7D0516C0F429006FFCB2 /* Classes */, 469A7A0016C0F242006FFCB2 /* Frameworks */, 469A7CEE16C0F311006FFCB2 /* ios */, @@ -169,13 +172,13 @@ 469A7A0016C0F242006FFCB2 /* Frameworks */ = { isa = PBXGroup; children = ( + A0F3A9B3177905F600CF0EB6 /* libchipmunk.a */, + A0F3A9B4177905F600CF0EB6 /* libcocos2dx.a */, + A0F3A9B5177905F600CF0EB6 /* libCocosDenshion.a */, + A0F3A9B6177905F600CF0EB6 /* libextensions.a */, + A0F3A9B7177905F600CF0EB6 /* libjsbindings.a */, 1A6B05CA17782B8700FFE52B /* libsqlite3.dylib */, 1A6B05C817782B8100FFE52B /* libz.dylib */, - 1A6B0595177828E700FFE52B /* libchipmunk.a */, - 1A6B0596177828E700FFE52B /* libcocos2dx.a */, - 1A6B0597177828E700FFE52B /* libCocosDenshion.a */, - 1A6B0598177828E700FFE52B /* libextensions.a */, - 1A6B0599177828E700FFE52B /* libjsbindings.a */, 469A7A0116C0F242006FFCB2 /* QuartzCore.framework */, 469A7A0316C0F242006FFCB2 /* OpenGLES.framework */, 469A7A0516C0F242006FFCB2 /* OpenAL.framework */, @@ -304,6 +307,7 @@ 469A7DD716C0F74F006FFCB2 /* Icon.png in Resources */, 469A7DD816C0F74F006FFCB2 /* Icon@2x.png in Resources */, 46A2146116D4B04A00723F2B /* Background.png in Resources */, + A0C2189D1779272900BE78B5 /* Default-568h@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp b/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp index 6af1af1671..8276d26854 100644 --- a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp +++ b/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp @@ -39,8 +39,7 @@ bool HelloWorld::init() MenuItemImage *pCloseItem = MenuItemImage::create( "CloseNormal.png", "CloseSelected.png", - this, - menu_selector(HelloWorld::menuCloseCallback)); + CC_CALLBACK_1(HelloWorld::menuCloseCallback,this)); pCloseItem->setPosition(ccp(origin.x + visibleSize.width - pCloseItem->getContentSize().width/2 , origin.y + pCloseItem->getContentSize().height/2)); diff --git a/samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj b/samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj index 4c92ccca8f..0898a5b77a 100644 --- a/samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj +++ b/samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj @@ -8,12 +8,12 @@ /* Begin PBXBuildFile section */ 15003FA315D2601D00B6775A /* iphone in Resources */ = {isa = PBXBuildFile; fileRef = 15003FA215D2601D00B6775A /* iphone */; }; - 1A0C0A6B1777F65600838530 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A0C0A6A1777F65600838530 /* libcocos2dx.a */; }; 1A1CF3691626CEFF00AFC938 /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 1A1CF3671626CEFF00AFC938 /* ipad */; }; 1A1CF36A1626CEFF00AFC938 /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 1A1CF3681626CEFF00AFC938 /* ipadhd */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; + A0F3A9BE1779062B00CF0EB6 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9BD1779062B00CF0EB6 /* libcocos2dx.a */; }; BF1373EF128A898400D9F789 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492D4B1289302400A09262 /* OpenGLES.framework */; }; BF1373F0128A899500D9F789 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492C21128924A800A09262 /* libxml2.dylib */; }; BF1373F1128A899E00D9F789 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492B6912891AC600A09262 /* libz.dylib */; }; @@ -34,7 +34,6 @@ /* Begin PBXFileReference section */ 15003FA215D2601D00B6775A /* iphone */ = {isa = PBXFileReference; lastKnownFileType = folder; path = iphone; sourceTree = ""; }; - 1A0C0A6A1777F65600838530 /* libcocos2dx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcocos2dx.a; path = "../../../../cocos2dx/proj.ios/build/Release-iphoneos/libcocos2dx.a"; sourceTree = ""; }; 1A1CF3661626CB6000AFC938 /* AppMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppMacros.h; sourceTree = ""; }; 1A1CF3671626CEFF00AFC938 /* ipad */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ipad; sourceTree = ""; }; 1A1CF3681626CEFF00AFC938 /* ipadhd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ipadhd; sourceTree = ""; }; @@ -45,6 +44,11 @@ 781C33B11547F06B00633F88 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 781C33B31547F06B00633F88 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 781C33B51547F06B00633F88 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + A0F3A9BD1779062B00CF0EB6 /* libcocos2dx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcocos2dx.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libcocos2dx.a"; sourceTree = ""; }; + A0F3A9BF1779069A00CF0EB6 /* libBox2D.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libBox2D.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libBox2D.a"; sourceTree = ""; }; + A0F3A9C01779069A00CF0EB6 /* libchipmunk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libchipmunk.a; path = "../../../../external/chipmunk/proj.ios/build/Release-iphoneos/libchipmunk.a"; sourceTree = ""; }; + A0F3A9C11779069A00CF0EB6 /* libCocosDenshion.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCocosDenshion.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libCocosDenshion.a"; sourceTree = ""; }; + A0F3A9C21779069A00CF0EB6 /* libextensions.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libextensions.a; path = "../../../../extensions/proj.ios/build/Release-iphoneos/libextensions.a"; sourceTree = ""; }; BF137426128A8E4600D9F789 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; BF23D4E3143315EB00657E08 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = ""; }; BF23D4E4143315EB00657E08 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -72,7 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1A0C0A6B1777F65600838530 /* libcocos2dx.a in Frameworks */, + A0F3A9BE1779062B00CF0EB6 /* libcocos2dx.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, @@ -109,7 +113,11 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 1A0C0A6A1777F65600838530 /* libcocos2dx.a */, + A0F3A9BF1779069A00CF0EB6 /* libBox2D.a */, + A0F3A9C01779069A00CF0EB6 /* libchipmunk.a */, + A0F3A9C11779069A00CF0EB6 /* libCocosDenshion.a */, + A0F3A9C21779069A00CF0EB6 /* libextensions.a */, + A0F3A9BD1779062B00CF0EB6 /* libcocos2dx.a */, BF492B6912891AC600A09262 /* libz.dylib */, BF137426128A8E4600D9F789 /* QuartzCore.framework */, BF492D4B1289302400A09262 /* OpenGLES.framework */, diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp index 3481f9a79b..fba75a33e8 100644 --- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp +++ b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp @@ -72,8 +72,7 @@ bool HelloWorld::init() MenuItemImage *pCloseItem = MenuItemImage::create( "CloseNormal.png", "CloseSelected.png", - this, - menu_selector(HelloWorld::menuCloseCallback)); + CC_CALLBACK_1(HelloWorld::menuCloseCallback,this)); CC_BREAK_IF(! pCloseItem); // Place the menu item bottom-right conner. diff --git a/samples/Cpp/SimpleGame/proj.ios/SimpleGame.xcodeproj/project.pbxproj b/samples/Cpp/SimpleGame/proj.ios/SimpleGame.xcodeproj/project.pbxproj index eec9587653..741e720d41 100644 --- a/samples/Cpp/SimpleGame/proj.ios/SimpleGame.xcodeproj/project.pbxproj +++ b/samples/Cpp/SimpleGame/proj.ios/SimpleGame.xcodeproj/project.pbxproj @@ -3,16 +3,16 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 1A6E475F177819520055514D /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6E475D177819520055514D /* libcocos2dx.a */; }; - 1A6E4760177819520055514D /* libCocosDenshion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A6E475E177819520055514D /* libCocosDenshion.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; 782F4619153FEDF0009FC2E5 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 782F4617153FEDF0009FC2E5 /* Default.png */; }; + A0F3A9B01779050000CF0EB6 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9AF1779050000CF0EB6 /* libcocos2dx.a */; }; + A0F3A9B21779052600CF0EB6 /* libCocosDenshion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A0F3A9B11779052600CF0EB6 /* libCocosDenshion.a */; }; BF1373EF128A898400D9F789 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492D4B1289302400A09262 /* OpenGLES.framework */; }; BF1373F0128A899500D9F789 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492C21128924A800A09262 /* libxml2.dylib */; }; BF1373F1128A899E00D9F789 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492B6912891AC600A09262 /* libz.dylib */; }; @@ -39,8 +39,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1A6E475D177819520055514D /* libcocos2dx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcocos2dx.a; path = "../../../../cocos2dx/proj.ios/build/Release-iphoneos/libcocos2dx.a"; sourceTree = ""; }; - 1A6E475E177819520055514D /* libCocosDenshion.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCocosDenshion.a; path = "../../../../CocosDenshion/proj.ios/build/Release-iphoneos/libCocosDenshion.a"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* SimpleGame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SimpleGame.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -49,6 +47,8 @@ 781C33B31547F06B00633F88 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 781C33B51547F06B00633F88 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 782F4617153FEDF0009FC2E5 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; + A0F3A9AF1779050000CF0EB6 /* libcocos2dx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcocos2dx.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libcocos2dx.a"; sourceTree = ""; }; + A0F3A9B11779052600CF0EB6 /* libCocosDenshion.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCocosDenshion.a; path = "../../../../../../Library/Developer/Xcode/DerivedData/cocos2d-ios-efgwnjcjlugbweaakhyrdehqseht/Build/Products/Debug-iphoneos/libCocosDenshion.a"; sourceTree = ""; }; BF137426128A8E4600D9F789 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; BF23D4E3143315EB00657E08 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = ""; }; BF23D4E4143315EB00657E08 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -81,8 +81,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1A6E475F177819520055514D /* libcocos2dx.a in Frameworks */, - 1A6E4760177819520055514D /* libCocosDenshion.a in Frameworks */, + A0F3A9B21779052600CF0EB6 /* libCocosDenshion.a in Frameworks */, + A0F3A9B01779050000CF0EB6 /* libcocos2dx.a in Frameworks */, D4E6BCCE15FCBAD7008BF525 /* AudioToolbox.framework in Frameworks */, D4E6BCCD15FCBAC8008BF525 /* AVFoundation.framework in Frameworks */, D4E6BCCC15FCBABC008BF525 /* OpenAL.framework in Frameworks */, @@ -122,8 +122,8 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - 1A6E475D177819520055514D /* libcocos2dx.a */, - 1A6E475E177819520055514D /* libCocosDenshion.a */, + A0F3A9B11779052600CF0EB6 /* libCocosDenshion.a */, + A0F3A9AF1779050000CF0EB6 /* libcocos2dx.a */, BF492B6912891AC600A09262 /* libz.dylib */, BF137426128A8E4600D9F789 /* QuartzCore.framework */, BF492D4B1289302400A09262 /* OpenGLES.framework */, @@ -208,8 +208,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0460; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleGame" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -296,7 +299,6 @@ ); INFOPLIST_FILE = "SimpleGame-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = SimpleGame; PROVISIONING_PROFILE = ""; @@ -334,7 +336,6 @@ ); INFOPLIST_FILE = "SimpleGame-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = "$(inherited)"; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = SimpleGame; PROVISIONING_PROFILE = ""; @@ -354,7 +355,6 @@ GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; SDKROOT = iphoneos; VALID_ARCHS = "armv6 armv7 i386"; }; @@ -370,7 +370,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PREBINDING = NO; SDKROOT = iphoneos; VALID_ARCHS = "armv6 armv7 i386"; }; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h index 320bceeb6d..58a781ecf5 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h @@ -11,7 +11,7 @@ #include "cocos2d.h" #include "cocos-ext.h" -#include "WebSocket.h" +#include "network/WebSocket.h" class WebSocketTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id index 5aa9bbf88e..85a7ea5155 100644 --- a/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -0ac4a6e24af867140f59a7a7429c214049731e60 \ No newline at end of file +a000f34faade66f3ab3354b00fa7b2c2aebd339c \ No newline at end of file