From b0e4757c24aa8d9cc9377789312d2ea0b65a8b0f Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Thu, 4 Jul 2013 17:54:02 +0800 Subject: [PATCH 01/20] issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader --- cocos2dx/actions/CCActionInstant.cpp | 13 ++++++++++--- cocos2dx/base_nodes/CCNode.cpp | 2 +- extensions/CCBReader/CCBAnimationManager.cpp | 2 +- scripting/lua/cocos2dx_support/CCBProxy.cpp | 2 +- scripting/lua/cocos2dx_support/CCBProxy.h | 2 +- scripting/lua/cocos2dx_support/CCLuaEngine.cpp | 2 +- .../lua/cocos2dx_support/Lua_extensions_CCB.cpp | 12 ++++++------ 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/cocos2dx/actions/CCActionInstant.cpp b/cocos2dx/actions/CCActionInstant.cpp index 578c5b1ade..5411ec4809 100644 --- a/cocos2dx/actions/CCActionInstant.cpp +++ b/cocos2dx/actions/CCActionInstant.cpp @@ -511,6 +511,10 @@ CallFunc * CallFunc::clone() const } else if( _function ) a->initWithFunction(_function); + else if (_scriptHandler > 0 ) { + a->_scriptHandler = cocos2d::ScriptEngineManager::sharedManager()->getScriptEngine()->reallocateScriptHandler(_scriptHandler); + } + a->autorelease(); return a; @@ -561,7 +565,7 @@ void CallFunc::execute() { } else if( _function ) _function(); if (0 != _scriptHandler) { - BasicScriptData data((void*)&_scriptHandler); + BasicScriptData data((void*)this); ScriptEvent event(kCallFuncEvent,(void*)&data); ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); } @@ -621,8 +625,11 @@ void CallFuncN::execute() { else if (_functionN) { _functionN(_target); } - if (_scriptHandler) { - ScriptEngineManager::sharedManager()->getScriptEngine()->executeCallFuncActionEvent(this, _target); + if (0 != _scriptHandler) + { + BasicScriptData data((void*)this,(void*)_target); + ScriptEvent event(kCallFuncEvent,(void*)&data); + ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); } } diff --git a/cocos2dx/base_nodes/CCNode.cpp b/cocos2dx/base_nodes/CCNode.cpp index 4b741d4425..299a7d99d4 100644 --- a/cocos2dx/base_nodes/CCNode.cpp +++ b/cocos2dx/base_nodes/CCNode.cpp @@ -549,7 +549,7 @@ void Node::cleanup() ScriptEvent scriptEvent(kNodeEvent,(void*)&data); ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&scriptEvent); } - else if(_scriptType != kScriptTypeJavascript) + else if(_scriptType == kScriptTypeJavascript) { ScriptEngineManager::sharedManager()->getScriptEngine()->executeNodeEvent(this, kNodeOnCleanup); } diff --git a/extensions/CCBReader/CCBAnimationManager.cpp b/extensions/CCBReader/CCBAnimationManager.cpp index 88ed15d98a..51da93a0be 100644 --- a/extensions/CCBReader/CCBAnimationManager.cpp +++ b/extensions/CCBReader/CCBAnimationManager.cpp @@ -601,7 +601,7 @@ Object* CCBAnimationManager::actionForCallbackChannel(CCBSequenceProperty* chann if(jsControlled) { String* callbackName = String::createWithFormat("%d:%s", selectorTarget, selectorName.c_str()); - CallFunc *callback = (CallFunc*)(mKeyframeCallFuncs->objectForKey(callbackName->getCString()))->copy()->autorelease(); + CallFunc *callback = ((CallFunc*)(mKeyframeCallFuncs->objectForKey(callbackName->getCString())))->clone(); if(callback != NULL) { actions->addObject(callback); diff --git a/scripting/lua/cocos2dx_support/CCBProxy.cpp b/scripting/lua/cocos2dx_support/CCBProxy.cpp index 348f6e8cad..f249149091 100644 --- a/scripting/lua/cocos2dx_support/CCBProxy.cpp +++ b/scripting/lua/cocos2dx_support/CCBProxy.cpp @@ -24,7 +24,7 @@ #include "CCBProxy.h" -CCBReader* CCBProxy::createBreader() +CCBReader* CCBProxy::createCCBreader() { NodeLoaderLibrary *ccNodeLoaderLibrary = NodeLoaderLibrary::sharedNodeLoaderLibrary(); diff --git a/scripting/lua/cocos2dx_support/CCBProxy.h b/scripting/lua/cocos2dx_support/CCBProxy.h index 71d509e2f2..2dc5537cb7 100644 --- a/scripting/lua/cocos2dx_support/CCBProxy.h +++ b/scripting/lua/cocos2dx_support/CCBProxy.h @@ -14,7 +14,7 @@ public: CCBProxy() { } virtual ~ CCBProxy(){ } CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(CCBProxy, create); - CCBReader* createBreader(); + CCBReader* createCCBreader(); Node* readCCBFromFile(const char *pszFileName,CCBReader* pCCBReader,bool bSetOwner = false); const char* getNodeTypeName(Node* pNode); void setCallback(Node* pNode,int nHandle); diff --git a/scripting/lua/cocos2dx_support/CCLuaEngine.cpp b/scripting/lua/cocos2dx_support/CCLuaEngine.cpp index 692172ac2d..2ced2b697c 100644 --- a/scripting/lua/cocos2dx_support/CCLuaEngine.cpp +++ b/scripting/lua/cocos2dx_support/CCLuaEngine.cpp @@ -485,7 +485,7 @@ int LuaEngine::handleCallFuncActionEvent(void* data) return 0; BasicScriptData* basicScriptData = (BasicScriptData*)(data); - if (NULL == basicScriptData->nativeObject ||NULL == basicScriptData->value) + if (NULL == basicScriptData->nativeObject) return 0; CallFunc* callFunc = (CallFunc*)(basicScriptData->nativeObject); diff --git a/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp b/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp index 81ea47306c..9059e98a14 100644 --- a/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp +++ b/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp @@ -1902,8 +1902,8 @@ tolua_lerror: #endif //#ifndef TOLUA_DISABLE /* method: getOwnerCallbackNodes of class CCBReader */ -#ifndef TOLUA_DISABLE_tolua_Cocos2d_CCBProxy_createBreader00 -static int tolua_Cocos2d_CCBProxy_createBreader00(lua_State* tolua_S) +#ifndef TOLUA_DISABLE_tolua_Cocos2d_CCBProxy_createCCBreader00 +static int tolua_Cocos2d_CCBProxy_createCCBreader00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; @@ -1917,10 +1917,10 @@ static int tolua_Cocos2d_CCBProxy_createBreader00(lua_State* tolua_S) { CCBProxy* self = (CCBProxy*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'CreateBreader'", NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'createCCBreader'", NULL); #endif { - CCBReader* tolua_ret = (CCBReader*) self->createBreader(); + CCBReader* tolua_ret = (CCBReader*) self->createCCBreader(); int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1; int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"CCBReader"); @@ -1929,7 +1929,7 @@ static int tolua_Cocos2d_CCBProxy_createBreader00(lua_State* tolua_S) return 1; #ifndef TOLUA_RELEASE tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'CreateBreader'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'createCCBreader'.",&tolua_err); return 0; #endif } @@ -2133,7 +2133,7 @@ TOLUA_API int tolua_extensions_ccb_open(lua_State* tolua_S){ tolua_function(tolua_S,".call",tolua_Cocos2d_CCBProxy_new00_local); tolua_function(tolua_S,"delete",tolua_Cocos2d_CCBProxy_delete00); tolua_function(tolua_S, "create", tolua_Cocos2d_CCBProxy_create00); - tolua_function(tolua_S, "createCCBReader", tolua_Cocos2d_CCBProxy_createBreader00); + tolua_function(tolua_S, "createCCBReader", tolua_Cocos2d_CCBProxy_createCCBreader00); tolua_function(tolua_S, "readCCBFromFile", tolua_Cocos2d_CCBProxy_readCCBFromFile00); tolua_function(tolua_S, "getNodeTypeName", tolua_Cocos2d_CCBProxy_getNodeTypeName00); tolua_function(tolua_S, "setCallback", tolua_Cocos2d_CCBProxy_setCallback00); From bb244edae650375fe40e6e9aef109da92ed02cb5 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 5 Jul 2013 10:25:37 +0800 Subject: [PATCH 02/20] issue #2244:Modify a function name to createCCBReader --- cocos2dx/actions/CCActionInstant.cpp | 3 ++- scripting/lua/cocos2dx_support/CCBProxy.cpp | 2 +- scripting/lua/cocos2dx_support/CCBProxy.h | 2 +- .../lua/cocos2dx_support/Lua_extensions_CCB.cpp | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cocos2dx/actions/CCActionInstant.cpp b/cocos2dx/actions/CCActionInstant.cpp index 5411ec4809..4707755e83 100644 --- a/cocos2dx/actions/CCActionInstant.cpp +++ b/cocos2dx/actions/CCActionInstant.cpp @@ -509,8 +509,9 @@ CallFunc * CallFunc::clone() const a->initWithTarget(_selectorTarget); a->_callFunc = _callFunc; } - else if( _function ) + else if( _function ){ a->initWithFunction(_function); + } else if (_scriptHandler > 0 ) { a->_scriptHandler = cocos2d::ScriptEngineManager::sharedManager()->getScriptEngine()->reallocateScriptHandler(_scriptHandler); } diff --git a/scripting/lua/cocos2dx_support/CCBProxy.cpp b/scripting/lua/cocos2dx_support/CCBProxy.cpp index f249149091..2d284d58fe 100644 --- a/scripting/lua/cocos2dx_support/CCBProxy.cpp +++ b/scripting/lua/cocos2dx_support/CCBProxy.cpp @@ -24,7 +24,7 @@ #include "CCBProxy.h" -CCBReader* CCBProxy::createCCBreader() +CCBReader* CCBProxy::createCCBReader() { NodeLoaderLibrary *ccNodeLoaderLibrary = NodeLoaderLibrary::sharedNodeLoaderLibrary(); diff --git a/scripting/lua/cocos2dx_support/CCBProxy.h b/scripting/lua/cocos2dx_support/CCBProxy.h index 2dc5537cb7..b9b682c18e 100644 --- a/scripting/lua/cocos2dx_support/CCBProxy.h +++ b/scripting/lua/cocos2dx_support/CCBProxy.h @@ -14,7 +14,7 @@ public: CCBProxy() { } virtual ~ CCBProxy(){ } CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(CCBProxy, create); - CCBReader* createCCBreader(); + CCBReader* createCCBReader(); Node* readCCBFromFile(const char *pszFileName,CCBReader* pCCBReader,bool bSetOwner = false); const char* getNodeTypeName(Node* pNode); void setCallback(Node* pNode,int nHandle); diff --git a/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp b/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp index 9059e98a14..80fe5ee02e 100644 --- a/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp +++ b/scripting/lua/cocos2dx_support/Lua_extensions_CCB.cpp @@ -1902,8 +1902,8 @@ tolua_lerror: #endif //#ifndef TOLUA_DISABLE /* method: getOwnerCallbackNodes of class CCBReader */ -#ifndef TOLUA_DISABLE_tolua_Cocos2d_CCBProxy_createCCBreader00 -static int tolua_Cocos2d_CCBProxy_createCCBreader00(lua_State* tolua_S) +#ifndef TOLUA_DISABLE_tolua_Cocos2d_CCBProxy_createCCBReader00 +static int tolua_Cocos2d_CCBProxy_createCCBReader00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; @@ -1917,10 +1917,10 @@ static int tolua_Cocos2d_CCBProxy_createCCBreader00(lua_State* tolua_S) { CCBProxy* self = (CCBProxy*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'createCCBreader'", NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'createCCBReader'", NULL); #endif { - CCBReader* tolua_ret = (CCBReader*) self->createCCBreader(); + CCBReader* tolua_ret = (CCBReader*) self->createCCBReader(); int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1; int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"CCBReader"); @@ -1929,7 +1929,7 @@ static int tolua_Cocos2d_CCBProxy_createCCBreader00(lua_State* tolua_S) return 1; #ifndef TOLUA_RELEASE tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'createCCBreader'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'createCCBReader'.",&tolua_err); return 0; #endif } @@ -2133,7 +2133,7 @@ TOLUA_API int tolua_extensions_ccb_open(lua_State* tolua_S){ tolua_function(tolua_S,".call",tolua_Cocos2d_CCBProxy_new00_local); tolua_function(tolua_S,"delete",tolua_Cocos2d_CCBProxy_delete00); tolua_function(tolua_S, "create", tolua_Cocos2d_CCBProxy_create00); - tolua_function(tolua_S, "createCCBReader", tolua_Cocos2d_CCBProxy_createCCBreader00); + tolua_function(tolua_S, "createCCBReader", tolua_Cocos2d_CCBProxy_createCCBReader00); tolua_function(tolua_S, "readCCBFromFile", tolua_Cocos2d_CCBProxy_readCCBFromFile00); tolua_function(tolua_S, "getNodeTypeName", tolua_Cocos2d_CCBProxy_getNodeTypeName00); tolua_function(tolua_S, "setCallback", tolua_Cocos2d_CCBProxy_setCallback00); From cd2fae36f14d1bd21265c92ca3b0dc53f13597e0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 10:31:20 +0800 Subject: [PATCH 03/20] issue #2371: Updating multi-platform-template for iOS and Mac --- .../HelloCpp.xcodeproj/project.pbxproj | 719 ++++++++++++++++ .../project.pbxproj.REMOVED.git-id | 1 - .../HelloCpp.xcodeproj/project.pbxproj | 715 ++++++++++++++++ .../project.pbxproj.REMOVED.git-id | 1 - .../HelloJavascript.xcodeproj/project.pbxproj | 776 +++++++++++++++++ .../project.pbxproj.REMOVED.git-id | 1 - .../HelloLua.xcodeproj/project.pbxproj | 809 ++++++++++++++++++ .../project.pbxproj.REMOVED.git-id | 1 - 8 files changed, 3019 insertions(+), 4 deletions(-) create mode 100644 template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj delete mode 100644 template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id create mode 100644 template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj delete mode 100644 template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id create mode 100644 template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj delete mode 100644 template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id create mode 100644 template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj delete mode 100644 template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id diff --git a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..567f421cb9 --- /dev/null +++ b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj @@ -0,0 +1,719 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1AC3624916D4A1E8000847F2 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3624316D4A1E8000847F2 /* AppController.mm */; }; + 1AC3624B16D4A1E8000847F2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3624516D4A1E8000847F2 /* main.m */; }; + 1ACB3244164770DE00914215 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACB3243164770DE00914215 /* libcurl.a */; }; + 1AF4C2F417865DCB00122817 /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2E317865D9500122817 /* libbox2d iOS.a */; }; + 1AF4C2F517865DCB00122817 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2E117865D9500122817 /* libchipmunk iOS.a */; }; + 1AF4C2F617865DCB00122817 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2DD17865D9500122817 /* libcocos2dx iOS.a */; }; + 1AF4C2F717865DCB00122817 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2DF17865D9500122817 /* libcocos2dx-extensions iOS.a */; }; + 1AF4C2F817865DCB00122817 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2E517865D9500122817 /* libCocosDenshion iOS.a */; }; + 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */; }; + 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */; }; + 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; + 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; + 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; + 1AFCDA8216D4A25900906EA6 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFCDA8116D4A25900906EA6 /* RootViewController.mm */; }; + 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 */; }; + 7855E0E1153FEF240059DD9A /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7855E0DF153FEF240059DD9A /* Default.png */; }; + BF171245129291EC00B8313A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB012928DE900B8313A /* OpenGLES.framework */; }; + BF1712471292920000B8313A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; + BF1C47F01293687400B63C5D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF1C47EA1293683800B63C5D /* QuartzCore.framework */; }; + D41A0AD1160F154A004552AE /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D41A0AD0160F154A004552AE /* Default-568h@2x.png */; }; + D446FD6E16102124000ADA7B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FD6D16102124000ADA7B /* Default@2x.png */; }; + D44C620C132DFF330009C878 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620B132DFF330009C878 /* OpenAL.framework */; }; + D44C620E132DFF430009C878 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620D132DFF430009C878 /* AVFoundation.framework */; }; + D44C6210132DFF4E0009C878 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620F132DFF4E0009C878 /* AudioToolbox.framework */; }; + D4EF949A15BD2D8B00D803EB /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949915BD2D8B00D803EB /* Icon-57.png */; }; + D4EF949C15BD2D8E00D803EB /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949B15BD2D8E00D803EB /* Icon-114.png */; }; + D4EF949E15BD2D9600D803EB /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949D15BD2D9600D803EB /* Icon-72.png */; }; + D4EF94A015BD2D9800D803EB /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949F15BD2D9800D803EB /* Icon-144.png */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 1AF4C2CE17865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1551A33F158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 1AF4C2D017865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2FD617814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 1AF4C2D217865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2CB81780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 1AF4C2D417865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2D9B1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 1AF4C2D617865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2ED617814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + 1AF4C2D817865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F31FD1781479B006731B9; + remoteInfo = "jsbindings Mac"; + }; + 1AF4C2DA17865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A6FB53017854BC300CDF010; + remoteInfo = "luabindings Mac"; + }; + 1AF4C2DC17865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4D641783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C2DE17865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4EFC1783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C2E017865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F3B178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C2E217865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F9E1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + 1AF4C2E417865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4FB4178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + 1AF4C2E617865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A5030178387750073F6A7; + remoteInfo = "jsbindings iOS"; + }; + 1AF4C2E817865D9500122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A119791178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; + 1AF4C2EA17865DB400122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C2EC17865DB400122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4E111783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C2EE17865DB400122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4EFD178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C2F017865DB400122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F3C1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + 1AF4C2F217865DB400122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 1AC3624216D4A1E8000847F2 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = SOURCE_ROOT; }; + 1AC3624316D4A1E8000847F2 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = SOURCE_ROOT; }; + 1AC3624516D4A1E8000847F2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; }; + 1AC3624616D4A1E8000847F2 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = SOURCE_ROOT; }; + 1ACB3243164770DE00914215 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; + 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; + 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; + 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; + 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../Classes/HelloWorldScene.cpp; sourceTree = ""; }; + 1AFAF8B616D35DE700DB1158 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../Classes/HelloWorldScene.h; sourceTree = ""; }; + 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; + 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; + 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; + 1AFCDA8016D4A25900906EA6 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = SOURCE_ROOT; }; + 1AFCDA8116D4A25900906EA6 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = SOURCE_ROOT; }; + 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 1D6058910D05DD3D006BFB54 /* HelloCpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloCpp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 7855E0DF153FEF240059DD9A /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; + BF170DB012928DE900B8313A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; + BF170DB412928DE900B8313A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + BF1C47EA1293683800B63C5D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + D41A0AD0160F154A004552AE /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../proj.ios/Default-568h@2x.png"; sourceTree = ""; }; + D446FD6D16102124000ADA7B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../proj.ios/Default@2x.png"; sourceTree = ""; }; + D44C620B132DFF330009C878 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; + D44C620D132DFF430009C878 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + D44C620F132DFF4E0009C878 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + D4EF949915BD2D8B00D803EB /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-57.png"; path = "../proj.ios/Icon-57.png"; sourceTree = ""; }; + D4EF949B15BD2D8E00D803EB /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-114.png"; path = "../proj.ios/Icon-114.png"; sourceTree = ""; }; + D4EF949D15BD2D9600D803EB /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "../proj.ios/Icon-72.png"; sourceTree = ""; }; + D4EF949F15BD2D9800D803EB /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-144.png"; path = "../proj.ios/Icon-144.png"; sourceTree = ""; }; + D4F9F37B12E54555005CA6D2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1AF4C2F417865DCB00122817 /* libbox2d iOS.a in Frameworks */, + 1AF4C2F517865DCB00122817 /* libchipmunk iOS.a in Frameworks */, + 1AF4C2F617865DCB00122817 /* libcocos2dx iOS.a in Frameworks */, + 1AF4C2F717865DCB00122817 /* libcocos2dx-extensions iOS.a in Frameworks */, + 1AF4C2F817865DCB00122817 /* libCocosDenshion iOS.a in Frameworks */, + 1ACB3244164770DE00914215 /* libcurl.a in Frameworks */, + 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, + 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, + 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, + BF171245129291EC00B8313A /* OpenGLES.framework in Frameworks */, + BF1712471292920000B8313A /* libz.dylib in Frameworks */, + BF1C47F01293687400B63C5D /* QuartzCore.framework in Frameworks */, + D44C620C132DFF330009C878 /* OpenAL.framework in Frameworks */, + D44C620E132DFF430009C878 /* AVFoundation.framework in Frameworks */, + D44C6210132DFF4E0009C878 /* AudioToolbox.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 080E96DDFE201D6D7F000001 /* ios */ = { + isa = PBXGroup; + children = ( + 1AC3624216D4A1E8000847F2 /* AppController.h */, + 1AC3624316D4A1E8000847F2 /* AppController.mm */, + D4F9F37B12E54555005CA6D2 /* Info.plist */, + 1AC3624516D4A1E8000847F2 /* main.m */, + 1AC3624616D4A1E8000847F2 /* Prefix.pch */, + 1AFCDA8016D4A25900906EA6 /* RootViewController.h */, + 1AFCDA8116D4A25900906EA6 /* RootViewController.mm */, + ); + name = ios; + path = Classes; + sourceTree = ""; + }; + 15AA9C4015B7EC450033D6C2 /* Classes */ = { + isa = PBXGroup; + children = ( + 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */, + 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */, + 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */, + 1AFAF8B616D35DE700DB1158 /* HelloWorldScene.h */, + ); + name = Classes; + path = ../classes; + sourceTree = ""; + }; + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 1D6058910D05DD3D006BFB54 /* HelloCpp.app */, + ); + name = Products; + sourceTree = ""; + }; + 1AF4C2BC17865D9500122817 /* Products */ = { + isa = PBXGroup; + children = ( + 1AF4C2CF17865D9500122817 /* libcocos2dx Mac.a */, + 1AF4C2D117865D9500122817 /* libcocos2dx-extensions Mac.a */, + 1AF4C2D317865D9500122817 /* libchipmunk Mac.a */, + 1AF4C2D517865D9500122817 /* libbox2d Mac.a */, + 1AF4C2D717865D9500122817 /* libCocosDenshion Mac.a */, + 1AF4C2D917865D9500122817 /* libjsbindings Mac.a */, + 1AF4C2DB17865D9500122817 /* libluabindings Mac.a */, + 1AF4C2DD17865D9500122817 /* libcocos2dx iOS.a */, + 1AF4C2DF17865D9500122817 /* libcocos2dx-extensions iOS.a */, + 1AF4C2E117865D9500122817 /* libchipmunk iOS.a */, + 1AF4C2E317865D9500122817 /* libbox2d iOS.a */, + 1AF4C2E517865D9500122817 /* libCocosDenshion iOS.a */, + 1AF4C2E717865D9500122817 /* libjsbindings iOS.a */, + 1AF4C2E917865D9500122817 /* libluabindings iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + isa = PBXGroup; + children = ( + 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */, + 15AA9C4015B7EC450033D6C2 /* Classes */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 080E96DDFE201D6D7F000001 /* ios */, + 19C28FACFE9D520D11CA2CBB /* Products */, + 78C7DDAA14EBA5050085D0C2 /* Resources */, + ); + name = CustomTemplate; + sourceTree = ""; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1ACB3243164770DE00914215 /* libcurl.a */, + BF170DB412928DE900B8313A /* libz.dylib */, + D44C620F132DFF4E0009C878 /* AudioToolbox.framework */, + D44C620D132DFF430009C878 /* AVFoundation.framework */, + 288765A40DF7441C002DB57D /* CoreGraphics.framework */, + 1D30AB110D05D00D00671497 /* Foundation.framework */, + D44C620B132DFF330009C878 /* OpenAL.framework */, + BF170DB012928DE900B8313A /* OpenGLES.framework */, + BF1C47EA1293683800B63C5D /* QuartzCore.framework */, + 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 78C7DDAA14EBA5050085D0C2 /* Resources */ = { + isa = PBXGroup; + children = ( + 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */, + 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */, + 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */, + D41A0AD0160F154A004552AE /* Default-568h@2x.png */, + 7855E0DF153FEF240059DD9A /* Default.png */, + D446FD6D16102124000ADA7B /* Default@2x.png */, + D4EF949B15BD2D8E00D803EB /* Icon-114.png */, + D4EF949F15BD2D9800D803EB /* Icon-144.png */, + D4EF949915BD2D8B00D803EB /* Icon-57.png */, + D4EF949D15BD2D9600D803EB /* Icon-72.png */, + ); + name = Resources; + path = ../Resources; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 1D6058900D05DD3D006BFB54 /* HelloCpp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */; + buildPhases = ( + 1D60588D0D05DD3D006BFB54 /* Resources */, + 1D60588E0D05DD3D006BFB54 /* Sources */, + 1D60588F0D05DD3D006BFB54 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 1AF4C2EB17865DB400122817 /* PBXTargetDependency */, + 1AF4C2ED17865DB400122817 /* PBXTargetDependency */, + 1AF4C2EF17865DB400122817 /* PBXTargetDependency */, + 1AF4C2F117865DB400122817 /* PBXTargetDependency */, + 1AF4C2F317865DB400122817 /* PBXTargetDependency */, + ); + name = HelloCpp; + productName = iphone; + productReference = 1D6058910D05DD3D006BFB54 /* HelloCpp.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0430; + }; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1AF4C2BC17865D9500122817 /* Products */; + ProjectRef = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 1D6058900D05DD3D006BFB54 /* HelloCpp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 1AF4C2CF17865D9500122817 /* libcocos2dx Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx Mac.a"; + remoteRef = 1AF4C2CE17865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2D117865D9500122817 /* libcocos2dx-extensions Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions Mac.a"; + remoteRef = 1AF4C2D017865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2D317865D9500122817 /* libchipmunk Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk Mac.a"; + remoteRef = 1AF4C2D217865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2D517865D9500122817 /* libbox2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d Mac.a"; + remoteRef = 1AF4C2D417865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2D717865D9500122817 /* libCocosDenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion Mac.a"; + remoteRef = 1AF4C2D617865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2D917865D9500122817 /* libjsbindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings Mac.a"; + remoteRef = 1AF4C2D817865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2DB17865D9500122817 /* libluabindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings Mac.a"; + remoteRef = 1AF4C2DA17865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2DD17865D9500122817 /* libcocos2dx iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx iOS.a"; + remoteRef = 1AF4C2DC17865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2DF17865D9500122817 /* libcocos2dx-extensions iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions iOS.a"; + remoteRef = 1AF4C2DE17865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2E117865D9500122817 /* libchipmunk iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk iOS.a"; + remoteRef = 1AF4C2E017865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2E317865D9500122817 /* libbox2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d iOS.a"; + remoteRef = 1AF4C2E217865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2E517865D9500122817 /* libCocosDenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion iOS.a"; + remoteRef = 1AF4C2E417865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2E717865D9500122817 /* libjsbindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings iOS.a"; + remoteRef = 1AF4C2E617865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C2E917865D9500122817 /* libluabindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings iOS.a"; + remoteRef = 1AF4C2E817865D9500122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 1D60588D0D05DD3D006BFB54 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7855E0E1153FEF240059DD9A /* Default.png in Resources */, + D4EF949A15BD2D8B00D803EB /* Icon-57.png in Resources */, + D4EF949C15BD2D8E00D803EB /* Icon-114.png in Resources */, + D4EF949E15BD2D9600D803EB /* Icon-72.png in Resources */, + D4EF94A015BD2D9800D803EB /* Icon-144.png in Resources */, + D41A0AD1160F154A004552AE /* Default-568h@2x.png in Resources */, + D446FD6E16102124000ADA7B /* Default@2x.png in Resources */, + 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */, + 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */, + 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 1D60588E0D05DD3D006BFB54 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */, + 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */, + 1AC3624916D4A1E8000847F2 /* AppController.mm in Sources */, + 1AC3624B16D4A1E8000847F2 /* main.m in Sources */, + 1AFCDA8216D4A25900906EA6 /* RootViewController.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 1AF4C2EB17865DB400122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx iOS"; + targetProxy = 1AF4C2EA17865DB400122817 /* PBXContainerItemProxy */; + }; + 1AF4C2ED17865DB400122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions iOS"; + targetProxy = 1AF4C2EC17865DB400122817 /* PBXContainerItemProxy */; + }; + 1AF4C2EF17865DB400122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk iOS"; + targetProxy = 1AF4C2EE17865DB400122817 /* PBXContainerItemProxy */; + }; + 1AF4C2F117865DB400122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "box2d iOS"; + targetProxy = 1AF4C2F017865DB400122817 /* PBXContainerItemProxy */; + }; + 1AF4C2F317865DB400122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion iOS"; + targetProxy = 1AF4C2F217865DB400122817 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 1D6058940D05DD3E006BFB54 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_FILE32API, + CC_TARGET_OS_IPHONE, + "COCOS2D_DEBUG=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../CocosDenshion/include", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"", + ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", + ); + OTHER_CFLAGS = "-O2"; + PRODUCT_NAME = HelloCpp; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "armv6 armv7 i386"; + }; + name = Debug; + }; + 1D6058950D05DD3E006BFB54 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_FILE32API, + CC_TARGET_OS_IPHONE, + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../CocosDenshion/include", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"", + ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", + ); + PRODUCT_NAME = HelloCpp; + PROVISIONING_PROFILE = ""; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = ""; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + SDKROOT = iphoneos; + VALID_ARCHS = "armv6 armv7 i386"; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + SDKROOT = iphoneos; + VALID_ARCHS = "armv6 armv7 i386"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1D6058940D05DD3E006BFB54 /* Debug */, + 1D6058950D05DD3E006BFB54 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index 2e2ea8802b..0000000000 --- a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -87923a8737ed83b909261c3468098a1c46753969 \ No newline at end of file diff --git a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..7812472c83 --- /dev/null +++ b/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj @@ -0,0 +1,715 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 15C64823165F391E007D4F18 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; + 15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; }; + 15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; }; + 15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; }; + 15C6482B165F3979007D4F18 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482A165F3979007D4F18 /* ApplicationServices.framework */; }; + 15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; }; + 15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; + 15C64831165F39AB007D4F18 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64830165F39AB007D4F18 /* libxml2.dylib */; }; + 15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; + 15C6498716633E65007D4F18 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6498616633E65007D4F18 /* libcurl.a */; }; + 1AF4C39717865FD400122817 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37817865FB200122817 /* libbox2d Mac.a */; }; + 1AF4C39817865FD400122817 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37617865FB200122817 /* libchipmunk Mac.a */; }; + 1AF4C39917865FD400122817 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37217865FB200122817 /* libcocos2dx Mac.a */; }; + 1AF4C39A17865FD400122817 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37417865FB200122817 /* libcocos2dx-extensions Mac.a */; }; + 1AF4C39B17865FD400122817 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37A17865FB200122817 /* libCocosDenshion Mac.a */; }; + 1AFAF8C316D3884900DB1158 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C016D3884900DB1158 /* CloseNormal.png */; }; + 1AFAF8C416D3884900DB1158 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C116D3884900DB1158 /* CloseSelected.png */; }; + 1AFAF8C516D3884900DB1158 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C216D3884900DB1158 /* HelloWorld.png */; }; + 1AFAF8CA16D3886000DB1158 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C616D3886000DB1158 /* AppDelegate.cpp */; }; + 1AFAF8CB16D3886000DB1158 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C816D3886000DB1158 /* HelloWorldScene.cpp */; }; + 41BC70E415BF81A5006A0A6C /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 41BC70DA15BF81A5006A0A6C /* AppController.mm */; }; + 41BC70E515BF81A5006A0A6C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 41BC70DC15BF81A5006A0A6C /* InfoPlist.strings */; }; + 41BC70E615BF81A5006A0A6C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41BC70DE15BF81A5006A0A6C /* MainMenu.xib */; }; + 41BC70E715BF81A5006A0A6C /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 41BC70E015BF81A5006A0A6C /* Icon.icns */; }; + 41BC70E815BF81A5006A0A6C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 41BC70E115BF81A5006A0A6C /* main.m */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 1AF4C37117865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1551A33F158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 1AF4C37317865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2FD617814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 1AF4C37517865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2CB81780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 1AF4C37717865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2D9B1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 1AF4C37917865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2ED617814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + 1AF4C37B17865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F31FD1781479B006731B9; + remoteInfo = "jsbindings Mac"; + }; + 1AF4C37D17865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A6FB53017854BC300CDF010; + remoteInfo = "luabindings Mac"; + }; + 1AF4C37F17865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4D641783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C38117865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4EFC1783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C38317865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F3B178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C38517865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F9E1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + 1AF4C38717865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4FB4178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + 1AF4C38917865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A5030178387750073F6A7; + remoteInfo = "jsbindings iOS"; + }; + 1AF4C38B17865FB200122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A119791178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; + 1AF4C38D17865FC700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1551A33E158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 1AF4C38F17865FC700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2FC117814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 1AF4C39117865FC700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2B781780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 1AF4C39317865FC700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2D5D1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 1AF4C39517865FC700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2E9817814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 15C64822165F391E007D4F18 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; + 15C64824165F3934007D4F18 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; + 15C64826165F394E007D4F18 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; + 15C64828165F396B007D4F18 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; }; + 15C6482A165F3979007D4F18 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/ApplicationServices.framework; sourceTree = DEVELOPER_DIR; }; + 15C6482C165F3988007D4F18 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; + 15C6482E165F399D007D4F18 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; + 15C64830165F39AB007D4F18 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib/libxml2.dylib; sourceTree = DEVELOPER_DIR; }; + 15C64832165F3AFD007D4F18 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 15C6498616633E65007D4F18 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; + 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; + 1AFAF8C016D3884900DB1158 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; + 1AFAF8C116D3884900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; + 1AFAF8C216D3884900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; + 1AFAF8C616D3886000DB1158 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; + 1AFAF8C716D3886000DB1158 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; + 1AFAF8C816D3886000DB1158 /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../Classes/HelloWorldScene.cpp; sourceTree = ""; }; + 1AFAF8C916D3886000DB1158 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../Classes/HelloWorldScene.h; sourceTree = ""; }; + 1D6058910D05DD3D006BFB54 /* HelloCpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloCpp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 41BC70D915BF81A5006A0A6C /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = SOURCE_ROOT; }; + 41BC70DA15BF81A5006A0A6C /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = SOURCE_ROOT; }; + 41BC70DD15BF81A5006A0A6C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = InfoPlist.strings; sourceTree = ""; }; + 41BC70DF15BF81A5006A0A6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = MainMenu.xib; sourceTree = ""; }; + 41BC70E015BF81A5006A0A6C /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = SOURCE_ROOT; }; + 41BC70E115BF81A5006A0A6C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; }; + 41BC70E215BF81A5006A0A6C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; + 41BC70E315BF81A5006A0A6C /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1AF4C39717865FD400122817 /* libbox2d Mac.a in Frameworks */, + 1AF4C39817865FD400122817 /* libchipmunk Mac.a in Frameworks */, + 1AF4C39917865FD400122817 /* libcocos2dx Mac.a in Frameworks */, + 1AF4C39A17865FD400122817 /* libcocos2dx-extensions Mac.a in Frameworks */, + 1AF4C39B17865FD400122817 /* libCocosDenshion Mac.a in Frameworks */, + 15C6498716633E65007D4F18 /* libcurl.a in Frameworks */, + 15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */, + 15C64831165F39AB007D4F18 /* libxml2.dylib in Frameworks */, + 15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */, + 15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */, + 15C6482B165F3979007D4F18 /* ApplicationServices.framework in Frameworks */, + 15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */, + 15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */, + 15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */, + 15C64823165F391E007D4F18 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 15AA9C4015B7EC450033D6C2 /* Classes */ = { + isa = PBXGroup; + children = ( + 1AFAF8C616D3886000DB1158 /* AppDelegate.cpp */, + 1AFAF8C716D3886000DB1158 /* AppDelegate.h */, + 1AFAF8C816D3886000DB1158 /* HelloWorldScene.cpp */, + 1AFAF8C916D3886000DB1158 /* HelloWorldScene.h */, + ); + name = Classes; + path = ../classes; + sourceTree = ""; + }; + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 1D6058910D05DD3D006BFB54 /* HelloCpp.app */, + ); + name = Products; + sourceTree = ""; + }; + 1AF4C35F17865FB100122817 /* Products */ = { + isa = PBXGroup; + children = ( + 1AF4C37217865FB200122817 /* libcocos2dx Mac.a */, + 1AF4C37417865FB200122817 /* libcocos2dx-extensions Mac.a */, + 1AF4C37617865FB200122817 /* libchipmunk Mac.a */, + 1AF4C37817865FB200122817 /* libbox2d Mac.a */, + 1AF4C37A17865FB200122817 /* libCocosDenshion Mac.a */, + 1AF4C37C17865FB200122817 /* libjsbindings Mac.a */, + 1AF4C37E17865FB200122817 /* libluabindings Mac.a */, + 1AF4C38017865FB200122817 /* libcocos2dx iOS.a */, + 1AF4C38217865FB200122817 /* libcocos2dx-extensions iOS.a */, + 1AF4C38417865FB200122817 /* libchipmunk iOS.a */, + 1AF4C38617865FB200122817 /* libbox2d iOS.a */, + 1AF4C38817865FB200122817 /* libCocosDenshion iOS.a */, + 1AF4C38A17865FB200122817 /* libjsbindings iOS.a */, + 1AF4C38C17865FB200122817 /* libluabindings iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + isa = PBXGroup; + children = ( + 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */, + 15AA9C4015B7EC450033D6C2 /* Classes */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 41BC70D815BF818D006A0A6C /* mac */, + 19C28FACFE9D520D11CA2CBB /* Products */, + 78C7DDAA14EBA5050085D0C2 /* Resources */, + ); + name = CustomTemplate; + sourceTree = ""; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 15C6498616633E65007D4F18 /* libcurl.a */, + 15C64830165F39AB007D4F18 /* libxml2.dylib */, + 15C6482E165F399D007D4F18 /* libz.dylib */, + 15C6482C165F3988007D4F18 /* AudioToolbox.framework */, + 15C6482A165F3979007D4F18 /* ApplicationServices.framework */, + 15C64828165F396B007D4F18 /* OpenAL.framework */, + 15C64826165F394E007D4F18 /* QuartzCore.framework */, + 15C64824165F3934007D4F18 /* OpenGL.framework */, + 15C64822165F391E007D4F18 /* Cocoa.framework */, + 15C64832165F3AFD007D4F18 /* Foundation.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 41BC70D815BF818D006A0A6C /* mac */ = { + isa = PBXGroup; + children = ( + 41BC70D915BF81A5006A0A6C /* AppController.h */, + 41BC70DA15BF81A5006A0A6C /* AppController.mm */, + 41BC70DB15BF81A5006A0A6C /* en.lproj */, + 41BC70E015BF81A5006A0A6C /* Icon.icns */, + 41BC70E115BF81A5006A0A6C /* main.m */, + 41BC70E215BF81A5006A0A6C /* Info.plist */, + 41BC70E315BF81A5006A0A6C /* Prefix.pch */, + ); + name = mac; + path = ../Resources; + sourceTree = ""; + }; + 41BC70DB15BF81A5006A0A6C /* en.lproj */ = { + isa = PBXGroup; + children = ( + 41BC70DC15BF81A5006A0A6C /* InfoPlist.strings */, + 41BC70DE15BF81A5006A0A6C /* MainMenu.xib */, + ); + path = en.lproj; + sourceTree = SOURCE_ROOT; + }; + 78C7DDAA14EBA5050085D0C2 /* Resources */ = { + isa = PBXGroup; + children = ( + 1AFAF8C016D3884900DB1158 /* CloseNormal.png */, + 1AFAF8C116D3884900DB1158 /* CloseSelected.png */, + 1AFAF8C216D3884900DB1158 /* HelloWorld.png */, + ); + name = Resources; + path = ../Resources; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 1D6058900D05DD3D006BFB54 /* HelloCpp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */; + buildPhases = ( + 1D60588D0D05DD3D006BFB54 /* Resources */, + 1D60588E0D05DD3D006BFB54 /* Sources */, + 1D60588F0D05DD3D006BFB54 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 1AF4C38E17865FC700122817 /* PBXTargetDependency */, + 1AF4C39017865FC700122817 /* PBXTargetDependency */, + 1AF4C39217865FC700122817 /* PBXTargetDependency */, + 1AF4C39417865FC700122817 /* PBXTargetDependency */, + 1AF4C39617865FC700122817 /* PBXTargetDependency */, + ); + name = HelloCpp; + productName = iphone; + productReference = 1D6058910D05DD3D006BFB54 /* HelloCpp.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0430; + }; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + en, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1AF4C35F17865FB100122817 /* Products */; + ProjectRef = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + 1D6058900D05DD3D006BFB54 /* HelloCpp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 1AF4C37217865FB200122817 /* libcocos2dx Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx Mac.a"; + remoteRef = 1AF4C37117865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C37417865FB200122817 /* libcocos2dx-extensions Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions Mac.a"; + remoteRef = 1AF4C37317865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C37617865FB200122817 /* libchipmunk Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk Mac.a"; + remoteRef = 1AF4C37517865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C37817865FB200122817 /* libbox2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d Mac.a"; + remoteRef = 1AF4C37717865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C37A17865FB200122817 /* libCocosDenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion Mac.a"; + remoteRef = 1AF4C37917865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C37C17865FB200122817 /* libjsbindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings Mac.a"; + remoteRef = 1AF4C37B17865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C37E17865FB200122817 /* libluabindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings Mac.a"; + remoteRef = 1AF4C37D17865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38017865FB200122817 /* libcocos2dx iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx iOS.a"; + remoteRef = 1AF4C37F17865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38217865FB200122817 /* libcocos2dx-extensions iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions iOS.a"; + remoteRef = 1AF4C38117865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38417865FB200122817 /* libchipmunk iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk iOS.a"; + remoteRef = 1AF4C38317865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38617865FB200122817 /* libbox2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d iOS.a"; + remoteRef = 1AF4C38517865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38817865FB200122817 /* libCocosDenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion iOS.a"; + remoteRef = 1AF4C38717865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38A17865FB200122817 /* libjsbindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings iOS.a"; + remoteRef = 1AF4C38917865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C38C17865FB200122817 /* libluabindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings iOS.a"; + remoteRef = 1AF4C38B17865FB200122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 1D60588D0D05DD3D006BFB54 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 41BC70E515BF81A5006A0A6C /* InfoPlist.strings in Resources */, + 41BC70E615BF81A5006A0A6C /* MainMenu.xib in Resources */, + 41BC70E715BF81A5006A0A6C /* Icon.icns in Resources */, + 1AFAF8C316D3884900DB1158 /* CloseNormal.png in Resources */, + 1AFAF8C416D3884900DB1158 /* CloseSelected.png in Resources */, + 1AFAF8C516D3884900DB1158 /* HelloWorld.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 1D60588E0D05DD3D006BFB54 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 41BC70E415BF81A5006A0A6C /* AppController.mm in Sources */, + 41BC70E815BF81A5006A0A6C /* main.m in Sources */, + 1AFAF8CA16D3886000DB1158 /* AppDelegate.cpp in Sources */, + 1AFAF8CB16D3886000DB1158 /* HelloWorldScene.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 1AF4C38E17865FC700122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx Mac"; + targetProxy = 1AF4C38D17865FC700122817 /* PBXContainerItemProxy */; + }; + 1AF4C39017865FC700122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions Mac"; + targetProxy = 1AF4C38F17865FC700122817 /* PBXContainerItemProxy */; + }; + 1AF4C39217865FC700122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk Mac"; + targetProxy = 1AF4C39117865FC700122817 /* PBXContainerItemProxy */; + }; + 1AF4C39417865FC700122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "box2d Mac"; + targetProxy = 1AF4C39317865FC700122817 /* PBXContainerItemProxy */; + }; + 1AF4C39617865FC700122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion Mac"; + targetProxy = 1AF4C39517865FC700122817 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 41BC70DC15BF81A5006A0A6C /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 41BC70DD15BF81A5006A0A6C /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 41BC70DE15BF81A5006A0A6C /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 41BC70DF15BF81A5006A0A6C /* en */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 1D6058940D05DD3E006BFB54 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + USE_FILE32API, + CC_TARGET_OS_MAC, + "COCOS2D_DEBUG=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + CC_KEYBOARD_SUPPORT, + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../CocosDenshion/include", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", + ); + INFOPLIST_FILE = Info.plist; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\""; + MACOSX_DEPLOYMENT_TARGET = 10.7; + ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-O2"; + PRODUCT_NAME = HelloCpp; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "i386 x86_64"; + }; + name = Debug; + }; + 1D6058950D05DD3E006BFB54 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + COPY_PHASE_STRIP = YES; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, + CC_TARGET_OS_MAC, + USE_FILE32API, + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + CC_KEYBOARD_SUPPORT, + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_VERSION = ""; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../CocosDenshion/include", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", + ); + INFOPLIST_FILE = Info.plist; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\""; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = HelloCpp; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = ""; + VALIDATE_PRODUCT = YES; + VALID_ARCHS = "i386 x86_64"; + }; + name = Release; + }; + C01FCF4F08A954540054247B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + SDKROOT = macosx; + VALID_ARCHS = "x86_64 i386"; + }; + name = Debug; + }; + C01FCF5008A954540054247B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_VERSION = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + SDKROOT = macosx; + VALID_ARCHS = "x86_64 i386"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1D6058940D05DD3E006BFB54 /* Debug */, + 1D6058950D05DD3E006BFB54 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C01FCF4F08A954540054247B /* Debug */, + C01FCF5008A954540054247B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} diff --git a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id b/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index 71bb7258c2..0000000000 --- a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -0422f35db193be5e4c66e50b80ced4175aea416c \ No newline at end of file diff --git a/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..616ac78617 --- /dev/null +++ b/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj @@ -0,0 +1,776 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1A82F5FB169AC92500C4B13A /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A82F5FA169AC92500C4B13A /* libsqlite3.dylib */; }; + 1A96A4F3174A3432008653A9 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A96A4F2174A3432008653A9 /* libcurl.a */; }; + 1AE4B40416D1FECD003C6D1C /* res in Resources */ = {isa = PBXBuildFile; fileRef = 1AE4B40116D1FECD003C6D1C /* res */; }; + 1AE4B40516D1FECD003C6D1C /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1AE4B40216D1FECD003C6D1C /* src */; }; + 1AE4B40616D1FF4C003C6D1C /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AE4B40016D1FECD003C6D1C /* main.js */; }; + 1AF4C33317865EC500122817 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C32017865E8F00122817 /* libchipmunk iOS.a */; }; + 1AF4C33417865EC500122817 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31C17865E8F00122817 /* libcocos2dx iOS.a */; }; + 1AF4C33517865EC500122817 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31E17865E8F00122817 /* libcocos2dx-extensions iOS.a */; }; + 1AF4C33617865EC500122817 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C32417865E8F00122817 /* libCocosDenshion iOS.a */; }; + 1AF4C33717865EC500122817 /* libjsbindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C32617865E8F00122817 /* libjsbindings iOS.a */; }; + 1AF4C35117865F7400122817 /* jsb_chipmunk_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33917865F1600122817 /* jsb_chipmunk_constants.js */; }; + 1AF4C35217865F7400122817 /* jsb_chipmunk.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33A17865F1600122817 /* jsb_chipmunk.js */; }; + 1AF4C35317865F7400122817 /* jsb_cocos2d_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33B17865F1600122817 /* jsb_cocos2d_constants.js */; }; + 1AF4C35417865F7400122817 /* jsb_cocos2d_extension.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33C17865F1600122817 /* jsb_cocos2d_extension.js */; }; + 1AF4C35517865F7400122817 /* jsb_cocos2d.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33D17865F1600122817 /* jsb_cocos2d.js */; }; + 1AF4C35617865F7400122817 /* jsb_cocosbuilder.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33E17865F1600122817 /* jsb_cocosbuilder.js */; }; + 1AF4C35717865F7400122817 /* jsb_debugger.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33F17865F1600122817 /* jsb_debugger.js */; }; + 1AF4C35817865F7400122817 /* jsb_opengl_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34017865F1600122817 /* jsb_opengl_constants.js */; }; + 1AF4C35917865F7400122817 /* jsb_opengl.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34117865F1600122817 /* jsb_opengl.js */; }; + 1AF4C35A17865F7400122817 /* jsb_sys.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34217865F1600122817 /* jsb_sys.js */; }; + 1AF4C35B17865F7400122817 /* jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34317865F1600122817 /* jsb.js */; }; + 1AF4C35C17865F7400122817 /* main.debug.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34417865F1600122817 /* main.debug.js */; }; + A92275421517C094001B78AA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275411517C094001B78AA /* QuartzCore.framework */; }; + A92275441517C094001B78AA /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275431517C094001B78AA /* OpenGLES.framework */; }; + A92275461517C094001B78AA /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275451517C094001B78AA /* OpenAL.framework */; }; + A92275481517C094001B78AA /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275471517C094001B78AA /* AudioToolbox.framework */; }; + A922754A1517C094001B78AA /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275491517C094001B78AA /* AVFoundation.framework */; }; + A922754C1517C094001B78AA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754B1517C094001B78AA /* UIKit.framework */; }; + A922754E1517C094001B78AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754D1517C094001B78AA /* Foundation.framework */; }; + A92275501517C094001B78AA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754F1517C094001B78AA /* CoreGraphics.framework */; }; + D446FDA316102D7D000ADA7B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FDA216102D7D000ADA7B /* Default.png */; }; + D446FDA516102D82000ADA7B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FDA416102D82000ADA7B /* Default@2x.png */; }; + D446FDA716102D86000ADA7B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FDA616102D86000ADA7B /* Default-568h@2x.png */; }; + D45446D3156DE74F00887EB5 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = D45446CE156DE74F00887EB5 /* AppController.mm */; }; + D45446D4156DE74F00887EB5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D45446CF156DE74F00887EB5 /* main.m */; }; + D45446D5156DE74F00887EB5 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = D45446D2156DE74F00887EB5 /* RootViewController.mm */; }; + D454520C156E22BD00887EB5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D454520B156E22BD00887EB5 /* libz.dylib */; }; + D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4545215156E28EF00887EB5 /* AppDelegate.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 1AF4C30D17865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1551A33F158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 1AF4C30F17865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2FD617814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 1AF4C31117865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2CB81780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 1AF4C31317865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2D9B1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 1AF4C31517865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2ED617814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + 1AF4C31717865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F31FD1781479B006731B9; + remoteInfo = "jsbindings Mac"; + }; + 1AF4C31917865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A6FB53017854BC300CDF010; + remoteInfo = "luabindings Mac"; + }; + 1AF4C31B17865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4D641783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C31D17865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4EFC1783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C31F17865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F3B178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C32117865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F9E1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + 1AF4C32317865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4FB4178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + 1AF4C32517865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A5030178387750073F6A7; + remoteInfo = "jsbindings iOS"; + }; + 1AF4C32717865E8F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A119791178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; + 1AF4C32917865EA600122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C32B17865EA600122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4E111783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C32D17865EA600122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4EFD178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C32F17865EA600122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + 1AF4C33117865EA600122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4FB5178387750073F6A7; + remoteInfo = "jsbindings iOS"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 1A82F5FA169AC92500C4B13A /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; + 1A96A4F2174A3432008653A9 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; + 1AE4B40016D1FECD003C6D1C /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.js; path = ../Resources/main.js; sourceTree = ""; }; + 1AE4B40116D1FECD003C6D1C /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = ../Resources/res; sourceTree = ""; }; + 1AE4B40216D1FECD003C6D1C /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../Resources/src; sourceTree = ""; }; + 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; + 1AF4C33917865F1600122817 /* jsb_chipmunk_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_chipmunk_constants.js; path = ../../../scripting/javascript/bindings/js/jsb_chipmunk_constants.js; sourceTree = ""; }; + 1AF4C33A17865F1600122817 /* jsb_chipmunk.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_chipmunk.js; path = ../../../scripting/javascript/bindings/js/jsb_chipmunk.js; sourceTree = ""; }; + 1AF4C33B17865F1600122817 /* jsb_cocos2d_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_cocos2d_constants.js; path = ../../../scripting/javascript/bindings/js/jsb_cocos2d_constants.js; sourceTree = ""; }; + 1AF4C33C17865F1600122817 /* jsb_cocos2d_extension.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_cocos2d_extension.js; path = ../../../scripting/javascript/bindings/js/jsb_cocos2d_extension.js; sourceTree = ""; }; + 1AF4C33D17865F1600122817 /* jsb_cocos2d.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_cocos2d.js; path = ../../../scripting/javascript/bindings/js/jsb_cocos2d.js; sourceTree = ""; }; + 1AF4C33E17865F1600122817 /* jsb_cocosbuilder.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_cocosbuilder.js; path = ../../../scripting/javascript/bindings/js/jsb_cocosbuilder.js; sourceTree = ""; }; + 1AF4C33F17865F1600122817 /* jsb_debugger.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_debugger.js; path = ../../../scripting/javascript/bindings/js/jsb_debugger.js; sourceTree = ""; }; + 1AF4C34017865F1600122817 /* jsb_opengl_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_opengl_constants.js; path = ../../../scripting/javascript/bindings/js/jsb_opengl_constants.js; sourceTree = ""; }; + 1AF4C34117865F1600122817 /* jsb_opengl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_opengl.js; path = ../../../scripting/javascript/bindings/js/jsb_opengl.js; sourceTree = ""; }; + 1AF4C34217865F1600122817 /* jsb_sys.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_sys.js; path = ../../../scripting/javascript/bindings/js/jsb_sys.js; sourceTree = ""; }; + 1AF4C34317865F1600122817 /* jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb.js; path = ../../../scripting/javascript/bindings/js/jsb.js; sourceTree = ""; }; + 1AF4C34417865F1600122817 /* main.debug.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.debug.js; path = ../../../scripting/javascript/bindings/js/main.debug.js; sourceTree = ""; }; + A922753D1517C094001B78AA /* HelloJavascript.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloJavascript.app; sourceTree = BUILT_PRODUCTS_DIR; }; + A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; + A92275451517C094001B78AA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; + A92275471517C094001B78AA /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + A92275491517C094001B78AA /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + A922754B1517C094001B78AA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + A922754D1517C094001B78AA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + A922754F1517C094001B78AA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + D446FDA216102D7D000ADA7B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + D446FDA416102D82000ADA7B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + D446FDA616102D86000ADA7B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + D45446CD156DE74F00887EB5 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; + D45446CE156DE74F00887EB5 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; + D45446CF156DE74F00887EB5 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + D45446D0156DE74F00887EB5 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + D45446D1156DE74F00887EB5 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; + D45446D2156DE74F00887EB5 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; + D45446D6156DE79D00887EB5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D454520B156E22BD00887EB5 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + D4545215156E28EF00887EB5 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = ""; }; + D4545216156E28EF00887EB5 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + A922753A1517C094001B78AA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1AF4C33317865EC500122817 /* libchipmunk iOS.a in Frameworks */, + 1AF4C33417865EC500122817 /* libcocos2dx iOS.a in Frameworks */, + 1AF4C33517865EC500122817 /* libcocos2dx-extensions iOS.a in Frameworks */, + 1AF4C33617865EC500122817 /* libCocosDenshion iOS.a in Frameworks */, + 1AF4C33717865EC500122817 /* libjsbindings iOS.a in Frameworks */, + 1A82F5FB169AC92500C4B13A /* libsqlite3.dylib in Frameworks */, + D454520C156E22BD00887EB5 /* libz.dylib in Frameworks */, + A92275421517C094001B78AA /* QuartzCore.framework in Frameworks */, + A92275441517C094001B78AA /* OpenGLES.framework in Frameworks */, + A92275461517C094001B78AA /* OpenAL.framework in Frameworks */, + A92275481517C094001B78AA /* AudioToolbox.framework in Frameworks */, + A922754A1517C094001B78AA /* AVFoundation.framework in Frameworks */, + A922754C1517C094001B78AA /* UIKit.framework in Frameworks */, + A922754E1517C094001B78AA /* Foundation.framework in Frameworks */, + A92275501517C094001B78AA /* CoreGraphics.framework in Frameworks */, + 1A96A4F3174A3432008653A9 /* libcurl.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 15628F5B15F0F5C2000CF24B /* Resources */ = { + isa = PBXGroup; + children = ( + 1AE4B40016D1FECD003C6D1C /* main.js */, + 1AE4B40116D1FECD003C6D1C /* res */, + 1AE4B40216D1FECD003C6D1C /* src */, + D446FDA616102D86000ADA7B /* Default-568h@2x.png */, + D446FDA216102D7D000ADA7B /* Default.png */, + D446FDA416102D82000ADA7B /* Default@2x.png */, + ); + name = Resources; + sourceTree = ""; + }; + 1AF4C2FB17865E8F00122817 /* Products */ = { + isa = PBXGroup; + children = ( + 1AF4C30E17865E8F00122817 /* libcocos2dx Mac.a */, + 1AF4C31017865E8F00122817 /* libcocos2dx-extensions Mac.a */, + 1AF4C31217865E8F00122817 /* libchipmunk Mac.a */, + 1AF4C31417865E8F00122817 /* libbox2d Mac.a */, + 1AF4C31617865E8F00122817 /* libCocosDenshion Mac.a */, + 1AF4C31817865E8F00122817 /* libjsbindings Mac.a */, + 1AF4C31A17865E8F00122817 /* libluabindings Mac.a */, + 1AF4C31C17865E8F00122817 /* libcocos2dx iOS.a */, + 1AF4C31E17865E8F00122817 /* libcocos2dx-extensions iOS.a */, + 1AF4C32017865E8F00122817 /* libchipmunk iOS.a */, + 1AF4C32217865E8F00122817 /* libbox2d iOS.a */, + 1AF4C32417865E8F00122817 /* libCocosDenshion iOS.a */, + 1AF4C32617865E8F00122817 /* libjsbindings iOS.a */, + 1AF4C32817865E8F00122817 /* libluabindings iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + 1AF4C33817865EF900122817 /* JS Common */ = { + isa = PBXGroup; + children = ( + 1AF4C33917865F1600122817 /* jsb_chipmunk_constants.js */, + 1AF4C33A17865F1600122817 /* jsb_chipmunk.js */, + 1AF4C33B17865F1600122817 /* jsb_cocos2d_constants.js */, + 1AF4C33C17865F1600122817 /* jsb_cocos2d_extension.js */, + 1AF4C33D17865F1600122817 /* jsb_cocos2d.js */, + 1AF4C33E17865F1600122817 /* jsb_cocosbuilder.js */, + 1AF4C33F17865F1600122817 /* jsb_debugger.js */, + 1AF4C34017865F1600122817 /* jsb_opengl_constants.js */, + 1AF4C34117865F1600122817 /* jsb_opengl.js */, + 1AF4C34217865F1600122817 /* jsb_sys.js */, + 1AF4C34317865F1600122817 /* jsb.js */, + 1AF4C34417865F1600122817 /* main.debug.js */, + ); + name = "JS Common"; + sourceTree = ""; + }; + A92275321517C094001B78AA = { + isa = PBXGroup; + children = ( + 1AF4C33817865EF900122817 /* JS Common */, + 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */, + D4545214156E28EF00887EB5 /* Classes */, + A92275401517C094001B78AA /* Frameworks */, + D45446CC156DE73F00887EB5 /* ios */, + A922753E1517C094001B78AA /* Products */, + 15628F5B15F0F5C2000CF24B /* Resources */, + ); + sourceTree = ""; + }; + A922753E1517C094001B78AA /* Products */ = { + isa = PBXGroup; + children = ( + A922753D1517C094001B78AA /* HelloJavascript.app */, + ); + name = Products; + sourceTree = ""; + }; + A92275401517C094001B78AA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1A96A4F2174A3432008653A9 /* libcurl.a */, + 1A82F5FA169AC92500C4B13A /* libsqlite3.dylib */, + D454520B156E22BD00887EB5 /* libz.dylib */, + A92275411517C094001B78AA /* QuartzCore.framework */, + A92275431517C094001B78AA /* OpenGLES.framework */, + A92275451517C094001B78AA /* OpenAL.framework */, + A92275471517C094001B78AA /* AudioToolbox.framework */, + A92275491517C094001B78AA /* AVFoundation.framework */, + A922754B1517C094001B78AA /* UIKit.framework */, + A922754D1517C094001B78AA /* Foundation.framework */, + A922754F1517C094001B78AA /* CoreGraphics.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + D45446CC156DE73F00887EB5 /* ios */ = { + isa = PBXGroup; + children = ( + D45446D6156DE79D00887EB5 /* Info.plist */, + D45446CD156DE74F00887EB5 /* AppController.h */, + D45446CE156DE74F00887EB5 /* AppController.mm */, + D45446CF156DE74F00887EB5 /* main.m */, + D45446D0156DE74F00887EB5 /* Prefix.pch */, + D45446D1156DE74F00887EB5 /* RootViewController.h */, + D45446D2156DE74F00887EB5 /* RootViewController.mm */, + ); + name = ios; + sourceTree = ""; + }; + D4545214156E28EF00887EB5 /* Classes */ = { + isa = PBXGroup; + children = ( + D4545215156E28EF00887EB5 /* AppDelegate.cpp */, + D4545216156E28EF00887EB5 /* AppDelegate.h */, + ); + name = Classes; + path = ../Classes; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + A922753C1517C094001B78AA /* HelloJavascript */ = { + isa = PBXNativeTarget; + buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "HelloJavascript" */; + buildPhases = ( + A92275391517C094001B78AA /* Sources */, + A922753A1517C094001B78AA /* Frameworks */, + A922753B1517C094001B78AA /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 1AF4C32A17865EA600122817 /* PBXTargetDependency */, + 1AF4C32C17865EA600122817 /* PBXTargetDependency */, + 1AF4C32E17865EA600122817 /* PBXTargetDependency */, + 1AF4C33017865EA600122817 /* PBXTargetDependency */, + 1AF4C33217865EA600122817 /* PBXTargetDependency */, + ); + name = HelloJavascript; + productName = HelloJavascript; + productReference = A922753D1517C094001B78AA /* HelloJavascript.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + A92275341517C094001B78AA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0430; + }; + buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "HelloJavascript" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = A92275321517C094001B78AA; + productRefGroup = A922753E1517C094001B78AA /* Products */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1AF4C2FB17865E8F00122817 /* Products */; + ProjectRef = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + A922753C1517C094001B78AA /* HelloJavascript */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 1AF4C30E17865E8F00122817 /* libcocos2dx Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx Mac.a"; + remoteRef = 1AF4C30D17865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31017865E8F00122817 /* libcocos2dx-extensions Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions Mac.a"; + remoteRef = 1AF4C30F17865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31217865E8F00122817 /* libchipmunk Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk Mac.a"; + remoteRef = 1AF4C31117865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31417865E8F00122817 /* libbox2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d Mac.a"; + remoteRef = 1AF4C31317865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31617865E8F00122817 /* libCocosDenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion Mac.a"; + remoteRef = 1AF4C31517865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31817865E8F00122817 /* libjsbindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings Mac.a"; + remoteRef = 1AF4C31717865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31A17865E8F00122817 /* libluabindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings Mac.a"; + remoteRef = 1AF4C31917865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31C17865E8F00122817 /* libcocos2dx iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx iOS.a"; + remoteRef = 1AF4C31B17865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C31E17865E8F00122817 /* libcocos2dx-extensions iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions iOS.a"; + remoteRef = 1AF4C31D17865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C32017865E8F00122817 /* libchipmunk iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk iOS.a"; + remoteRef = 1AF4C31F17865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C32217865E8F00122817 /* libbox2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d iOS.a"; + remoteRef = 1AF4C32117865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C32417865E8F00122817 /* libCocosDenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion iOS.a"; + remoteRef = 1AF4C32317865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C32617865E8F00122817 /* libjsbindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings iOS.a"; + remoteRef = 1AF4C32517865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C32817865E8F00122817 /* libluabindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings iOS.a"; + remoteRef = 1AF4C32717865E8F00122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + A922753B1517C094001B78AA /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1AF4C35117865F7400122817 /* jsb_chipmunk_constants.js in Resources */, + 1AF4C35217865F7400122817 /* jsb_chipmunk.js in Resources */, + 1AF4C35317865F7400122817 /* jsb_cocos2d_constants.js in Resources */, + 1AF4C35417865F7400122817 /* jsb_cocos2d_extension.js in Resources */, + 1AF4C35517865F7400122817 /* jsb_cocos2d.js in Resources */, + 1AF4C35617865F7400122817 /* jsb_cocosbuilder.js in Resources */, + 1AF4C35717865F7400122817 /* jsb_debugger.js in Resources */, + 1AF4C35817865F7400122817 /* jsb_opengl_constants.js in Resources */, + 1AF4C35917865F7400122817 /* jsb_opengl.js in Resources */, + 1AF4C35A17865F7400122817 /* jsb_sys.js in Resources */, + 1AF4C35B17865F7400122817 /* jsb.js in Resources */, + 1AF4C35C17865F7400122817 /* main.debug.js in Resources */, + 1AE4B40616D1FF4C003C6D1C /* main.js in Resources */, + D446FDA316102D7D000ADA7B /* Default.png in Resources */, + D446FDA516102D82000ADA7B /* Default@2x.png in Resources */, + D446FDA716102D86000ADA7B /* Default-568h@2x.png in Resources */, + 1AE4B40416D1FECD003C6D1C /* res in Resources */, + 1AE4B40516D1FECD003C6D1C /* src in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + A92275391517C094001B78AA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D45446D3156DE74F00887EB5 /* AppController.mm in Sources */, + D45446D4156DE74F00887EB5 /* main.m in Sources */, + D45446D5156DE74F00887EB5 /* RootViewController.mm in Sources */, + D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 1AF4C32A17865EA600122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx iOS"; + targetProxy = 1AF4C32917865EA600122817 /* PBXContainerItemProxy */; + }; + 1AF4C32C17865EA600122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions iOS"; + targetProxy = 1AF4C32B17865EA600122817 /* PBXContainerItemProxy */; + }; + 1AF4C32E17865EA600122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk iOS"; + targetProxy = 1AF4C32D17865EA600122817 /* PBXContainerItemProxy */; + }; + 1AF4C33017865EA600122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion iOS"; + targetProxy = 1AF4C32F17865EA600122817 /* PBXContainerItemProxy */; + }; + 1AF4C33217865EA600122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "jsbindings iOS"; + targetProxy = 1AF4C33117865EA600122817 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + A92276FE1517C097001B78AA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + DEBUG, + "COCOS2D_DEBUG=1", + USE_FILE32API, + CC_TARGET_OS_IPHONE, + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../cocos2dx", + "$(SRCROOT)/../../cocos2dx/include", + "$(SRCROOT)/../../cocos2dx/platform/ios", + "$(SRCROOT)/../../scripting/javascript/spidermonkey-ios/include1", + ); + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + SDKROOT = iphoneos; + }; + name = Debug; + }; + A92276FF1517C097001B78AA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, + USE_FILE32API, + CC_TARGET_OS_IPHONE, + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../cocos2dx", + "$(SRCROOT)/../../cocos2dx/include", + "$(SRCROOT)/../../cocos2dx/platform/ios", + "$(SRCROOT)/../../scripting/javascript/spidermonkey-ios/include1", + ); + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + SDKROOT = iphoneos; + }; + name = Release; + }; + A92277011517C097001B78AA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 1; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + COCOS2D_JAVASCRIPT, + DEBUG, + "COCOS2D_DEBUG=1", + USE_FILE32API, + CC_TARGET_OS_IPHONE, + CC_ENABLE_CHIPMUNK_INTEGRATION, + ); + GCC_THUMB_SUPPORT = NO; + GCC_VERSION = ""; + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "$(SRCROOT)/../../../cocos2dx/include", + "$(SRCROOT)/../../../cocos2dx/platform/ios", + "$(SRCROOT)/../../../external/chipmunk/include/chipmunk", + "$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/include", + "$(SRCROOT)/../../../scripting/javascript/bindings", + "$(SRCROOT)/../../../extensions", + ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/lib\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", + ); + OTHER_LDFLAGS = ( + "-lxml2", + "-lz", + "-ljs_static", + ); + PRODUCT_NAME = HelloJavascript; + TARGETED_DEVICE_FAMILY = "1,2"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + A92277021517C097001B78AA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + COCOS2D_JAVASCRIPT, + NDEBUG, + USE_FILE32API, + CC_TARGET_OS_IPHONE, + CC_ENABLE_CHIPMUNK_INTEGRATION, + ); + GCC_THUMB_SUPPORT = NO; + GCC_VERSION = ""; + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "$(SRCROOT)/../../../cocos2dx/include", + "$(SRCROOT)/../../../cocos2dx/platform/ios", + "$(SRCROOT)/../../../external/chipmunk/include/chipmunk", + "$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/include", + "$(SRCROOT)/../../../scripting/javascript/bindings", + "$(SRCROOT)/../../../extensions", + ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/lib\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", + ); + OTHER_LDFLAGS = ( + "-lxml2", + "-lz", + "-ljs_static", + ); + PRODUCT_NAME = HelloJavascript; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + A92275371517C094001B78AA /* Build configuration list for PBXProject "HelloJavascript" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A92276FE1517C097001B78AA /* Debug */, + A92276FF1517C097001B78AA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "HelloJavascript" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A92277011517C097001B78AA /* Debug */, + A92277021517C097001B78AA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = A92275341517C094001B78AA /* Project object */; +} diff --git a/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id b/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index 2e2c1a8530..0000000000 --- a/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -d26a11f8c730fe2aebb4087b16b6c3a70bb7feb1 \ No newline at end of file diff --git a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..b07ff76b33 --- /dev/null +++ b/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj @@ -0,0 +1,809 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 15C1568E1683131500D239F2 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C1568D1683131500D239F2 /* libcurl.a */; }; + 15C156981683138E00D239F2 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156911683138E00D239F2 /* Default-568h@2x.png */; }; + 15C156991683138E00D239F2 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156921683138E00D239F2 /* Default.png */; }; + 15C1569A1683138E00D239F2 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156931683138E00D239F2 /* Default@2x.png */; }; + 15C1569B1683138E00D239F2 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156941683138E00D239F2 /* Icon-57.png */; }; + 15C1569C1683138E00D239F2 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156951683138E00D239F2 /* Icon-72.png */; }; + 15C1569D1683138E00D239F2 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156961683138E00D239F2 /* Icon-114.png */; }; + 15C1569E1683138E00D239F2 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156971683138E00D239F2 /* Icon-144.png */; }; + 1AC3622F16D47C5C000847F2 /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622316D47C5C000847F2 /* background.mp3 */; }; + 1AC3623016D47C5C000847F2 /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622416D47C5C000847F2 /* background.ogg */; }; + 1AC3623116D47C5C000847F2 /* crop.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622516D47C5C000847F2 /* crop.png */; }; + 1AC3623216D47C5C000847F2 /* dog.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622616D47C5C000847F2 /* dog.png */; }; + 1AC3623316D47C5C000847F2 /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622716D47C5C000847F2 /* effect1.wav */; }; + 1AC3623416D47C5C000847F2 /* farm.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622816D47C5C000847F2 /* farm.jpg */; }; + 1AC3623516D47C5C000847F2 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622916D47C5C000847F2 /* fonts */; }; + 1AC3623616D47C5C000847F2 /* hello.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622A16D47C5C000847F2 /* hello.lua */; }; + 1AC3623716D47C5C000847F2 /* hello2.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622B16D47C5C000847F2 /* hello2.lua */; }; + 1AC3623816D47C5C000847F2 /* land.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622C16D47C5C000847F2 /* land.png */; }; + 1AC3623916D47C5C000847F2 /* menu1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622D16D47C5C000847F2 /* menu1.png */; }; + 1AC3623A16D47C5C000847F2 /* menu2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622E16D47C5C000847F2 /* menu2.png */; }; + 1AF4C3F21786633E00122817 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DF1786631700122817 /* libchipmunk iOS.a */; }; + 1AF4C3F31786633E00122817 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DB1786631700122817 /* libcocos2dx iOS.a */; }; + 1AF4C3F41786633E00122817 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DD1786631700122817 /* libcocos2dx-extensions iOS.a */; }; + 1AF4C3F51786633E00122817 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E31786631700122817 /* libCocosDenshion iOS.a */; }; + 1AF4C3F61786633E00122817 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E71786631700122817 /* libluabindings iOS.a */; }; + 1AF4C3FD1786635F00122817 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3F81786635F00122817 /* AudioEngine.lua */; }; + 1AF4C3FE1786635F00122817 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3F91786635F00122817 /* CCBReaderLoad.lua */; }; + 1AF4C3FF1786635F00122817 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3FA1786635F00122817 /* Cocos2dConstants.lua */; }; + 1AF4C4001786635F00122817 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3FB1786635F00122817 /* Opengl.lua */; }; + 1AF4C4011786635F00122817 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C3FC1786635F00122817 /* OpenglConstants.lua */; }; + 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; + F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; + F293B3CF15EB7BE500256477 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CE15EB7BE500256477 /* OpenGLES.framework */; }; + F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; + F293B3D315EB7BE500256477 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D215EB7BE500256477 /* AudioToolbox.framework */; }; + F293B3D515EB7BE500256477 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D415EB7BE500256477 /* AVFoundation.framework */; }; + F293B3D715EB7BE500256477 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D615EB7BE500256477 /* UIKit.framework */; }; + F293B3D915EB7BE500256477 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D815EB7BE500256477 /* Foundation.framework */; }; + F293B3DB15EB7BE500256477 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3DA15EB7BE500256477 /* CoreGraphics.framework */; }; + F293B6FC15EB823D00256477 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F293B6F715EB823D00256477 /* AppController.mm */; }; + F293B6FD15EB823D00256477 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F293B6F815EB823D00256477 /* main.m */; }; + F293B6FE15EB823D00256477 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F293B6FA15EB823D00256477 /* RootViewController.mm */; }; + F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F293BB7E15EB831F00256477 /* AppDelegate.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 1AF4C3CC1786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1551A33F158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 1AF4C3CE1786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2FD617814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 1AF4C3D01786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2CB81780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 1AF4C3D21786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2D9B1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 1AF4C3D41786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2ED617814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + 1AF4C3D61786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F31FD1781479B006731B9; + remoteInfo = "jsbindings Mac"; + }; + 1AF4C3D81786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A6FB53017854BC300CDF010; + remoteInfo = "luabindings Mac"; + }; + 1AF4C3DA1786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4D641783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C3DC1786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4EFC1783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C3DE1786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F3B178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C3E01786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F9E1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + 1AF4C3E21786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4FB4178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + 1AF4C3E41786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A5030178387750073F6A7; + remoteInfo = "jsbindings iOS"; + }; + 1AF4C3E61786631700122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A119791178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; + 1AF4C3E81786632F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + 1AF4C3EA1786632F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4E111783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + 1AF4C3EC1786632F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4EFD178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + 1AF4C3EE1786632F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + 1AF4C3F01786632F00122817 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1A119716178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; + 15C156911683138E00D239F2 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; + 15C156921683138E00D239F2 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; + 15C156931683138E00D239F2 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = SOURCE_ROOT; }; + 15C156941683138E00D239F2 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = SOURCE_ROOT; }; + 15C156951683138E00D239F2 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = SOURCE_ROOT; }; + 15C156961683138E00D239F2 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = SOURCE_ROOT; }; + 15C156971683138E00D239F2 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = SOURCE_ROOT; }; + 1AC3622316D47C5C000847F2 /* background.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = background.mp3; path = ../Resources/background.mp3; sourceTree = ""; }; + 1AC3622416D47C5C000847F2 /* background.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; name = background.ogg; path = ../Resources/background.ogg; sourceTree = ""; }; + 1AC3622516D47C5C000847F2 /* crop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = crop.png; path = ../Resources/crop.png; sourceTree = ""; }; + 1AC3622616D47C5C000847F2 /* dog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dog.png; path = ../Resources/dog.png; sourceTree = ""; }; + 1AC3622716D47C5C000847F2 /* effect1.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = effect1.wav; path = ../Resources/effect1.wav; sourceTree = ""; }; + 1AC3622816D47C5C000847F2 /* farm.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = farm.jpg; path = ../Resources/farm.jpg; sourceTree = ""; }; + 1AC3622916D47C5C000847F2 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../Resources/fonts; sourceTree = ""; }; + 1AC3622A16D47C5C000847F2 /* hello.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hello.lua; path = ../Resources/hello.lua; sourceTree = ""; }; + 1AC3622B16D47C5C000847F2 /* hello2.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hello2.lua; path = ../Resources/hello2.lua; sourceTree = ""; }; + 1AC3622C16D47C5C000847F2 /* land.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = land.png; path = ../Resources/land.png; sourceTree = ""; }; + 1AC3622D16D47C5C000847F2 /* menu1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu1.png; path = ../Resources/menu1.png; sourceTree = ""; }; + 1AC3622E16D47C5C000847F2 /* menu2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu2.png; path = ../Resources/menu2.png; sourceTree = ""; }; + 1AF4C3B8178662A500122817 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; + 1AF4C3F81786635F00122817 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = ../../../scripting/lua/script/AudioEngine.lua; sourceTree = ""; }; + 1AF4C3F91786635F00122817 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = ../../../scripting/lua/script/CCBReaderLoad.lua; sourceTree = ""; }; + 1AF4C3FA1786635F00122817 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = ../../../scripting/lua/script/Cocos2dConstants.lua; sourceTree = ""; }; + 1AF4C3FB1786635F00122817 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = ../../../scripting/lua/script/Opengl.lua; sourceTree = ""; }; + 1AF4C3FC1786635F00122817 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = ../../../scripting/lua/script/OpenglConstants.lua; sourceTree = ""; }; + 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + F293B3C815EB7BE500256477 /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; }; + F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + F293B3CE15EB7BE500256477 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; + F293B3D015EB7BE500256477 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; + F293B3D215EB7BE500256477 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + F293B3D415EB7BE500256477 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + F293B3D615EB7BE500256477 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + F293B3D815EB7BE500256477 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + F293B3DA15EB7BE500256477 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + F293B6F615EB823D00256477 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; + F293B6F715EB823D00256477 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; + F293B6F815EB823D00256477 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + F293B6F915EB823D00256477 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; + F293B6FA15EB823D00256477 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; + F293BB7E15EB831F00256477 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; + F293BB7F15EB831F00256477 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + F293B3C515EB7BE500256477 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 1AF4C403178663F200122817 /* libz.dylib in Frameworks */, + 1AF4C3F21786633E00122817 /* libchipmunk iOS.a in Frameworks */, + 1AF4C3F31786633E00122817 /* libcocos2dx iOS.a in Frameworks */, + 1AF4C3F41786633E00122817 /* libcocos2dx-extensions iOS.a in Frameworks */, + 1AF4C3F51786633E00122817 /* libCocosDenshion iOS.a in Frameworks */, + 1AF4C3F61786633E00122817 /* libluabindings iOS.a in Frameworks */, + 15C1568E1683131500D239F2 /* libcurl.a in Frameworks */, + F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */, + F293B3CF15EB7BE500256477 /* OpenGLES.framework in Frameworks */, + F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */, + F293B3D315EB7BE500256477 /* AudioToolbox.framework in Frameworks */, + F293B3D515EB7BE500256477 /* AVFoundation.framework in Frameworks */, + F293B3D715EB7BE500256477 /* UIKit.framework in Frameworks */, + F293B3D915EB7BE500256477 /* Foundation.framework in Frameworks */, + F293B3DB15EB7BE500256477 /* CoreGraphics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1AF4C3BA1786631600122817 /* Products */ = { + isa = PBXGroup; + children = ( + 1AF4C3CD1786631700122817 /* libcocos2dx Mac.a */, + 1AF4C3CF1786631700122817 /* libcocos2dx-extensions Mac.a */, + 1AF4C3D11786631700122817 /* libchipmunk Mac.a */, + 1AF4C3D31786631700122817 /* libbox2d Mac.a */, + 1AF4C3D51786631700122817 /* libCocosDenshion Mac.a */, + 1AF4C3D71786631700122817 /* libjsbindings Mac.a */, + 1AF4C3D91786631700122817 /* libluabindings Mac.a */, + 1AF4C3DB1786631700122817 /* libcocos2dx iOS.a */, + 1AF4C3DD1786631700122817 /* libcocos2dx-extensions iOS.a */, + 1AF4C3DF1786631700122817 /* libchipmunk iOS.a */, + 1AF4C3E11786631700122817 /* libbox2d iOS.a */, + 1AF4C3E31786631700122817 /* libCocosDenshion iOS.a */, + 1AF4C3E51786631700122817 /* libjsbindings iOS.a */, + 1AF4C3E71786631700122817 /* libluabindings iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + 1AF4C3F71786634600122817 /* Lua Common */ = { + isa = PBXGroup; + children = ( + 1AF4C3F81786635F00122817 /* AudioEngine.lua */, + 1AF4C3F91786635F00122817 /* CCBReaderLoad.lua */, + 1AF4C3FA1786635F00122817 /* Cocos2dConstants.lua */, + 1AF4C3FB1786635F00122817 /* Opengl.lua */, + 1AF4C3FC1786635F00122817 /* OpenglConstants.lua */, + ); + name = "Lua Common"; + sourceTree = ""; + }; + F293B3BD15EB7BE500256477 = { + isa = PBXGroup; + children = ( + 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */, + F293BB7C15EB830F00256477 /* Classes */, + F293B3CB15EB7BE500256477 /* Frameworks */, + 1AF4C3F71786634600122817 /* Lua Common */, + F293B6E815EB807E00256477 /* Other Sources */, + F293B3C915EB7BE500256477 /* Products */, + F293BC4615EB859D00256477 /* Resources */, + ); + sourceTree = ""; + }; + F293B3C915EB7BE500256477 /* Products */ = { + isa = PBXGroup; + children = ( + F293B3C815EB7BE500256477 /* HelloLua.app */, + ); + name = Products; + sourceTree = ""; + }; + F293B3CB15EB7BE500256477 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1AF4C402178663F200122817 /* libz.dylib */, + 15C1568D1683131500D239F2 /* libcurl.a */, + F293B3CC15EB7BE500256477 /* QuartzCore.framework */, + F293B3CE15EB7BE500256477 /* OpenGLES.framework */, + F293B3D015EB7BE500256477 /* OpenAL.framework */, + F293B3D215EB7BE500256477 /* AudioToolbox.framework */, + F293B3D415EB7BE500256477 /* AVFoundation.framework */, + F293B3D615EB7BE500256477 /* UIKit.framework */, + F293B3D815EB7BE500256477 /* Foundation.framework */, + F293B3DA15EB7BE500256477 /* CoreGraphics.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + F293B6E815EB807E00256477 /* Other Sources */ = { + isa = PBXGroup; + children = ( + F293B6F615EB823D00256477 /* AppController.h */, + F293B6F715EB823D00256477 /* AppController.mm */, + F293B6F815EB823D00256477 /* main.m */, + 1AF4C3B8178662A500122817 /* Prefix.pch */, + F293B6F915EB823D00256477 /* RootViewController.h */, + F293B6FA15EB823D00256477 /* RootViewController.mm */, + ); + name = "Other Sources"; + sourceTree = ""; + }; + F293BB7C15EB830F00256477 /* Classes */ = { + isa = PBXGroup; + children = ( + F293BB7E15EB831F00256477 /* AppDelegate.cpp */, + F293BB7F15EB831F00256477 /* AppDelegate.h */, + ); + name = Classes; + sourceTree = ""; + }; + F293BC4615EB859D00256477 /* Resources */ = { + isa = PBXGroup; + children = ( + 1AC3622316D47C5C000847F2 /* background.mp3 */, + 1AC3622416D47C5C000847F2 /* background.ogg */, + 1AC3622516D47C5C000847F2 /* crop.png */, + 1AC3622616D47C5C000847F2 /* dog.png */, + 1AC3622716D47C5C000847F2 /* effect1.wav */, + 1AC3622816D47C5C000847F2 /* farm.jpg */, + 1AC3622916D47C5C000847F2 /* fonts */, + 1AC3622A16D47C5C000847F2 /* hello.lua */, + 1AC3622B16D47C5C000847F2 /* hello2.lua */, + 1AC3622C16D47C5C000847F2 /* land.png */, + 1AC3622D16D47C5C000847F2 /* menu1.png */, + 1AC3622E16D47C5C000847F2 /* menu2.png */, + 15C156911683138E00D239F2 /* Default-568h@2x.png */, + 15C156921683138E00D239F2 /* Default.png */, + 15C156931683138E00D239F2 /* Default@2x.png */, + 15C156941683138E00D239F2 /* Icon-57.png */, + 15C156951683138E00D239F2 /* Icon-72.png */, + 15C156961683138E00D239F2 /* Icon-114.png */, + 15C156971683138E00D239F2 /* Icon-144.png */, + ); + name = Resources; + path = ../Resources; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + F293B3C715EB7BE500256477 /* HelloLua */ = { + isa = PBXNativeTarget; + buildConfigurationList = F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua" */; + buildPhases = ( + F293B3C415EB7BE500256477 /* Sources */, + F293B3C515EB7BE500256477 /* Frameworks */, + F293B3C615EB7BE500256477 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 1AF4C3E91786632F00122817 /* PBXTargetDependency */, + 1AF4C3EB1786632F00122817 /* PBXTargetDependency */, + 1AF4C3ED1786632F00122817 /* PBXTargetDependency */, + 1AF4C3EF1786632F00122817 /* PBXTargetDependency */, + 1AF4C3F11786632F00122817 /* PBXTargetDependency */, + ); + name = HelloLua; + productName = HelloLua; + productReference = F293B3C815EB7BE500256477 /* HelloLua.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + F293B3BF15EB7BE500256477 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0430; + }; + buildConfigurationList = F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = F293B3BD15EB7BE500256477; + productRefGroup = F293B3C915EB7BE500256477 /* Products */; + projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1AF4C3BA1786631600122817 /* Products */; + ProjectRef = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; + }, + ); + projectRoot = ""; + targets = ( + F293B3C715EB7BE500256477 /* HelloLua */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXReferenceProxy section */ + 1AF4C3CD1786631700122817 /* libcocos2dx Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx Mac.a"; + remoteRef = 1AF4C3CC1786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3CF1786631700122817 /* libcocos2dx-extensions Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions Mac.a"; + remoteRef = 1AF4C3CE1786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3D11786631700122817 /* libchipmunk Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk Mac.a"; + remoteRef = 1AF4C3D01786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3D31786631700122817 /* libbox2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d Mac.a"; + remoteRef = 1AF4C3D21786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3D51786631700122817 /* libCocosDenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion Mac.a"; + remoteRef = 1AF4C3D41786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3D71786631700122817 /* libjsbindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings Mac.a"; + remoteRef = 1AF4C3D61786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3D91786631700122817 /* libluabindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings Mac.a"; + remoteRef = 1AF4C3D81786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3DB1786631700122817 /* libcocos2dx iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx iOS.a"; + remoteRef = 1AF4C3DA1786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3DD1786631700122817 /* libcocos2dx-extensions iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions iOS.a"; + remoteRef = 1AF4C3DC1786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3DF1786631700122817 /* libchipmunk iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk iOS.a"; + remoteRef = 1AF4C3DE1786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3E11786631700122817 /* libbox2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d iOS.a"; + remoteRef = 1AF4C3E01786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3E31786631700122817 /* libCocosDenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion iOS.a"; + remoteRef = 1AF4C3E21786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3E51786631700122817 /* libjsbindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings iOS.a"; + remoteRef = 1AF4C3E41786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AF4C3E71786631700122817 /* libluabindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings iOS.a"; + remoteRef = 1AF4C3E61786631700122817 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + F293B3C615EB7BE500256477 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C156981683138E00D239F2 /* Default-568h@2x.png in Resources */, + 15C156991683138E00D239F2 /* Default.png in Resources */, + 15C1569A1683138E00D239F2 /* Default@2x.png in Resources */, + 15C1569B1683138E00D239F2 /* Icon-57.png in Resources */, + 15C1569C1683138E00D239F2 /* Icon-72.png in Resources */, + 15C1569D1683138E00D239F2 /* Icon-114.png in Resources */, + 15C1569E1683138E00D239F2 /* Icon-144.png in Resources */, + 1AC3622F16D47C5C000847F2 /* background.mp3 in Resources */, + 1AC3623016D47C5C000847F2 /* background.ogg in Resources */, + 1AC3623116D47C5C000847F2 /* crop.png in Resources */, + 1AC3623216D47C5C000847F2 /* dog.png in Resources */, + 1AC3623316D47C5C000847F2 /* effect1.wav in Resources */, + 1AC3623416D47C5C000847F2 /* farm.jpg in Resources */, + 1AC3623516D47C5C000847F2 /* fonts in Resources */, + 1AC3623616D47C5C000847F2 /* hello.lua in Resources */, + 1AC3623716D47C5C000847F2 /* hello2.lua in Resources */, + 1AC3623816D47C5C000847F2 /* land.png in Resources */, + 1AC3623916D47C5C000847F2 /* menu1.png in Resources */, + 1AC3623A16D47C5C000847F2 /* menu2.png in Resources */, + 1AF4C3FD1786635F00122817 /* AudioEngine.lua in Resources */, + 1AF4C3FE1786635F00122817 /* CCBReaderLoad.lua in Resources */, + 1AF4C3FF1786635F00122817 /* Cocos2dConstants.lua in Resources */, + 1AF4C4001786635F00122817 /* Opengl.lua in Resources */, + 1AF4C4011786635F00122817 /* OpenglConstants.lua in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + F293B3C415EB7BE500256477 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F293B6FC15EB823D00256477 /* AppController.mm in Sources */, + F293B6FD15EB823D00256477 /* main.m in Sources */, + F293B6FE15EB823D00256477 /* RootViewController.mm in Sources */, + F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 1AF4C3E91786632F00122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx iOS"; + targetProxy = 1AF4C3E81786632F00122817 /* PBXContainerItemProxy */; + }; + 1AF4C3EB1786632F00122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions iOS"; + targetProxy = 1AF4C3EA1786632F00122817 /* PBXContainerItemProxy */; + }; + 1AF4C3ED1786632F00122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk iOS"; + targetProxy = 1AF4C3EC1786632F00122817 /* PBXContainerItemProxy */; + }; + 1AF4C3EF1786632F00122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion iOS"; + targetProxy = 1AF4C3EE1786632F00122817 /* PBXContainerItemProxy */; + }; + 1AF4C3F11786632F00122817 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "luabindings iOS"; + targetProxy = 1AF4C3F01786632F00122817 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + F293B6C215EB7BEA00256477 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + DEBUG, + "COCOS2D_DEBUG=1", + USE_FILE32API, + TARGET_OS_IPHONE, + "CC_LUA_ENGINE_ENABLED=1", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "\"$(PROJECT_NAME)/libs/cocos2dx/kazmath/include\"", + "\"$(PROJECT_NAME)/libs/cocos2dx\"", + "\"$(PROJECT_NAME)/libs/CocosDenshion/include\"", + "\"$(SDKROOT)/usr/include/libxml2\"", + "\"$(SRCROOT)/../../cocos2dx/\"", + "\"$(SRCROOT)/../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../external/lua/tolua\"", + "\"$(SRCROOT)/../../external/lua/src\"", + "$(SRCROOT)/../../external/lua/cocos2dx_support", + "$(SRCROOT)/../../cocos2dx/platform/ios", + "$(SRCROOT)/../../cocos2dx/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + SDKROOT = iphoneos; + }; + name = Debug; + }; + F293B6C315EB7BEA00256477 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, + USE_FILE32API, + TARGET_OS_IPHONE, + "CC_LUA_ENGINE_ENABLED=1", + ); + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "\"$(PROJECT_NAME)/libs/cocos2dx/kazmath/include\"", + "\"$(PROJECT_NAME)/libs/cocos2dx\"", + "\"$(PROJECT_NAME)/libs/CocosDenshion/include\"", + "\"$(SDKROOT)/usr/include/libxml2\"", + "\"$(SRCROOT)/../../cocos2dx/\"", + "\"$(SRCROOT)/../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../external/lua/tolua\"", + "\"$(SRCROOT)/../../external/lua/src\"", + "$(SRCROOT)/../../external/lua/cocos2dx_support", + "$(SRCROOT)/../../cocos2dx/platform/ios", + "$(SRCROOT)/../../cocos2dx/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + SDKROOT = iphoneos; + }; + name = Release; + }; + F293B6C515EB7BEA00256477 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + DEBUG, + "COCOS2D_DEBUG=1", + USE_FILE32API, + CC_TARGET_OS_IPHONE, + "CC_LUA_ENGINE_ENABLED=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + "GCC_THUMB_SUPPORT[arch=armv6]" = ""; + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../scripting/lua/tolua\"", + "\"$(SRCROOT)/../../../scripting/lua/luajit/include\"", + "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"", + "\"$(SRCROOT)/../../../extensions\"", + ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries", + "$(inherited)", + "\"$(SRCROOT)/../../../scripting/lua/luajit/ios\"", + "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", + ); + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + F293B6C615EB7BEA00256477 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + NDEBUG, + USE_FILE32API, + CC_TARGET_OS_IPHONE, + "CC_LUA_ENGINE_ENABLED=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + "GCC_THUMB_SUPPORT[arch=armv6]" = ""; + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../scripting/lua/tolua\"", + "\"$(SRCROOT)/../../../scripting/lua/luajit/include\"", + "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"", + "\"$(SRCROOT)/../../../extensions\"", + ); + INFOPLIST_FILE = Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries", + "$(inherited)", + "\"$(SRCROOT)/../../../scripting/lua/luajit/ios\"", + "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", + ); + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F293B6C215EB7BEA00256477 /* Debug */, + F293B6C315EB7BEA00256477 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F293B6C515EB7BEA00256477 /* Debug */, + F293B6C615EB7BEA00256477 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = F293B3BF15EB7BE500256477 /* Project object */; +} diff --git a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id b/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index 7aea6c94af..0000000000 --- a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -076fe9adb2bd90144e4ac19089e9e0b884c92af8 \ No newline at end of file From e999cc9541b713020183d132f1fa082a40b3e00d Mon Sep 17 00:00:00 2001 From: zhangbin Date: Fri, 5 Jul 2013 10:51:08 +0800 Subject: [PATCH 04/20] closed #2376, Add online IAP feature in plugins : uc, nd91 & qh360. --- .../org/cocos2dx/plugin/IAPOnlineNd91.java | 223 ++++++++++++++++++ .../org/cocos2dx/plugin/IAPOnlineQH360.java | 208 ++++++++++++++++ .../src/org/cocos2dx/plugin/QH360Wrapper.java | 159 +++++++++++++ .../src/org/cocos2dx/plugin/UserQH360.java | 93 +------- .../src/org/cocos2dx/plugin/IAPOnlineUC.java | 181 ++++++++++++++ .../src/org/cocos2dx/plugin/UCWrapper.java | 169 +++++++++++++ .../src/org/cocos2dx/plugin/UserUC.java | 133 ++--------- plugin/samples/HelloPlugins/Classes/Configs.h | 11 + .../HelloPlugins/Classes/HelloWorldScene.cpp | 5 + .../Classes/TestIAPOnline/MyIAPOLManager.cpp | 175 ++++++++++++++ .../Classes/TestIAPOnline/MyIAPOLManager.h | 67 ++++++ .../TestIAPOnline/TestIAPOnlineScene.cpp | 165 +++++++++++++ .../TestIAPOnline/TestIAPOnlineScene.h | 46 ++++ .../Classes/TestUser/MyUserManager.cpp | 6 +- .../Classes/TestUser/MyUserManager.h | 8 +- .../proj.android/AndroidManifest.xml | 8 +- .../HelloPlugins/proj.android/jni/Android.mk | 17 +- 17 files changed, 1468 insertions(+), 206 deletions(-) create mode 100644 plugin/plugins/nd91/proj.android/src/org/cocos2dx/plugin/IAPOnlineNd91.java create mode 100644 plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/IAPOnlineQH360.java create mode 100644 plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/QH360Wrapper.java create mode 100644 plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/IAPOnlineUC.java create mode 100644 plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UCWrapper.java create mode 100644 plugin/samples/HelloPlugins/Classes/Configs.h create mode 100644 plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp create mode 100644 plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.h create mode 100644 plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.cpp create mode 100644 plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.h diff --git a/plugin/plugins/nd91/proj.android/src/org/cocos2dx/plugin/IAPOnlineNd91.java b/plugin/plugins/nd91/proj.android/src/org/cocos2dx/plugin/IAPOnlineNd91.java new file mode 100644 index 0000000000..e92482f35b --- /dev/null +++ b/plugin/plugins/nd91/proj.android/src/org/cocos2dx/plugin/IAPOnlineNd91.java @@ -0,0 +1,223 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +package org.cocos2dx.plugin; + +import java.util.Hashtable; +import java.util.UUID; + +import com.nd.commplatform.NdCommplatform; +import com.nd.commplatform.NdErrorCode; +import com.nd.commplatform.NdMiscCallbackListener; +import com.nd.commplatform.entry.NdBuyInfo; + +import android.app.Activity; +import android.content.Context; +import android.util.Log; + +public class IAPOnlineNd91 implements InterfaceIAP { + + private static final String LOG_TAG = "IAPOnlineNd91"; + private static Activity mContext = null; + private static IAPOnlineNd91 mNd91 = null; + private static boolean bDebug = false; + private static Hashtable curProductInfo = null; + + protected static void LogE(String msg, Exception e) { + Log.e(LOG_TAG, msg, e); + e.printStackTrace(); + } + + protected static void LogD(String msg) { + if (bDebug) { + Log.d(LOG_TAG, msg); + } + } + + public IAPOnlineNd91(Context context) { + mContext = (Activity) context; + mNd91 = this; + } + + @Override + public void configDeveloperInfo(Hashtable cpInfo) { + LogD("initDeveloperInfo invoked " + cpInfo.toString()); + final Hashtable curCPInfo = cpInfo; + PluginWrapper.runOnMainThread(new Runnable() { + @Override + public void run() { + try { + String appId = curCPInfo.get("Nd91AppId"); + String appKey = curCPInfo.get("Nd91AppKey"); + int id = Integer.parseInt(appId); + + String orientation = curCPInfo.get("Nd91Orientation"); + Nd91Wrapper.initSDK(mContext, id, appKey, orientation); + } catch (Exception e) { + LogE("Developer info is wrong!", e); + } + } + }); + } + + @Override + public void payForProduct(Hashtable info) { + LogD("payForProduct invoked " + info.toString()); + if (! Nd91Wrapper.networkReachable(mContext)) { + payResult(IAPWrapper.PAYRESULT_FAIL, "网络不可用"); + return; + } + + curProductInfo = info; + if (curProductInfo == null) { + payResult(IAPWrapper.PAYRESULT_FAIL, "商品信息错误"); + return; + } + + PluginWrapper.runOnMainThread(new Runnable() { + @Override + public void run() { + if (! Nd91Wrapper.isLogined()) { + userLogin(); + } else { + addPayment(curProductInfo); + } + } + }); + } + + @Override + public void setDebugMode(boolean debug) { + bDebug = debug; + } + + @Override + public String getSDKVersion() { + return Nd91Wrapper.getSDKVersion(); + } + + private static void payResult(int ret, String msg) { + IAPWrapper.onPayResult(mNd91, ret, msg); + LogD("Nd91 result : " + ret + " msg : " + msg); + } + + private static String getOrderSerial() { + UUID guid = UUID.randomUUID(); + String text = guid.toString(); + text = text.replace("-", "".trim()); + return text; + } + + private static void userLogin() { + LogD("User begin login"); + try { + Nd91Wrapper.userLogin(mContext, new NdMiscCallbackListener.OnLoginProcessListener() { + @Override + public void finishLoginProcess(int code) { + if (code == NdErrorCode.ND_COM_PLATFORM_SUCCESS) { + addPayment(curProductInfo); + } else if (code == NdErrorCode.ND_COM_PLATFORM_ERROR_CANCEL) { + payResult(IAPWrapper.PAYRESULT_FAIL, "用户取消登录"); + } else { + payResult(IAPWrapper.PAYRESULT_FAIL, "用户登录失败"); + } + } + }); + } catch (Exception e) { + payResult(IAPWrapper.PAYRESULT_FAIL, "用户登录失败"); + LogE("User login error", e); + } + } + + private static void addPayment(Hashtable productInfo) { + try { + do { + String id = productInfo.get("Nd91ProductId"); + String strPrice = productInfo.get("productPrice"); + String strName = productInfo.get("productName"); + String strDesc = productInfo.get("productDesc"); + String oriPrice = productInfo.get("Nd91OriginalPrice"); + String strCount = productInfo.get("Nd91ProductCount"); + + if (id == null || id.length() == 0) { + payResult(IAPWrapper.PAYRESULT_FAIL, "商品信息错误"); + break; + } + + float price = Float.parseFloat(strPrice); + float fOriPrice = price; + if (oriPrice != null && oriPrice.length() > 0) { + fOriPrice = Float.parseFloat(oriPrice); + } + int count = 1; + if (strCount != null && strCount.length() > 0) { + count = Integer.parseInt(strCount); + } + + String serial = IAPOnlineNd91.getOrderSerial(); + NdBuyInfo order = new NdBuyInfo(); + order.setSerial(serial); + order.setProductId(id); + order.setProductName(strName); + order.setProductPrice(price); + order.setProductOrginalPrice(fOriPrice); + order.setCount(count); + order.setPayDescription(strDesc); + + int aError = NdCommplatform.getInstance().ndUniPayAsyn(order, mContext, new NdMiscCallbackListener.OnPayProcessListener() { + + @Override + public void finishPayProcess(int code) { + IAPOnlineNd91.LogD("finishPayProcess code : " + code); + switch(code){ + case NdErrorCode.ND_COM_PLATFORM_SUCCESS: + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_SUCCESS, "购买成功"); break; + case NdErrorCode.ND_COM_PLATFORM_ERROR_PAY_FAILURE: + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_FAIL, "购买失败"); break; + case NdErrorCode.ND_COM_PLATFORM_ERROR_PAY_CANCEL: + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_CANCEL, "取消购买"); break; + case NdErrorCode.ND_COM_PLATFORM_ERROR_PAY_ASYN_SMS_SENT: + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_SUCCESS, "订单已提交,充值短信已发送"); break; + case NdErrorCode.ND_COM_PLATFORM_ERROR_PAY_REQUEST_SUBMITTED: + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_SUCCESS, "订单已提交"); break; + default: + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_FAIL, "购买失败"); break; + } + } + }); + + if (aError != 0) { + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_FAIL, "您输入参数有错,无法提交购买请求"); + } + } while (false); + } catch (Exception e) { + LogE("Error during payment", e); + IAPOnlineNd91.payResult(IAPWrapper.PAYRESULT_FAIL, "支付失败"); + } + } + + @Override + public String getPluginVersion() { + return Nd91Wrapper.getPluginVersion(); + } +} diff --git a/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/IAPOnlineQH360.java b/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/IAPOnlineQH360.java new file mode 100644 index 0000000000..949069f1f0 --- /dev/null +++ b/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/IAPOnlineQH360.java @@ -0,0 +1,208 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +package org.cocos2dx.plugin; + +import java.util.Hashtable; + +import org.json.JSONObject; + +import com.qihoopay.insdk.activity.ContainerActivity; +import com.qihoopay.insdk.matrix.Matrix; +import com.qihoopay.sdk.protocols.IDispatcherCallback; +import com.qihoopay.sdk.protocols.ProtocolConfigs; +import com.qihoopay.sdk.protocols.ProtocolKeys; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; + +public class IAPOnlineQH360 implements InterfaceIAP { + + private static final String LOG_TAG = "IAPOnlineQH360"; + private static Activity mContext = null; + private static IAPOnlineQH360 mAdapter = null; + private static boolean bDebug = false; + + private static String mAppName = null; + private static String mExchangeRate = null; + + protected static void LogE(String msg, Exception e) { + Log.e(LOG_TAG, msg, e); + e.printStackTrace(); + } + + protected static void LogD(String msg) { + if (bDebug) { + Log.d(LOG_TAG, msg); + } + } + + public IAPOnlineQH360(Context context) { + mContext = (Activity) context; + mAdapter = this; + } + + @Override + public void configDeveloperInfo(Hashtable cpInfo) { + try { + mAppName = cpInfo.get("QHAppName"); + mExchangeRate = cpInfo.get("QHExchangeRate"); + } catch (Exception e) { + LogE("Developer info error", e); + } + + PluginWrapper.runOnMainThread(new Runnable() { + @Override + public void run() { + QH360Wrapper.initSDK(mContext); + } + }); + } + + @Override + public void payForProduct(Hashtable info) { + LogD("payForProduct invoked " + info.toString()); + final Hashtable curInfo = info; + PluginWrapper.runOnMainThread(new Runnable() { + + @Override + public void run() { + try { + Intent intent = getPayIntent(curInfo); + Matrix.invokeActivity(mContext, intent, new IDispatcherCallback() { + @Override + public void onFinished(String data) { + LogD("mPayCallback, data is " + data); + JSONObject jsonRes; + try { + jsonRes = new JSONObject(data); + int errorCode = jsonRes.getInt("error_code"); + String errorMsg = jsonRes.getString("error_msg"); + int retCode = IAPWrapper.PAYRESULT_FAIL; + switch (errorCode) { + case 0: + // Success + retCode = IAPWrapper.PAYRESULT_SUCCESS; + break; + case 1: + // Fail + retCode = IAPWrapper.PAYRESULT_FAIL; + break; + case -1: + // cancel + retCode = IAPWrapper.PAYRESULT_CANCEL; + break; + case -2: + // paying + retCode = IAPWrapper.PAYRESULT_SUCCESS; + break; + default: + break; + } + + IAPOnlineQH360.payResult(retCode, errorMsg); + } catch (Exception e) { + IAPOnlineQH360.payResult(IAPWrapper.PAYRESULT_FAIL, "Unkonw Error"); + LogE("Error when parse the result data!", e); + } + } + }); + } catch (Exception e) { + IAPOnlineQH360.payResult(IAPWrapper.PAYRESULT_FAIL, "Unkonw Error"); + LogE("Unknow Error!", e); + } + } + }); + } + + @Override + public void setDebugMode(boolean debug) { + bDebug = debug; + } + + @Override + public String getSDKVersion() { + return QH360Wrapper.getSDKVersion(); + } + + private static void payResult(int ret, String msg) { + IAPWrapper.onPayResult(mAdapter, ret, msg); + LogD("IAPOnlineQH360 result : " + ret + " msg : " + msg); + } + + @Override + public String getPluginVersion() { + return "0.2.0"; + } + + private Intent getPayIntent(Hashtable pInfo) { + Bundle bundle = new Bundle(); + bundle.putBoolean(ProtocolKeys.IS_SCREEN_ORIENTATION_LANDSCAPE, QH360Wrapper.isLandscape(mContext)); + + // required params : accesstoken, userid, + bundle.putString(ProtocolKeys.ACCESS_TOKEN, pInfo.get("QHAccessToken")); + bundle.putString(ProtocolKeys.QIHOO_USER_ID, pInfo.get("QHUserId")); + + String strPrice = pInfo.get("productPrice"); + float fPrice = Float.parseFloat(strPrice); + int nPrice = (int) (fPrice * 100); + bundle.putString(ProtocolKeys.AMOUNT, "" + nPrice); + bundle.putString(ProtocolKeys.RATE, mExchangeRate); + bundle.putString(ProtocolKeys.PRODUCT_NAME, pInfo.get("productName")); + bundle.putString(ProtocolKeys.PRODUCT_ID, pInfo.get("QHProductID")); + bundle.putString(ProtocolKeys.NOTIFY_URI, pInfo.get("QHNotifyUri")); + bundle.putString(ProtocolKeys.APP_NAME, mAppName); + bundle.putString(ProtocolKeys.APP_USER_NAME, pInfo.get("QHUserName")); + bundle.putString(ProtocolKeys.APP_USER_ID, pInfo.get("QHAppUserID")); + + // optional params : ext, app order id, pay type + String ext1 = pInfo.get("QHExtra1"); + if (null == ext1 && ! TextUtils.isEmpty(ext1)) { + bundle.putString(ProtocolKeys.APP_EXT_1, ext1); + } + String ext2 = pInfo.get("QHExtra2"); + if (null == ext2 && ! TextUtils.isEmpty(ext2)) { + bundle.putString(ProtocolKeys.APP_EXT_2, ext2); + } + String appOrderId = pInfo.get("QHAppOrderID"); + if (null == appOrderId && ! TextUtils.isEmpty(appOrderId)) { + bundle.putString(ProtocolKeys.APP_ORDER_ID, appOrderId); + } + + String[] payTypes = { + ProtocolKeys.PayType.ALIPAY, + ProtocolKeys.PayType.JCARD, + ProtocolKeys.PayType.QIHOO_CARD, + ProtocolKeys.PayType.MOBILE_CARD + }; + bundle.putStringArray(ProtocolKeys.PAY_TYPE, payTypes); + + bundle.putInt(ProtocolKeys.FUNCTION_CODE, ProtocolConfigs.FUNC_CODE_PAY); + Intent intent = new Intent(mContext, ContainerActivity.class); intent.putExtras(bundle); + return intent; + } +} diff --git a/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/QH360Wrapper.java b/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/QH360Wrapper.java new file mode 100644 index 0000000000..60fc6fca68 --- /dev/null +++ b/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/QH360Wrapper.java @@ -0,0 +1,159 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +package org.cocos2dx.plugin; + +import org.json.JSONObject; + +import com.qihoopay.insdk.activity.ContainerActivity; +import com.qihoopay.insdk.matrix.Matrix; +import com.qihoopay.sdk.protocols.IDispatcherCallback; +import com.qihoopay.sdk.protocols.ProtocolConfigs; +import com.qihoopay.sdk.protocols.ProtocolKeys; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; +import android.os.Bundle; + +public class QH360Wrapper { + + private static boolean mInited = false; + public static void initSDK(Context ctx) { + if (mInited) { + return; + } + + Matrix.init((Activity) ctx, isLandscape(ctx), new IDispatcherCallback() { + @Override + public void onFinished(String data) { + mInited = true; + } + }); + } + + public static String getSDKVersion() { + return "0.7.6"; + } + + public static boolean isLandscape(Context ctx) + { + Configuration config = ctx.getResources().getConfiguration(); + int orientation = config.orientation; + + if (orientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || + orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + { + orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; + } + + return (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + } + + private static boolean mLogined = false; + private static String mAuthCode = ""; + public static void userLogin(Context ctx, IDispatcherCallback callback) { + if (mLogined) { + return; + } + + Bundle bundle = new Bundle(); + bundle.putBoolean(ProtocolKeys.IS_SCREEN_ORIENTATION_LANDSCAPE, isLandscape(ctx)); + bundle.putBoolean(ProtocolKeys.IS_LOGIN_BG_TRANSPARENT, true); + bundle.putString(ProtocolKeys.RESPONSE_TYPE, "code"); + bundle.putInt(ProtocolKeys.FUNCTION_CODE, ProtocolConfigs.FUNC_CODE_LOGIN); + Intent intent = new Intent(ctx, ContainerActivity.class); + intent.putExtras(bundle); + + final IDispatcherCallback curCallback = callback; + Matrix.invokeActivity(ctx, intent, new IDispatcherCallback() { + @Override + public void onFinished(String data) { + if (null == data) { + mLogined = false; + mAuthCode = ""; + curCallback.onFinished(data); + return; + } + + String retStr = "Unknown Error"; + try { + JSONObject json = new JSONObject(data); + int errCode = json.optInt("error_code"); + switch (errCode) { + case 0: + { + mLogined = true; + JSONObject content = json.optJSONObject("content"); + mAuthCode = content.optString("code"); + retStr = ""; + } + break; + default: + mLogined = false; + mAuthCode = ""; + retStr = "Login Failed"; + break; + } + } catch (Exception e) { + mLogined = false; + mAuthCode = ""; + retStr = "Unknow Error"; + e.printStackTrace(); + } finally { + curCallback.onFinished(retStr); + } + } + }); + } + + public static void userLogout(Context ctx, IDispatcherCallback callback) { + Bundle bundle = new Bundle(); + bundle.putBoolean(ProtocolKeys.IS_SCREEN_ORIENTATION_LANDSCAPE, isLandscape(ctx)); + bundle.putInt(ProtocolKeys.FUNCTION_CODE, ProtocolConfigs.FUNC_CODE_QUIT); + Intent intent = new Intent(ctx, ContainerActivity.class); + intent.putExtras(bundle); + + final IDispatcherCallback curCallback = callback; + Matrix.invokeActivity(ctx, intent, new IDispatcherCallback() { + @Override + public void onFinished(String data) { + if (null == data) { + mAuthCode = ""; + mLogined = false; + } + curCallback.onFinished(data); + } + }); + } + + public static boolean isLogined() { + return mLogined; + } + + public static String getAuthCode() { + return mAuthCode; + } +} diff --git a/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/UserQH360.java b/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/UserQH360.java index ca4870d739..84308e9fd6 100644 --- a/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/UserQH360.java +++ b/plugin/plugins/qh360/proj.android/src/org/cocos2dx/plugin/UserQH360.java @@ -25,20 +25,9 @@ package org.cocos2dx.plugin; import java.util.Hashtable; -import org.json.JSONObject; - -import com.qihoopay.insdk.activity.ContainerActivity; -import com.qihoopay.insdk.matrix.Matrix; import com.qihoopay.sdk.protocols.IDispatcherCallback; -import com.qihoopay.sdk.protocols.ProtocolConfigs; -import com.qihoopay.sdk.protocols.ProtocolKeys; - -import android.app.Activity; import android.content.Context; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; -import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; public class UserQH360 implements InterfaceUser { @@ -46,8 +35,6 @@ public class UserQH360 implements InterfaceUser { private static Context mContext = null; protected static String TAG = "UserQH360"; private static InterfaceUser mAdapter = null; - private String mAuthCode = ""; - private boolean mLogined = false; protected static void LogE(String msg, Exception e) { Log.e(TAG, msg, e); @@ -66,14 +53,9 @@ public class UserQH360 implements InterfaceUser { mAdapter = this; PluginWrapper.runOnMainThread(new Runnable() { - @Override public void run() { - Matrix.init((Activity) mContext, UserQH360.isLandscape(), new IDispatcherCallback() { - @Override - public void onFinished(String data) { - } - }); + QH360Wrapper.initSDK(mContext); } }); } @@ -90,49 +72,21 @@ public class UserQH360 implements InterfaceUser { return; } - // clear the auth code before - mAuthCode = ""; PluginWrapper.runOnMainThread(new Runnable() { @Override public void run() { - Bundle bundle = new Bundle(); - bundle.putBoolean(ProtocolKeys.IS_SCREEN_ORIENTATION_LANDSCAPE, isLandscape()); - bundle.putBoolean(ProtocolKeys.IS_LOGIN_BG_TRANSPARENT, true); - bundle.putString(ProtocolKeys.RESPONSE_TYPE, "code"); - bundle.putInt(ProtocolKeys.FUNCTION_CODE, ProtocolConfigs.FUNC_CODE_LOGIN); - Intent intent = new Intent(mContext, ContainerActivity.class); - intent.putExtras(bundle); - Matrix.invokeActivity(mContext, intent, new IDispatcherCallback() { + QH360Wrapper.userLogin(mContext, new IDispatcherCallback() { @Override public void onFinished(String data) { LogD("Login callback data is " + data); if (null == data) { UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, "User Canceled"); - return; - } - - try { - JSONObject json = new JSONObject(data); - int errCode = json.optInt("error_code"); - switch (errCode) { - case 0: - { - mLogined = true; - JSONObject content = json.optJSONObject("content"); - mAuthCode = content.optString("code"); - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_SUCCEED, "Login Succeed"); - } - break; - default: - mLogined = false; - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, "Login Failed"); - break; - } - } catch (Exception e) { - mLogined = false; - e.printStackTrace(); - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, "Unknow Error"); + } else + if (TextUtils.isEmpty(data)) { + UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_SUCCEED, "Login Succeed"); + } else { + UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, data); } } }); @@ -150,18 +104,11 @@ public class UserQH360 implements InterfaceUser { PluginWrapper.runOnMainThread(new Runnable() { @Override public void run() { - Bundle bundle = new Bundle(); - bundle.putBoolean(ProtocolKeys.IS_SCREEN_ORIENTATION_LANDSCAPE, isLandscape()); - bundle.putInt(ProtocolKeys.FUNCTION_CODE, ProtocolConfigs.FUNC_CODE_QUIT); - Intent intent = new Intent(mContext, ContainerActivity.class); - intent.putExtras(bundle); - Matrix.invokeActivity(mContext, intent, new IDispatcherCallback() { + QH360Wrapper.userLogout(mContext, new IDispatcherCallback() { @Override public void onFinished(String data) { LogD("Logout callback data is " + data); if (null == data) { - mAuthCode = ""; - mLogined = false; UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGOUT_SUCCEED, "User Logout"); } } @@ -172,13 +119,13 @@ public class UserQH360 implements InterfaceUser { @Override public boolean isLogined() { - return mLogined; + return QH360Wrapper.isLogined(); } @Override public String getSessionID() { - LogD("getSessionID() " + mAuthCode); - return mAuthCode; + LogD("getSessionID() " + QH360Wrapper.getAuthCode()); + return QH360Wrapper.getAuthCode(); } @Override @@ -193,20 +140,6 @@ public class UserQH360 implements InterfaceUser { @Override public String getSDKVersion() { - return "0.7.6"; - } - - private static boolean isLandscape() - { - Configuration config = mContext.getResources().getConfiguration(); - int orientation = config.orientation; - - if (orientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || - orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) - { - orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; - } - - return (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + return QH360Wrapper.getSDKVersion(); } } diff --git a/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/IAPOnlineUC.java b/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/IAPOnlineUC.java new file mode 100644 index 0000000000..13e9c855f8 --- /dev/null +++ b/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/IAPOnlineUC.java @@ -0,0 +1,181 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +package org.cocos2dx.plugin; + +import java.util.Hashtable; + +import cn.uc.gamesdk.UCCallbackListener; +import cn.uc.gamesdk.UCGameSDK; +import cn.uc.gamesdk.UCGameSDKStatusCode; +import cn.uc.gamesdk.info.OrderInfo; +import cn.uc.gamesdk.info.PaymentInfo; +import android.app.Activity; +import android.content.Context; +import android.text.TextUtils; +import android.util.Log; + +public class IAPOnlineUC implements InterfaceIAP { + + private static final String LOG_TAG = "IAPOnlineUC"; + private static Activity mContext = null; + private static IAPOnlineUC mAdapter = null; + private static boolean bDebug = false; + + protected static void LogE(String msg, Exception e) { + Log.e(LOG_TAG, msg, e); + e.printStackTrace(); + } + + protected static void LogD(String msg) { + if (bDebug) { + Log.d(LOG_TAG, msg); + } + } + + public IAPOnlineUC(Context context) { + mContext = (Activity) context; + mAdapter = this; + } + + @Override + public void configDeveloperInfo(Hashtable cpInfo) { + final Hashtable curInfo = cpInfo; + PluginWrapper.runOnMainThread(new Runnable() { + @Override + public void run() { + UCWrapper.initSDK(mContext, curInfo, bDebug, null); + } + }); + } + + @Override + public void payForProduct(Hashtable info) { + LogD("payForProduct invoked " + info.toString()); + final Hashtable curInfo = info; + PluginWrapper.runOnMainThread(new Runnable() { + @Override + public void run() { + if (UCWrapper.isLogined()) { + addPayment(curInfo); + } else { + UCWrapper.userLogin(mContext, new UCCallbackListener() { + @Override + public void callback(int code, String msg) { + switch(code) { + case UCGameSDKStatusCode.SUCCESS: + addPayment(curInfo); + break; + default: + payResult(IAPWrapper.PAYRESULT_FAIL, msg); + break; + } + } + }); + } + } + }); + } + + @Override + public void setDebugMode(boolean debug) { + bDebug = debug; + } + + @Override + public String getSDKVersion() { + return UCWrapper.getSDKVersion(); + } + + private static void payResult(int ret, String msg) { + IAPWrapper.onPayResult(mAdapter, ret, msg); + LogD("IAPOnlineUC result : " + ret + " msg : " + msg); + } + + @Override + public String getPluginVersion() { + return "0.2.0"; + } + + private static boolean paying = false; + private void addPayment(Hashtable curInfo) { + try { + paying = true; + PaymentInfo payInfo = new PaymentInfo(); + + String customInfo = curInfo.get("UCCustomInfo"); + if (null != customInfo && ! TextUtils.isEmpty(customInfo)) { + payInfo.setCustomInfo(customInfo); + } + + String strServerID = curInfo.get("UCServerID"); + if (null != strServerID && ! TextUtils.isEmpty(strServerID)) { + int serverID = Integer.parseInt(strServerID); + payInfo.setServerId(serverID); + } + + String roleID = curInfo.get("UCRoleID"); + if (null != roleID && ! TextUtils.isEmpty(roleID)) { + payInfo.setRoleId(roleID); + } + + String strRoleName = curInfo.get("UCRoleName"); + if (null != strRoleName && ! TextUtils.isEmpty(strRoleName)) { + payInfo.setRoleName(strRoleName); + } + + String strRoleLevel = curInfo.get("UCRoleLevel"); + if (null != strRoleLevel && ! TextUtils.isEmpty(strRoleLevel)) { + payInfo.setGrade(strRoleLevel); + } + + String strPrice = curInfo.get("productPrice"); + float fPrice = Float.parseFloat(strPrice); + payInfo.setAmount(fPrice); + + UCGameSDK.defaultSDK().pay(mContext, payInfo, new UCCallbackListener(){ + @Override + public void callback(int arg0, OrderInfo arg1) { + if (! paying) { + return; + } + + switch (arg0) { + case UCGameSDKStatusCode.SUCCESS: + IAPOnlineUC.payResult(IAPWrapper.PAYRESULT_SUCCESS, "Pay Succeed"); + break; + default: + IAPOnlineUC.payResult(IAPWrapper.PAYRESULT_FAIL, "Unknown Error"); + break; + } + + paying = false; + } + }); + } catch (Exception e) { + paying = false; + IAPOnlineUC.payResult(IAPWrapper.PAYRESULT_FAIL, "Unknown Error"); + LogE("Unknown Error", e); + } + } +} diff --git a/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UCWrapper.java b/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UCWrapper.java new file mode 100644 index 0000000000..fc2bfcd9c5 --- /dev/null +++ b/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UCWrapper.java @@ -0,0 +1,169 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +package org.cocos2dx.plugin; + +import java.util.Hashtable; + +import cn.uc.gamesdk.UCCallbackListener; +import cn.uc.gamesdk.UCGameSDK; +import cn.uc.gamesdk.UCGameSDKStatusCode; +import cn.uc.gamesdk.UCLogLevel; +import cn.uc.gamesdk.UCOrientation; +import cn.uc.gamesdk.info.GameParamInfo; +import android.content.Context; +import android.content.pm.ActivityInfo; +import android.content.res.Configuration; + +public class UCWrapper { + + private static boolean isInited = false; + + public static void initSDK(Context ctx, Hashtable cpInfo, boolean isDebug, UCCallbackListener listener) { + if (isInited) { + return; + } + + try { + final UCCallbackListener curListener = listener; + UCGameSDK.defaultSDK().setLogoutNotifyListener(new UCCallbackListener() { + @Override + public void callback(int statuscode, String data) { + switch (statuscode) { + case UCGameSDKStatusCode.SUCCESS: + mLogined = false; + break; + default: + break; + } + + if (null != curListener) { + curListener.callback(statuscode, data); + } + } + }); + + String strCpId = cpInfo.get("UCCpID"); + String strGameId = cpInfo.get("UCGameID"); + String strServerId = cpInfo.get("UCServerID"); + + int cpId = Integer.parseInt(strCpId); + int gameId = Integer.parseInt(strGameId); + int serverId = Integer.parseInt(strServerId); + + GameParamInfo gpi = new GameParamInfo(); + gpi.setCpId(cpId); + gpi.setGameId(gameId); + gpi.setServerId(serverId); + + if (isLandscape(ctx)) { + UCGameSDK.defaultSDK().setOrientation(UCOrientation.LANDSCAPE); + } + + UCGameSDK.defaultSDK().initSDK(ctx, UCLogLevel.ERROR, isDebug, gpi, new UCCallbackListener() { + @Override + public void callback(int code, String msg) { + System.out.println("msg:" + msg); + switch (code) { + case UCGameSDKStatusCode.SUCCESS: + isInited = true; + break; + case UCGameSDKStatusCode.INIT_FAIL: + default: + isInited = false; + break; + } + } + }); + } catch (Exception e) { + isInited = false; + } + } + + public static boolean SDKInited() { + return isInited; + } + + public static boolean isLandscape(Context ctx) + { + Configuration config = ctx.getResources().getConfiguration(); + int orientation = config.orientation; + + if (orientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || + orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + { + orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; + } + + return (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + } + + public static String getSDKVersion() { + return "2.3.4"; + } + + private static boolean mLogined = false; + private static boolean waitHandle = false; + public static void userLogin(Context ctx, UCCallbackListener listener) { + try { + waitHandle = true; + final UCCallbackListener curListener = listener; + UCGameSDK.defaultSDK().login(ctx, new UCCallbackListener() { + @Override + public void callback(int code, String msg) { + if (! waitHandle) { + return; + } + + switch(code) { + case UCGameSDKStatusCode.SUCCESS: + mLogined = true; + break; + default: + mLogined = false; + break; + } + waitHandle = false; + curListener.callback(code, msg); + } + }); + } catch (Exception e) { + mLogined = false; + waitHandle = false; + listener.callback(UCGameSDKStatusCode.FAIL, "Login Failed"); + } + } + + public static void userLogout() { + try { + UCGameSDK.defaultSDK().logout(); + mLogined = false; + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static boolean isLogined() { + return mLogined; + } +} diff --git a/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UserUC.java b/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UserUC.java index ae149565d5..2febf85c2e 100644 --- a/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UserUC.java +++ b/plugin/plugins/uc/proj.android/src/org/cocos2dx/plugin/UserUC.java @@ -28,13 +28,7 @@ import java.util.Hashtable; import cn.uc.gamesdk.UCCallbackListener; import cn.uc.gamesdk.UCGameSDK; import cn.uc.gamesdk.UCGameSDKStatusCode; -import cn.uc.gamesdk.UCLogLevel; -import cn.uc.gamesdk.UCOrientation; -import cn.uc.gamesdk.info.GameParamInfo; - import android.content.Context; -import android.content.pm.ActivityInfo; -import android.content.res.Configuration; import android.util.Log; public class UserUC implements InterfaceUser { @@ -42,7 +36,6 @@ public class UserUC implements InterfaceUser { private static Context mContext = null; protected static String TAG = "UserUC"; private static InterfaceUser mAdapter = null; - private boolean mLogined = false; protected static void LogE(String msg, Exception e) { Log.e(TAG, msg, e); @@ -50,7 +43,6 @@ public class UserUC implements InterfaceUser { } private static boolean isDebug = false; - private boolean isInited = false; protected static void LogD(String msg) { if (isDebug) { Log.d(TAG, msg); @@ -68,64 +60,25 @@ public class UserUC implements InterfaceUser { PluginWrapper.runOnMainThread(new Runnable() { @Override public void run() { - try { - String strCpId = curInfo.get("UCCpId"); - String strGameId = curInfo.get("UCGameId"); - String strServerId = curInfo.get("UCServerId"); - - int cpId = Integer.parseInt(strCpId); - int gameId = Integer.parseInt(strGameId); - int serverId = Integer.parseInt(strServerId); - GameParamInfo gpi = new GameParamInfo(); - gpi.setCpId(cpId); - gpi.setGameId(gameId); - gpi.setServerId(serverId); - - UCGameSDK.defaultSDK().setLogoutNotifyListener(new UCCallbackListener() { - @Override - public void callback(int statuscode, String data) { - switch (statuscode) { - case UCGameSDKStatusCode.SUCCESS: - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGOUT_SUCCEED, "User Logout!"); - mLogined = false; - break; - default: - break; - } + UCWrapper.initSDK(mContext, curInfo, isDebug, new UCCallbackListener() { + @Override + public void callback(int statuscode, String data) { + switch (statuscode) { + case UCGameSDKStatusCode.SUCCESS: + UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGOUT_SUCCEED, "User Logout!"); + break; + default: + break; } - }); - - if (isLandscape()) { - UCGameSDK.defaultSDK().setOrientation(UCOrientation.LANDSCAPE); } - - UCGameSDK.defaultSDK().initSDK(mContext, UCLogLevel.ERROR, isDebug, gpi, new UCCallbackListener() { - @Override - public void callback(int code, String msg) { - System.out.println("msg:" + msg); - switch (code) { - case UCGameSDKStatusCode.SUCCESS: - isInited = true; - break; - case UCGameSDKStatusCode.INIT_FAIL: - default: - isInited = false; - break; - } - } - }); - } catch(Exception e) { - isInited = false; - LogE("Init SDK failed", e); - } + }); } }); } - private static boolean waitHandle = true; @Override public void login() { - if (! isInited) { + if (! UCWrapper.SDKInited()) { UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, "SDK init failed"); return; } @@ -138,35 +91,19 @@ public class UserUC implements InterfaceUser { PluginWrapper.runOnMainThread(new Runnable() { @Override public void run() { - try { - waitHandle = true; - UCGameSDK.defaultSDK().login(mContext, new UCCallbackListener() { - @Override - public void callback(int code, String msg) { - LogD("login ret : " + code + " , msg : " + msg); - if (! waitHandle) { - return; - } - - switch(code) { - case UCGameSDKStatusCode.SUCCESS: - mLogined = true; - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_SUCCEED, msg); - break; - default: - mLogined = false; - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, msg); - break; - } - - waitHandle = false; + UCWrapper.userLogin(mContext, new UCCallbackListener() { + @Override + public void callback(int code, String msg) { + switch(code) { + case UCGameSDKStatusCode.SUCCESS: + UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_SUCCEED, msg); + break; + default: + UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, msg); + break; } - }); - } catch (Exception e) { - mLogined = false; - LogE("Login failed", e); - UserWrapper.onActionResult(mAdapter, UserWrapper.ACTION_RET_LOGIN_FAILED, "Login Failed!"); - } + } + }); } }); } @@ -181,18 +118,14 @@ public class UserUC implements InterfaceUser { PluginWrapper.runOnMainThread(new Runnable() { @Override public void run() { - try { - UCGameSDK.defaultSDK().logout(); - } catch (Exception e) { - LogE("User logout failed", e); - } + UCWrapper.userLogout(); } }); } @Override public boolean isLogined() { - return mLogined; + return UCWrapper.isLogined(); } @Override @@ -213,20 +146,6 @@ public class UserUC implements InterfaceUser { @Override public String getSDKVersion() { - return "2.3.4"; - } - - private static boolean isLandscape() - { - Configuration config = mContext.getResources().getConfiguration(); - int orientation = config.orientation; - - if (orientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || - orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) - { - orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; - } - - return (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + return UCWrapper.getSDKVersion(); } } diff --git a/plugin/samples/HelloPlugins/Classes/Configs.h b/plugin/samples/HelloPlugins/Classes/Configs.h new file mode 100644 index 0000000000..932428be14 --- /dev/null +++ b/plugin/samples/HelloPlugins/Classes/Configs.h @@ -0,0 +1,11 @@ +#ifndef __CONFIGS_H__ +#define __CONFIGS_H__ + +/** @warning + * The file UCGameSDK.jar conflicts with weiboSDK.jar + * if you want test the login/logout of UC, + * modify the android project config: remove the weiboSDK.jar, and add UCGameSDK.jar +*/ +#define TEST_UC 0 + +#endif // __CONFIGS_H__ diff --git a/plugin/samples/HelloPlugins/Classes/HelloWorldScene.cpp b/plugin/samples/HelloPlugins/Classes/HelloWorldScene.cpp index f698bbe745..15ac81d23f 100644 --- a/plugin/samples/HelloPlugins/Classes/HelloWorldScene.cpp +++ b/plugin/samples/HelloPlugins/Classes/HelloWorldScene.cpp @@ -3,6 +3,7 @@ #include "TestAnalyticsScene.h" #include "TestShareScene.h" #include "TestIAPScene.h" +#include "TestIAPOnlineScene.h" #include "TestUserScene.h" USING_NS_CC; @@ -13,6 +14,7 @@ std::string g_testCases[] = { "Test Share", #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) "Test IAP", + "Test IAP Online", "Test User", #endif }; @@ -94,6 +96,9 @@ void HelloWorld::menuCallback(Object* pSender) newScene = TestIAP::scene(); break; case 4: + newScene = TestIAPOnline::scene(); + break; + case 5: newScene = TestUser::scene(); break; default: diff --git a/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp new file mode 100644 index 0000000000..0d631924a8 --- /dev/null +++ b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp @@ -0,0 +1,175 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +#include "MyIAPOLManager.h" +#include "PluginManager.h" +#include "cocos2d.h" + +using namespace cocos2d::plugin; +using namespace cocos2d; + +MyIAPOLManager* MyIAPOLManager::s_pIAPOnline = NULL; + +MyIAPOLManager::MyIAPOLManager() +: s_pQH360(NULL) +, s_pRetListener(NULL) +, s_pNd91(NULL) +, s_pUC(NULL) +{ + +} + +MyIAPOLManager::~MyIAPOLManager() +{ + unloadPlugins(); + if (s_pRetListener) + { + delete s_pRetListener; + s_pRetListener = NULL; + } +} + +MyIAPOLManager* MyIAPOLManager::sharedManager() +{ + if (s_pIAPOnline == NULL) { + s_pIAPOnline = new MyIAPOLManager(); + } + return s_pIAPOnline; +} + +void MyIAPOLManager::purge() +{ + if (s_pIAPOnline) + { + delete s_pIAPOnline; + s_pIAPOnline = NULL; + } + PluginManager::end(); +} + +void MyIAPOLManager::loadPlugins() +{ + if (s_pRetListener == NULL) + { + s_pRetListener = new MyIAPOnlineResult(); + } + + { + // init qh360 plugin + s_pQH360 = dynamic_cast(PluginManager::getInstance()->loadPlugin("IAPOnlineQH360")); + TIAPDeveloperInfo pQH360Info; + pQH360Info["QHAppName"] = "HelloPlugins"; + pQH360Info["QHExchangeRate"] = "1"; + + s_pQH360->setDebugMode(true); + s_pQH360->configDeveloperInfo(pQH360Info); + s_pQH360->setResultListener(s_pRetListener); + } + + { + TIAPDeveloperInfo pNdInfo; + pNdInfo["Nd91AppId"] = "100010"; + pNdInfo["Nd91AppKey"] = "C28454605B9312157C2F76F27A9BCA2349434E546A6E9C75"; + pNdInfo["Nd91Orientation"] = "landscape"; + s_pNd91 = dynamic_cast(PluginManager::getInstance()->loadPlugin("IAPOnlineNd91")); + s_pNd91->setDebugMode(true); + s_pNd91->configDeveloperInfo(pNdInfo); + s_pNd91->setResultListener(s_pRetListener); + } + +#if TEST_UC + { + s_pUC = dynamic_cast(PluginManager::getInstance()->loadPlugin("IAPOnlineUC")); + if (NULL != s_pUC) + { + TIAPDeveloperInfo pUCInfo; + pUCInfo["UCCpID"] = "20087"; + pUCInfo["UCGameID"] = "119474"; + pUCInfo["UCServerID"] = "1333"; + s_pUC->setDebugMode(true); + s_pUC->configDeveloperInfo(pUCInfo); + s_pUC->setResultListener(s_pRetListener); + } + } +#endif +} + +void MyIAPOLManager::unloadPlugins() +{ + if (s_pQH360) + { + PluginManager::getInstance()->unloadPlugin("IAPOnlineQH360"); + s_pQH360 = NULL; + } + + if (s_pNd91) + { + PluginManager::getInstance()->unloadPlugin("IAPOnlineNd91"); + s_pNd91 = NULL; + } + + if (s_pUC) + { + PluginManager::getInstance()->unloadPlugin("IAPOnlineUC"); + s_pUC = NULL; + } +} + +void MyIAPOLManager::payByMode(TProductInfo info, MyPayMode mode) +{ + ProtocolIAP* pIAP = NULL; + switch(mode) + { + case eQH360: + pIAP = s_pQH360; + break; + case eND91: + pIAP = s_pNd91; + break; +#if TEST_UC + case eUC: + pIAP = s_pUC; + break; +#endif + default: + break; + } + + if (pIAP) { + pIAP->payForProduct(info); + } +} + +void MyIAPOnlineResult::onPayResult(PayResultCode ret, const char* msg, TProductInfo info) +{ + char goodInfo[1024] = { 0 }; + sprintf(goodInfo, "商品名称:%s\n商品价格:%s\n商品描述:%s", + info.find("productName")->second.c_str(), + info.find("productPrice")->second.c_str(), + info.find("productDesc")->second.c_str()); + MessageBox(goodInfo , msg); + + if (ret == kPaySuccess) { + CCLog("Pay success locally, should check the real result by game server!"); + } +} diff --git a/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.h b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.h new file mode 100644 index 0000000000..b508cef1cf --- /dev/null +++ b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.h @@ -0,0 +1,67 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +#ifndef __MY_IAPOL_MANAGER_H__ +#define __MY_IAPOL_MANAGER_H__ + +#include "ProtocolIAP.h" +#include "Configs.h" + +class MyIAPOnlineResult : public cocos2d::plugin::PayResultListener +{ +public: + virtual void onPayResult(cocos2d::plugin::PayResultCode ret, const char* msg, cocos2d::plugin::TProductInfo info); +}; + +class MyIAPOLManager +{ +public: + static MyIAPOLManager* sharedManager(); + static void purge(); + + typedef enum { + eNoneMode = 0, + eQH360, + eND91, +#if TEST_UC + eUC, +#endif + } MyPayMode; + + void unloadPlugins(); + void loadPlugins(); + void payByMode(cocos2d::plugin::TProductInfo info, MyPayMode mode); + +private: + MyIAPOLManager(); + virtual ~MyIAPOLManager(); + + static MyIAPOLManager* s_pIAPOnline; + + cocos2d::plugin::ProtocolIAP* s_pQH360; + cocos2d::plugin::ProtocolIAP* s_pNd91; + cocos2d::plugin::ProtocolIAP* s_pUC; + MyIAPOnlineResult* s_pRetListener; +}; + +#endif // __MY_IAPOL_MANAGER_H__ diff --git a/plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.cpp b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.cpp new file mode 100644 index 0000000000..9f995134a2 --- /dev/null +++ b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.cpp @@ -0,0 +1,165 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +#include "TestIAPOnlineScene.h" +#include "PluginManager.h" +#include "AppDelegate.h" +#include "MyIAPOLManager.h" +#include "HelloWorldScene.h" + +using namespace cocos2d; +using namespace cocos2d::plugin; + +enum { + TAG_PAY_BY_QH360 = 100, + TAG_PAY_BY_ND91, + TAG_PAY_BY_UC, +}; + +typedef struct tagEventMenuItem { + std::string id; + int tag; +}EventMenuItem; + +static EventMenuItem s_EventMenuItem[] = { + {"BtnQH360.png", TAG_PAY_BY_QH360}, + {"BtnND91.png", TAG_PAY_BY_ND91}, +#if TEST_UC + {"BtnUC.png", TAG_PAY_BY_UC}, +#endif +}; + +Scene* TestIAPOnline::scene() +{ + // 'scene' is an autorelease object + Scene *scene = Scene::create(); + + // 'layer' is an autorelease object + TestIAPOnline *layer = TestIAPOnline::create(); + + // add layer as a child to scene + scene->addChild(layer); + + // return the scene + return scene; +} + +// on "init" you need to initialize your instance +bool TestIAPOnline::init() +{ + ////////////////////////////// + // 1. super init first + if ( !Layer::init() ) + { + return false; + } + + MyIAPOLManager::sharedManager()->loadPlugins(); + + ///////////////////////////// + // 2. add a menu item with "X" image, which is clicked to quit the program + // you may modify it. + + EGLView* pEGLView = EGLView::sharedOpenGLView(); + Point posBR = ccp(pEGLView->getVisibleOrigin().x + pEGLView->getVisibleSize().width, pEGLView->getVisibleOrigin().y); + Point posTL = ccp(pEGLView->getVisibleOrigin().x, pEGLView->getVisibleOrigin().y + pEGLView->getVisibleSize().height); + + // add a "close" icon to exit the progress. it's an autorelease object + MenuItemFont *pBackItem = MenuItemFont::create("Back", CC_CALLBACK_1(TestIAPOnline::menuBackCallback, this)); + Size backSize = pBackItem->getContentSize(); + pBackItem->setPosition(ccpAdd(posBR, ccp(- backSize.width / 2, backSize.height / 2))); + + // create menu, it's an autorelease object + Menu* pMenu = Menu::create(pBackItem, NULL); + pMenu->setPosition( PointZero ); + this->addChild(pMenu, 1); + + Point posStep = ccp(220, -150); + Point beginPos = ccpAdd(posTL, ccpMult(posStep, 0.5f)); + int line = 0; + int row = 0; + for (int i = 0; i < sizeof(s_EventMenuItem)/sizeof(s_EventMenuItem[0]); i++) { + MenuItemImage* pMenuItem = MenuItemImage::create(s_EventMenuItem[i].id.c_str(), s_EventMenuItem[i].id.c_str(), + CC_CALLBACK_1(TestIAPOnline::eventMenuCallback, this)); + pMenu->addChild(pMenuItem, 0, s_EventMenuItem[i].tag); + + Point pos = ccpAdd(beginPos, ccp(posStep.x * row, posStep.y * line)); + Size itemSize = pMenuItem->getContentSize(); + if ((pos.x + itemSize.width / 2) > posBR.x) + { + line += 1; + row = 0; + pos = ccpAdd(beginPos, ccp(posStep.x * row, posStep.y * line)); + } + row += 1; + pMenuItem->setPosition(pos); + } + + return true; +} + +void TestIAPOnline::eventMenuCallback(Object* pSender) +{ + MenuItemLabel* pMenuItem = (MenuItemLabel*)pSender; + MyIAPOLManager::MyPayMode mode = (MyIAPOLManager::MyPayMode) (pMenuItem->getTag() - TAG_PAY_BY_QH360 + 1); + + TProductInfo pInfo; + pInfo["productName"] = "100金币"; + pInfo["productPrice"] = "0.01"; + pInfo["productDesc"] = "100个金灿灿的游戏币哦"; + pInfo["Nd91ProductId"] = "685994"; + + if (mode == MyIAPOLManager::eQH360) { + CCLog("To test the IAP online in plugin qh360, you should do this:"); + CCLog("1. Login by UserQH360"); + CCLog("2. Get QH360 user info by your game server (userID, AccessToken)"); + CCLog("3. Fill the product info"); + + /** + * @warning ProductInfo you need filled + */ + // pInfo["QHAccessToken"] = "User Access Token"; // The access token of user (Get from game server) + // pInfo["QHUserId"] = "User ID on QH360 server"; // The user ID on QH360 server (Get from game server) + // pInfo["QHProductID"] = "Product ID"; // The product ID (Game defined this) + // pInfo["QHNotifyUri"] = "Notify uri"; // The uri which will receive the pay result + // pInfo["QHUserName"] = "User name in game"; // The user name in game + // pInfo["QHAppUserID"] = "User ID on game server"; // The user ID on game server + + /** + * Optional data + */ + // pInfo["QHExtra1"] = "Extra data 1"; // The extra data will be passed to game server + // pInfo["QHExtra2"] = "Extra data 2"; // The extra data will be passed to game server + // pInfo["QHAppOrderID"] = "Order ID in game"; // The order ID in game (Game defined this) + } + + MyIAPOLManager::sharedManager()->payByMode(pInfo, mode); +} + +void TestIAPOnline::menuBackCallback(Object* pSender) +{ + MyIAPOLManager::purge(); + + Scene* newScene = HelloWorld::scene(); + Director::sharedDirector()->replaceScene(newScene); +} diff --git a/plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.h b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.h new file mode 100644 index 0000000000..c0086f4fb4 --- /dev/null +++ b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/TestIAPOnlineScene.h @@ -0,0 +1,46 @@ +/**************************************************************************** +Copyright (c) 2012-2013 cocos2d-x.org + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ +#ifndef __TEST_IAP_ONLINE_SCENE_H__ +#define __TEST_IAP_ONLINE_SCENE_H__ + +#include "cocos2d.h" + +class TestIAPOnline : public cocos2d::Layer +{ +public: + // Here's a difference. Method 'init' in cocos2d-x returns bool, instead of returning 'id' in cocos2d-iphone + virtual bool init(); + + // there's no 'id' in cpp, so we recommand to return the exactly class pointer + static cocos2d::Scene* scene(); + + // a selector callback + void menuBackCallback(Object* pSender); + void eventMenuCallback(Object* pSender); + + // implement the "static node()" method manually + CREATE_FUNC(TestIAPOnline); +}; + +#endif // __TEST_IAP_ONLINE_SCENE_H__ diff --git a/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp b/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp index 2c76144d64..d0f5e653ec 100644 --- a/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp +++ b/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp @@ -109,9 +109,9 @@ void MyUserManager::loadPlugin() if (NULL != _uc) { TUserDeveloperInfo pUCInfo; - pUCInfo["UCCpId"] = "20087"; - pUCInfo["UCGameId"] = "119474"; - pUCInfo["UCServerId"] = "1333"; + pUCInfo["UCCpID"] = "20087"; + pUCInfo["UCGameID"] = "119474"; + pUCInfo["UCServerID"] = "1333"; if (pUCInfo.empty()) { char msg[256] = { 0 }; sprintf(msg, "Developer info is empty. PLZ fill your UC info in %s(nearby line %d)", __FILE__, __LINE__); diff --git a/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.h b/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.h index a05bd23eff..721367661d 100755 --- a/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.h +++ b/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.h @@ -25,13 +25,7 @@ THE SOFTWARE. #define __MY_USER_MANAGER_H__ #include "ProtocolUser.h" - -/** @warning - * The file UCGameSDK.jar conflicts with weiboSDK.jar - * if you want test the login/logout of UC, - * modify the android project config: remove the weiboSDK.jar, and add UCGameSDK.jar -*/ -#define TEST_UC 0 +#include "Configs.h" class MyUserActionResult : public cocos2d::plugin::UserActionListener { diff --git a/plugin/samples/HelloPlugins/proj.android/AndroidManifest.xml b/plugin/samples/HelloPlugins/proj.android/AndroidManifest.xml index 4c2a828f40..dfd7dcb2e6 100644 --- a/plugin/samples/HelloPlugins/proj.android/AndroidManifest.xml +++ b/plugin/samples/HelloPlugins/proj.android/AndroidManifest.xml @@ -32,10 +32,10 @@ - - - - + + + + Date: Fri, 5 Jul 2013 10:52:46 +0800 Subject: [PATCH 05/20] issue #2371: Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder. --- cocos2dx/{proj.ios => }/cocos2dx-Prefix.pch | 0 .../cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id | 1 - cocos2dx/proj.mac/cocos2dx-Prefix.pch | 7 ------- .../cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id | 1 - 4 files changed, 9 deletions(-) rename cocos2dx/{proj.ios => }/cocos2dx-Prefix.pch (100%) delete mode 100644 cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id delete mode 100644 cocos2dx/proj.mac/cocos2dx-Prefix.pch delete mode 100644 cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id diff --git a/cocos2dx/proj.ios/cocos2dx-Prefix.pch b/cocos2dx/cocos2dx-Prefix.pch similarity index 100% rename from cocos2dx/proj.ios/cocos2dx-Prefix.pch rename to cocos2dx/cocos2dx-Prefix.pch diff --git a/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index d9e6ced132..0000000000 --- a/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -a44aca2820580a568d0cb92fb573086e1096d5e1 \ No newline at end of file diff --git a/cocos2dx/proj.mac/cocos2dx-Prefix.pch b/cocos2dx/proj.mac/cocos2dx-Prefix.pch deleted file mode 100644 index fec5647078..0000000000 --- a/cocos2dx/proj.mac/cocos2dx-Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'cocos2dx' target in the 'cocos2dx' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id deleted file mode 100644 index c674431d3e..0000000000 --- a/cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -1dc917cb6f1a62d8d7536db3c3db9f25562d59b7 \ No newline at end of file From 8f5dba6c44f1e700c25cc69d9d6657df59142a59 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 10:53:16 +0800 Subject: [PATCH 06/20] issue #2371: Using the same prefix header for iOS and Mac. --- cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index cb60732644..da326f8d66 100644 --- a/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -bcd62ba7c28d13abdba85491cb4ca7f70e3ee10b \ No newline at end of file +adc886b11ba99ac25a10739785bb0986e175a1a9 \ No newline at end of file From 2aef49f25103f1026b03200e78772e68b6053fe4 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 5 Jul 2013 11:24:28 +0800 Subject: [PATCH 07/20] issue #2244:Replace the tab with space --- cocos2dx/actions/CCActionInstant.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cocos2dx/actions/CCActionInstant.cpp b/cocos2dx/actions/CCActionInstant.cpp index 4707755e83..91f5d6c021 100644 --- a/cocos2dx/actions/CCActionInstant.cpp +++ b/cocos2dx/actions/CCActionInstant.cpp @@ -502,15 +502,15 @@ CallFunc::~CallFunc(void) } CallFunc * CallFunc::clone() const -{ - // no copy constructor - auto a = new CallFunc(); - if( _selectorTarget) { - a->initWithTarget(_selectorTarget); - a->_callFunc = _callFunc; - } - else if( _function ){ - a->initWithFunction(_function); + { + // no copy constructor + auto a = new CallFunc(); + if( _selectorTarget) { + a->initWithTarget(_selectorTarget); + a->_callFunc = _callFunc; + } + else if( _function ){ + a->initWithFunction(_function); } else if (_scriptHandler > 0 ) { a->_scriptHandler = cocos2d::ScriptEngineManager::sharedManager()->getScriptEngine()->reallocateScriptHandler(_scriptHandler); @@ -626,12 +626,12 @@ void CallFuncN::execute() { else if (_functionN) { _functionN(_target); } - if (0 != _scriptHandler) + if (0 != _scriptHandler) { BasicScriptData data((void*)this,(void*)_target); ScriptEvent event(kCallFuncEvent,(void*)&data); - ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); - } + ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); + } } bool CallFuncN::initWithFunction(const std::function &func) From 9eb31df9f3583ccd9eab61f7e751dda0ecf6af28 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 5 Jul 2013 11:29:21 +0800 Subject: [PATCH 08/20] issue #2244:Replace the tab with space --- cocos2dx/actions/CCActionInstant.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2dx/actions/CCActionInstant.cpp b/cocos2dx/actions/CCActionInstant.cpp index 91f5d6c021..3e4e0257a1 100644 --- a/cocos2dx/actions/CCActionInstant.cpp +++ b/cocos2dx/actions/CCActionInstant.cpp @@ -517,8 +517,8 @@ CallFunc * CallFunc::clone() const } - a->autorelease(); - return a; + a->autorelease(); + return a; } CallFunc * CallFunc::reverse() const From 2bdf55d78db1e5f48e92c0c756c6e5b090b1cda4 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Fri, 5 Jul 2013 11:42:01 +0800 Subject: [PATCH 09/20] Add workspace for iOS projects of plugin-x. --- .../contents.xcworkspacedata | 29 ++ .../HelloPlugins.xcodeproj/project.pbxproj | 276 +++++++++++++++++- 2 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 plugin/plugin-x_ios.xcworkspace/contents.xcworkspacedata diff --git a/plugin/plugin-x_ios.xcworkspace/contents.xcworkspacedata b/plugin/plugin-x_ios.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..27ef1b2828 --- /dev/null +++ b/plugin/plugin-x_ios.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/plugin/samples/HelloPlugins/proj.ios/HelloPlugins.xcodeproj/project.pbxproj b/plugin/samples/HelloPlugins/proj.ios/HelloPlugins.xcodeproj/project.pbxproj index 0863c092ab..5ecb1a8265 100644 --- a/plugin/samples/HelloPlugins/proj.ios/HelloPlugins.xcodeproj/project.pbxproj +++ b/plugin/samples/HelloPlugins/proj.ios/HelloPlugins.xcodeproj/project.pbxproj @@ -31,7 +31,9 @@ D4EF949C15BD2D8E00D803EB /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949B15BD2D8E00D803EB /* Icon-114.png */; }; D4EF949E15BD2D9600D803EB /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949D15BD2D9600D803EB /* Icon-72.png */; }; D4EF94A015BD2D9800D803EB /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949F15BD2D9800D803EB /* Icon-144.png */; }; - FAD554CF177C09B200968F54 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD554CE177C09B200968F54 /* libcocos2dx.a */; }; + FA3D2646178671E4009B234A /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA3D2637178671D1009B234A /* libcocos2dx iOS.a */; }; + FA3D264D17867219009B234A /* MyIAPOLManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA3D264817867219009B234A /* MyIAPOLManager.cpp */; }; + FA3D264E17867219009B234A /* TestIAPOnlineScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA3D264A17867219009B234A /* TestIAPOnlineScene.cpp */; }; FAD554E5177C131500968F54 /* TestAdsScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAD554D1177C131500968F54 /* TestAdsScene.cpp */; }; FAD554E6177C131500968F54 /* TestAnalyticsScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAD554D4177C131500968F54 /* TestAnalyticsScene.cpp */; }; FAD554E9177C131500968F54 /* MyShareManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAD554DC177C131500968F54 /* MyShareManager.cpp */; }; @@ -57,6 +59,114 @@ FAD5552A177D2C2000968F54 /* weibo.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD55526177D2C2000968F54 /* weibo.png */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + FA3D2628178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1551A33F158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + FA3D262A178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2FD617814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + FA3D262C178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2CB81780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + FA3D262E178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2D9B1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + FA3D2630178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F2ED617814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; + FA3D2632178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A03F31FD1781479B006731B9; + remoteInfo = "jsbindings Mac"; + }; + FA3D2634178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A6FB53017854BC300CDF010; + remoteInfo = "luabindings Mac"; + }; + FA3D2636178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4D641783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; + FA3D2638178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4EFC1783867C0073F6A7; + remoteInfo = "cocos2dx-extensions iOS"; + }; + FA3D263A178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F3B178387670073F6A7; + remoteInfo = "chipmunk iOS"; + }; + FA3D263C178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4F9E1783876B0073F6A7; + remoteInfo = "box2d iOS"; + }; + FA3D263E178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A4FB4178387730073F6A7; + remoteInfo = "CocosDenshion iOS"; + }; + FA3D2640178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = A07A5030178387750073F6A7; + remoteInfo = "jsbindings iOS"; + }; + FA3D2642178671D1009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A119791178526AA00D62A44; + remoteInfo = "luabindings iOS"; + }; + FA3D2644178671DC009B234A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "cocos2dx iOS"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1AC3624216D4A1E8000847F2 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = SOURCE_ROOT; }; 1AC3624316D4A1E8000847F2 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = SOURCE_ROOT; }; @@ -89,7 +199,12 @@ D4EF949D15BD2D9600D803EB /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "../proj.ios/Icon-72.png"; sourceTree = ""; }; D4EF949F15BD2D9800D803EB /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-144.png"; path = "../proj.ios/Icon-144.png"; sourceTree = ""; }; D4F9F37B12E54555005CA6D2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; - FAD554CE177C09B200968F54 /* libcocos2dx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libcocos2dx.a; path = "libcocos2dx.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; + FA3D264817867219009B234A /* MyIAPOLManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MyIAPOLManager.cpp; sourceTree = ""; }; + FA3D264917867219009B234A /* MyIAPOLManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyIAPOLManager.h; sourceTree = ""; }; + FA3D264A17867219009B234A /* TestIAPOnlineScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestIAPOnlineScene.cpp; sourceTree = ""; }; + FA3D264B17867219009B234A /* TestIAPOnlineScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestIAPOnlineScene.h; sourceTree = ""; }; + FA3D264C17867219009B234A /* Configs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configs.h; path = ../Classes/Configs.h; sourceTree = ""; }; FAD554D1177C131500968F54 /* TestAdsScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestAdsScene.cpp; sourceTree = ""; }; FAD554D2177C131500968F54 /* TestAdsScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestAdsScene.h; sourceTree = ""; }; FAD554D4177C131500968F54 /* TestAnalyticsScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestAnalyticsScene.cpp; sourceTree = ""; }; @@ -128,6 +243,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FA3D2646178671E4009B234A /* libcocos2dx iOS.a in Frameworks */, FAD55505177C170300968F54 /* AdSupport.framework in Frameworks */, FAD55503177C16FA00968F54 /* StoreKit.framework in Frameworks */, FAD55501177C16F100968F54 /* SystemConfiguration.framework in Frameworks */, @@ -139,7 +255,6 @@ FAD554F6177C16A100968F54 /* libPluginTwitter.a in Frameworks */, FAD554F7177C16A100968F54 /* libPluginUmeng.a in Frameworks */, FAD554F8177C16A100968F54 /* libPluginWeibo.a in Frameworks */, - FAD554CF177C09B200968F54 /* libcocos2dx.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, @@ -174,11 +289,13 @@ 15AA9C4015B7EC450033D6C2 /* Classes */ = { isa = PBXGroup; children = ( + FA3D264717867219009B234A /* TestIAPOnline */, FAD5550E177D1EE900968F54 /* TestIAP */, FAD55513177D1EE900968F54 /* TestUser */, FAD554D0177C131500968F54 /* TestAds */, FAD554D3177C131500968F54 /* TestAnalytics */, FAD554DB177C131500968F54 /* TestShare */, + FA3D264C17867219009B234A /* Configs.h */, 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */, 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */, 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */, @@ -199,6 +316,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */, 15AA9C4015B7EC450033D6C2 /* Classes */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 080E96DDFE201D6D7F000001 /* ios */, @@ -222,7 +340,6 @@ FAD554F0177C16A100968F54 /* libPluginTwitter.a */, FAD554F1177C16A100968F54 /* libPluginUmeng.a */, FAD554F2177C16A100968F54 /* libPluginWeibo.a */, - FAD554CE177C09B200968F54 /* libcocos2dx.a */, BF170DB212928DE900B8313A /* libxml2.dylib */, BF170DB412928DE900B8313A /* libz.dylib */, D44C620F132DFF4E0009C878 /* AudioToolbox.framework */, @@ -258,6 +375,39 @@ path = ../Resources; sourceTree = ""; }; + FA3D2616178671D0009B234A /* Products */ = { + isa = PBXGroup; + children = ( + FA3D2629178671D1009B234A /* libcocos2dx Mac.a */, + FA3D262B178671D1009B234A /* libcocos2dx-extensions Mac.a */, + FA3D262D178671D1009B234A /* libchipmunk Mac.a */, + FA3D262F178671D1009B234A /* libbox2d Mac.a */, + FA3D2631178671D1009B234A /* libCocosDenshion Mac.a */, + FA3D2633178671D1009B234A /* libjsbindings Mac.a */, + FA3D2635178671D1009B234A /* libluabindings Mac.a */, + FA3D2637178671D1009B234A /* libcocos2dx iOS.a */, + FA3D2639178671D1009B234A /* libcocos2dx-extensions iOS.a */, + FA3D263B178671D1009B234A /* libchipmunk iOS.a */, + FA3D263D178671D1009B234A /* libbox2d iOS.a */, + FA3D263F178671D1009B234A /* libCocosDenshion iOS.a */, + FA3D2641178671D1009B234A /* libjsbindings iOS.a */, + FA3D2643178671D1009B234A /* libluabindings iOS.a */, + ); + name = Products; + sourceTree = ""; + }; + FA3D264717867219009B234A /* TestIAPOnline */ = { + isa = PBXGroup; + children = ( + FA3D264817867219009B234A /* MyIAPOLManager.cpp */, + FA3D264917867219009B234A /* MyIAPOLManager.h */, + FA3D264A17867219009B234A /* TestIAPOnlineScene.cpp */, + FA3D264B17867219009B234A /* TestIAPOnlineScene.h */, + ); + name = TestIAPOnline; + path = ../Classes/TestIAPOnline; + sourceTree = ""; + }; FAD554D0177C131500968F54 /* TestAds */ = { isa = PBXGroup; children = ( @@ -328,6 +478,7 @@ buildRules = ( ); dependencies = ( + FA3D2645178671DC009B234A /* PBXTargetDependency */, ); name = HelloPlugins; productName = iphone; @@ -354,6 +505,12 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = FA3D2616178671D0009B234A /* Products */; + ProjectRef = FA3D2615178671D0009B234A /* cocos2d_libs.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 1D6058900D05DD3D006BFB54 /* HelloPlugins */, @@ -361,6 +518,107 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + FA3D2629178671D1009B234A /* libcocos2dx Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx Mac.a"; + remoteRef = FA3D2628178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D262B178671D1009B234A /* libcocos2dx-extensions Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions Mac.a"; + remoteRef = FA3D262A178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D262D178671D1009B234A /* libchipmunk Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk Mac.a"; + remoteRef = FA3D262C178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D262F178671D1009B234A /* libbox2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d Mac.a"; + remoteRef = FA3D262E178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2631178671D1009B234A /* libCocosDenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion Mac.a"; + remoteRef = FA3D2630178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2633178671D1009B234A /* libjsbindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings Mac.a"; + remoteRef = FA3D2632178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2635178671D1009B234A /* libluabindings Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings Mac.a"; + remoteRef = FA3D2634178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2637178671D1009B234A /* libcocos2dx iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx iOS.a"; + remoteRef = FA3D2636178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2639178671D1009B234A /* libcocos2dx-extensions iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2dx-extensions iOS.a"; + remoteRef = FA3D2638178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D263B178671D1009B234A /* libchipmunk iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libchipmunk iOS.a"; + remoteRef = FA3D263A178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D263D178671D1009B234A /* libbox2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libbox2d iOS.a"; + remoteRef = FA3D263C178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D263F178671D1009B234A /* libCocosDenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCocosDenshion iOS.a"; + remoteRef = FA3D263E178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2641178671D1009B234A /* libjsbindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsbindings iOS.a"; + remoteRef = FA3D2640178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + FA3D2643178671D1009B234A /* libluabindings iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluabindings iOS.a"; + remoteRef = FA3D2642178671D1009B234A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 1D60588D0D05DD3D006BFB54 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -402,11 +660,21 @@ FAD55519177D1EE900968F54 /* TestIAPScene.cpp in Sources */, FAD5551A177D1EE900968F54 /* MyUserManager.cpp in Sources */, FAD5551B177D1EE900968F54 /* TestUserScene.cpp in Sources */, + FA3D264D17867219009B234A /* MyIAPOLManager.cpp in Sources */, + FA3D264E17867219009B234A /* TestIAPOnlineScene.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + FA3D2645178671DC009B234A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx iOS"; + targetProxy = FA3D2644178671DC009B234A /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; From 7a61ead59865b140e56c21702ef66802a8d20396 Mon Sep 17 00:00:00 2001 From: "Huabing.Xu" Date: Fri, 5 Jul 2013 11:59:46 +0800 Subject: [PATCH 10/20] issue #2367: Fix Bug "ClippingNodes work different in Android and IOS" --- .../Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp index dc709aaeca..5b3bda69e9 100644 --- a/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp +++ b/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp @@ -663,8 +663,7 @@ void RawStencilBufferTest::setupStencilForClippingOnPlane(GLint plane) void RawStencilBufferTest::setupStencilForDrawingOnPlane(GLint plane) { GLint planeMask = 0x1 << plane; - GLint equalOrLessPlanesMask = planeMask | (planeMask - 1); - glStencilFunc(GL_EQUAL, equalOrLessPlanesMask, equalOrLessPlanesMask); + glStencilFunc(GL_EQUAL, planeMask, planeMask); glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); } From 9d2152b513a40d2796d352a69a8d92baa6130986 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 13:45:37 +0800 Subject: [PATCH 11/20] sudo apt-get update before install new packages --- tools/travis-scripts/before-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/travis-scripts/before-install.sh b/tools/travis-scripts/before-install.sh index 592a0b2ead..d764e0735a 100755 --- a/tools/travis-scripts/before-install.sh +++ b/tools/travis-scripts/before-install.sh @@ -94,6 +94,7 @@ if [ "$GEN_JSB"x = "YES"x ]; then install_android_ndk install_llvm elif [ "$PLATFORM"x = "linux"x ]; then + sudo apt-get update bash $COCOS2DX_ROOT/install-deps-linux.sh elif [ "$PLATFORM"x = "nacl"x ]; then install_nacl_sdk From d2746bbe90968ec967888491b885e3bf2569acc7 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 13:58:59 +0800 Subject: [PATCH 12/20] issue #2373: Removing inline for virtual function. Adding more const getter functions. --- cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- cocos2dx/sprite_nodes/CCSprite.h | 10 +++++----- extensions/CCArmature/CCArmature.h | 4 ++-- extensions/physics_nodes/CCPhysicsSprite.cpp | 2 +- extensions/physics_nodes/CCPhysicsSprite.h | 2 +- .../samples.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index da326f8d66..52227f552a 100644 --- a/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -adc886b11ba99ac25a10739785bb0986e175a1a9 \ No newline at end of file +a99b08b2ffceb676a19dbcca403053c395c80351 \ No newline at end of file diff --git a/cocos2dx/sprite_nodes/CCSprite.h b/cocos2dx/sprite_nodes/CCSprite.h index ba4d98d180..5ea22a3aad 100644 --- a/cocos2dx/sprite_nodes/CCSprite.h +++ b/cocos2dx/sprite_nodes/CCSprite.h @@ -263,8 +263,8 @@ public: /// @name Functions inherited from TextureProtocol virtual void setTexture(Texture2D *texture); virtual Texture2D* getTexture(void); - inline void setBlendFunc(const ccBlendFunc &blendFunc) { _blendFunc = blendFunc; } - inline const ccBlendFunc& getBlendFunc(void) const { return _blendFunc; } + virtual void setBlendFunc(const ccBlendFunc &blendFunc) { _blendFunc = blendFunc; } + virtual const ccBlendFunc& getBlendFunc(void) const { return _blendFunc; } /// @} /// @{ @@ -400,17 +400,17 @@ public: * * @return true if the sprite needs to be updated in the Atlas, false otherwise. */ - inline virtual bool isDirty(void) const { return _dirty; } + virtual bool isDirty(void) const { return _dirty; } /** * Makes the Sprite to be updated in the Atlas. */ - inline virtual void setDirty(bool bDirty) { _dirty = bDirty; } + virtual void setDirty(bool bDirty) { _dirty = bDirty; } /** * Returns the quad (tex coords, vertex coords and color) information. */ - inline ccV3F_C4B_T2F_Quad getQuad(void) { return _quad; } + inline ccV3F_C4B_T2F_Quad getQuad(void) const { return _quad; } /** * Returns whether or not the texture rectangle is rotated. diff --git a/extensions/CCArmature/CCArmature.h b/extensions/CCArmature/CCArmature.h index 71ebcc7006..7d20c60338 100644 --- a/extensions/CCArmature/CCArmature.h +++ b/extensions/CCArmature/CCArmature.h @@ -120,8 +120,8 @@ public: */ virtual void updateOffsetPoint(); - inline void setBlendFunc(const ccBlendFunc& blendFunc) { _blendFunc = blendFunc; } - inline const ccBlendFunc& getBlendFunc(void) const { return _blendFunc; } + virtual void setBlendFunc(const ccBlendFunc& blendFunc) { _blendFunc = blendFunc; } + virtual const ccBlendFunc& getBlendFunc(void) const { return _blendFunc; } protected: diff --git a/extensions/physics_nodes/CCPhysicsSprite.cpp b/extensions/physics_nodes/CCPhysicsSprite.cpp index feba6a3f57..8f96926e23 100644 --- a/extensions/physics_nodes/CCPhysicsSprite.cpp +++ b/extensions/physics_nodes/CCPhysicsSprite.cpp @@ -150,7 +150,7 @@ PhysicsSprite* PhysicsSprite::create(const char *pszFileName, const Rect& rect) // this method will only get called if the sprite is batched. // return YES if the physic's values (angles, position ) changed. // If you return NO, then nodeToParentTransform won't be called. -bool PhysicsSprite::isDirty() +bool PhysicsSprite::isDirty() const { return true; } diff --git a/extensions/physics_nodes/CCPhysicsSprite.h b/extensions/physics_nodes/CCPhysicsSprite.h index 1d11738a20..b0b2664ed0 100644 --- a/extensions/physics_nodes/CCPhysicsSprite.h +++ b/extensions/physics_nodes/CCPhysicsSprite.h @@ -90,7 +90,7 @@ public: */ static PhysicsSprite* create(const char *pszFileName, const Rect& rect); - virtual bool isDirty(); + virtual bool isDirty() const; /** Keep the sprite's rotation separate from the body. */ bool isIgnoreBodyRotation() const; diff --git a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id index 2515353d43..303698521a 100644 --- a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -7dd3951b42436200ea99bfba88c15872e9f62825 \ No newline at end of file +678e714c9c548501d076d34e2af0b13619e0a5aa \ No newline at end of file From ec902c355001461d776846db962e7d20ecdc694a Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 15:06:38 +0800 Subject: [PATCH 13/20] issue #2373: Adding missing overload const getter functions. --- cocos2dx/base_nodes/CCAtlasNode.cpp | 4 +- cocos2dx/base_nodes/CCAtlasNode.h | 4 +- cocos2dx/menu_nodes/CCMenu.h | 2 +- cocos2dx/misc_nodes/CCProgressTimer.cpp | 4 +- cocos2dx/misc_nodes/CCProgressTimer.h | 4 +- .../GUI/CCControlExtension/CCControl.cpp | 2 +- extensions/GUI/CCControlExtension/CCControl.h | 2 +- .../CCControlExtension/CCControlButton.cpp | 4 +- .../GUI/CCControlExtension/CCControlButton.h | 4 +- .../GUI/CCControlExtension/CCScale9Sprite.cpp | 6 +-- .../GUI/CCControlExtension/CCScale9Sprite.h | 6 +-- extensions/physics_nodes/CCPhysicsSprite.cpp | 37 ++++++++++--------- extensions/physics_nodes/CCPhysicsSprite.h | 12 +++--- extensions/spine/CCSkeleton.cpp | 2 +- extensions/spine/CCSkeleton.h | 2 +- 15 files changed, 48 insertions(+), 47 deletions(-) diff --git a/cocos2dx/base_nodes/CCAtlasNode.cpp b/cocos2dx/base_nodes/CCAtlasNode.cpp index 58e8231b3b..f8125835bc 100644 --- a/cocos2dx/base_nodes/CCAtlasNode.cpp +++ b/cocos2dx/base_nodes/CCAtlasNode.cpp @@ -152,7 +152,7 @@ void AtlasNode::draw(void) // AtlasNode - RGBA protocol -const ccColor3B& AtlasNode::getColor() +const ccColor3B& AtlasNode::getColor() const { if(_isOpacityModifyRGB) { @@ -191,7 +191,7 @@ void AtlasNode::setOpacityModifyRGB(bool bValue) this->setColor(oldColor); } -bool AtlasNode::isOpacityModifyRGB() +bool AtlasNode::isOpacityModifyRGB() const { return _isOpacityModifyRGB; } diff --git a/cocos2dx/base_nodes/CCAtlasNode.h b/cocos2dx/base_nodes/CCAtlasNode.h index fdb6ba46ef..2dd6b22b69 100644 --- a/cocos2dx/base_nodes/CCAtlasNode.h +++ b/cocos2dx/base_nodes/CCAtlasNode.h @@ -107,9 +107,9 @@ public: /** sets a new texture. it will be retained*/ virtual void setTexture(Texture2D *texture); - virtual bool isOpacityModifyRGB(); + virtual bool isOpacityModifyRGB() const; virtual void setOpacityModifyRGB(bool isOpacityModifyRGB); - virtual const ccColor3B& getColor(void); + virtual const ccColor3B& getColor(void) const; virtual void setColor(const ccColor3B& color); virtual void setOpacity(GLubyte opacity); diff --git a/cocos2dx/menu_nodes/CCMenu.h b/cocos2dx/menu_nodes/CCMenu.h index e6dacb2aa2..d528dd3f8e 100644 --- a/cocos2dx/menu_nodes/CCMenu.h +++ b/cocos2dx/menu_nodes/CCMenu.h @@ -135,7 +135,7 @@ public: virtual void onExit(); virtual void setOpacityModifyRGB(bool bValue) {CC_UNUSED_PARAM(bValue);} - virtual bool isOpacityModifyRGB(void) { return false;} + virtual bool isOpacityModifyRGB(void) const { return false;} virtual bool isEnabled() { return _enabled; } virtual void setEnabled(bool value) { _enabled = value; }; diff --git a/cocos2dx/misc_nodes/CCProgressTimer.cpp b/cocos2dx/misc_nodes/CCProgressTimer.cpp index 60f9339e0a..8dbe478445 100644 --- a/cocos2dx/misc_nodes/CCProgressTimer.cpp +++ b/cocos2dx/misc_nodes/CCProgressTimer.cpp @@ -154,7 +154,7 @@ void ProgressTimer::setOpacityModifyRGB(bool bValue) CC_UNUSED_PARAM(bValue); } -bool ProgressTimer::isOpacityModifyRGB(void) +bool ProgressTimer::isOpacityModifyRGB(void) const { return false; } @@ -225,7 +225,7 @@ void ProgressTimer::updateProgress(void) } } -void ProgressTimer::setAnchorPoint(Point anchorPoint) +void ProgressTimer::setAnchorPoint(const Point& anchorPoint) { Node::setAnchorPoint(anchorPoint); } diff --git a/cocos2dx/misc_nodes/CCProgressTimer.h b/cocos2dx/misc_nodes/CCProgressTimer.h index babc5a2342..0b6eb582d9 100644 --- a/cocos2dx/misc_nodes/CCProgressTimer.h +++ b/cocos2dx/misc_nodes/CCProgressTimer.h @@ -80,10 +80,10 @@ public: void setReverseProgress(bool reverse); virtual void draw(void); - void setAnchorPoint(Point anchorPoint); + void setAnchorPoint(const Point& anchorPoint); virtual void setOpacityModifyRGB(bool bValue); - virtual bool isOpacityModifyRGB(void); + virtual bool isOpacityModifyRGB(void) const; inline bool isReverseDirection() { return _reverseDirection; }; inline void setReverseDirection(bool value) { _reverseDirection = value; }; diff --git a/extensions/GUI/CCControlExtension/CCControl.cpp b/extensions/GUI/CCControlExtension/CCControl.cpp index 432dd66052..4a541c0268 100644 --- a/extensions/GUI/CCControlExtension/CCControl.cpp +++ b/extensions/GUI/CCControlExtension/CCControl.cpp @@ -248,7 +248,7 @@ void Control::setOpacityModifyRGB(bool bOpacityModifyRGB) } } -bool Control::isOpacityModifyRGB() +bool Control::isOpacityModifyRGB() const { return _isOpacityModifyRGB; } diff --git a/extensions/GUI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h index 4b4e6f7084..7b4326fa8a 100644 --- a/extensions/GUI/CCControlExtension/CCControl.h +++ b/extensions/GUI/CCControlExtension/CCControl.h @@ -114,7 +114,7 @@ public: */ virtual void needsLayout(); - virtual bool isOpacityModifyRGB(); + virtual bool isOpacityModifyRGB() const; virtual void setOpacityModifyRGB(bool bOpacityModifyRGB); protected: diff --git a/extensions/GUI/CCControlExtension/CCControlButton.cpp b/extensions/GUI/CCControlExtension/CCControlButton.cpp index b0a82282e0..9558f90ee3 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.cpp +++ b/extensions/GUI/CCControlExtension/CCControlButton.cpp @@ -724,7 +724,7 @@ void ControlButton::setOpacity(GLubyte opacity) } } -GLubyte ControlButton::getOpacity() +GLubyte ControlButton::getOpacity() const { return _realOpacity; } @@ -741,7 +741,7 @@ void ControlButton::setColor(const ccColor3B & color) } } -const ccColor3B& ControlButton::getColor() +const ccColor3B& ControlButton::getColor() const { return _realColor; } diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h index 620ec4803a..3acd8daf1b 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.h +++ b/extensions/GUI/CCControlExtension/CCControlButton.h @@ -91,9 +91,9 @@ protected: CC_PROPERTY(Point, _labelAnchorPoint, LabelAnchorPoint); /* Override setter to affect a background sprite too */ - virtual GLubyte getOpacity(void); + virtual GLubyte getOpacity(void) const; virtual void setOpacity(GLubyte var); - virtual const ccColor3B& getColor(void); + virtual const ccColor3B& getColor(void) const; virtual void setColor(const ccColor3B&); /** Flag to know if the button is currently pushed. */ diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp index f8d18c3edc..517a7386a6 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp @@ -719,7 +719,7 @@ void Scale9Sprite::setOpacityModifyRGB(bool var) } } } -bool Scale9Sprite::isOpacityModifyRGB() +bool Scale9Sprite::isOpacityModifyRGB() const { return _opacityModifyRGB; } @@ -806,7 +806,7 @@ void Scale9Sprite::setColor(const ccColor3B& color) } } -const ccColor3B& Scale9Sprite::getColor() +const ccColor3B& Scale9Sprite::getColor() const { return _color; } @@ -827,7 +827,7 @@ void Scale9Sprite::setOpacity(GLubyte opacity) } } -GLubyte Scale9Sprite::getOpacity() +GLubyte Scale9Sprite::getOpacity() const { return _opacity; } diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.h b/extensions/GUI/CCControlExtension/CCScale9Sprite.h index de9ef8db50..3002d63985 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.h +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.h @@ -306,11 +306,11 @@ public: /** returns whether or not the opacity will be applied using glColor(R,G,B,opacity) or glColor(opacity, opacity, opacity, opacity); @since v0.8 */ - virtual bool isOpacityModifyRGB(void); + virtual bool isOpacityModifyRGB(void) const; virtual void setOpacity(GLubyte opacity); - virtual GLubyte getOpacity(); + virtual GLubyte getOpacity() const; virtual void setColor(const ccColor3B& color); - virtual const ccColor3B& getColor(); + virtual const ccColor3B& getColor() const; virtual bool updateWithBatchNode(SpriteBatchNode* batchnode, Rect rect, bool rotated, Rect capInsets); diff --git a/extensions/physics_nodes/CCPhysicsSprite.cpp b/extensions/physics_nodes/CCPhysicsSprite.cpp index 8f96926e23..f47ad21f04 100644 --- a/extensions/physics_nodes/CCPhysicsSprite.cpp +++ b/extensions/physics_nodes/CCPhysicsSprite.cpp @@ -166,28 +166,29 @@ void PhysicsSprite::setIgnoreBodyRotation(bool bIgnoreBodyRotation) } // Override the setters and getters to always reflect the body's properties. -const Point& PhysicsSprite::getPosition() +const Point& PhysicsSprite::getPosition() const { - updatePosFromPhysics(); - return Node::getPosition(); + return getPosFromPhysics(); } -void PhysicsSprite::getPosition(float* x, float* y) +void PhysicsSprite::getPosition(float* x, float* y) const { - updatePosFromPhysics(); - return Node::getPosition(x, y); + if (x == NULL || y == NULL) { + return; + } + const Point& pos = getPosFromPhysics(); + *x = pos.x; + *y = pos.y; } -float PhysicsSprite::getPositionX() +float PhysicsSprite::getPositionX() const { - updatePosFromPhysics(); - return _position.x; + return getPosFromPhysics().x; } -float PhysicsSprite::getPositionY() +float PhysicsSprite::getPositionY() const { - updatePosFromPhysics(); - return _position.y; + return getPosFromPhysics().y; } // @@ -270,22 +271,22 @@ void PhysicsSprite::setCPBody(cpBody *pBody) // Common to Box2d and Chipmunk // -void PhysicsSprite::updatePosFromPhysics() +const Point& PhysicsSprite::getPosFromPhysics() const { - + static Point s_physicPosion; #if CC_ENABLE_CHIPMUNK_INTEGRATION cpVect cpPos = cpBodyGetPos(_CPBody); - _position = ccp(cpPos.x, cpPos.y); + s_physicPosion = ccp(cpPos.x, cpPos.y); #elif CC_ENABLE_BOX2D_INTEGRATION b2Vec2 pos = _pB2Body->GetPosition(); float x = pos.x * _PTMRatio; float y = pos.y * _PTMRatio; - _position = ccp(x,y); + s_physicPosion = ccp(x,y); #endif - + return s_physicPosion; } void PhysicsSprite::setPosition(const Point &pos) @@ -303,7 +304,7 @@ void PhysicsSprite::setPosition(const Point &pos) } -float PhysicsSprite::getRotation() +float PhysicsSprite::getRotation() const { #if CC_ENABLE_CHIPMUNK_INTEGRATION diff --git a/extensions/physics_nodes/CCPhysicsSprite.h b/extensions/physics_nodes/CCPhysicsSprite.h index b0b2664ed0..7c209e5ea9 100644 --- a/extensions/physics_nodes/CCPhysicsSprite.h +++ b/extensions/physics_nodes/CCPhysicsSprite.h @@ -96,12 +96,12 @@ public: bool isIgnoreBodyRotation() const; void setIgnoreBodyRotation(bool bIgnoreBodyRotation); - virtual const Point& getPosition(); - virtual void getPosition(float* x, float* y); - virtual float getPositionX(); - virtual float getPositionY(); + virtual const Point& getPosition() const; + virtual void getPosition(float* x, float* y) const; + virtual float getPositionX() const; + virtual float getPositionY() const; virtual void setPosition(const Point &position); - virtual float getRotation(); + virtual float getRotation() const; virtual void setRotation(float fRotation); virtual AffineTransform nodeToParentTransform(); @@ -123,7 +123,7 @@ public: void setPTMRatio(float fPTMRatio); protected: - void updatePosFromPhysics(); + const Point& getPosFromPhysics() const; }; NS_CC_EXT_END diff --git a/extensions/spine/CCSkeleton.cpp b/extensions/spine/CCSkeleton.cpp index 124209c246..f2289f1ac4 100644 --- a/extensions/spine/CCSkeleton.cpp +++ b/extensions/spine/CCSkeleton.cpp @@ -284,7 +284,7 @@ void CCSkeleton::setOpacityModifyRGB (bool value) { premultipliedAlpha = value; } -bool CCSkeleton::isOpacityModifyRGB () { +bool CCSkeleton::isOpacityModifyRGB () const { return premultipliedAlpha; } diff --git a/extensions/spine/CCSkeleton.h b/extensions/spine/CCSkeleton.h index 4715e87f3a..e1d739da9b 100644 --- a/extensions/spine/CCSkeleton.h +++ b/extensions/spine/CCSkeleton.h @@ -82,7 +82,7 @@ public: // --- BlendProtocol CC_PROPERTY_PASS_BY_REF(cocos2d::ccBlendFunc, blendFunc, BlendFunc); virtual void setOpacityModifyRGB (bool value); - virtual bool isOpacityModifyRGB (); + virtual bool isOpacityModifyRGB() const; protected: CCSkeleton (); From 268245635d69230740d899939f1c21de46655656 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 15:07:32 +0800 Subject: [PATCH 14/20] issue #2373: Fixing a bug in CardinalSplineTo::clone function. this->_points needs to be cloned. --- cocos2dx/actions/CCActionCatmullRom.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2dx/actions/CCActionCatmullRom.cpp b/cocos2dx/actions/CCActionCatmullRom.cpp index e04d389892..7b8cd1efd1 100644 --- a/cocos2dx/actions/CCActionCatmullRom.cpp +++ b/cocos2dx/actions/CCActionCatmullRom.cpp @@ -284,7 +284,7 @@ CardinalSplineTo* CardinalSplineTo::clone() const { // no copy constructor auto a = new CardinalSplineTo(); - a->initWithDuration(this->_duration, this->_points, this->_tension); + a->initWithDuration(this->_duration, this->_points->clone(), this->_tension); a->autorelease(); return a; } From e03091f9342a8d696fc486121be0f991e99a031b Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 15:18:04 +0800 Subject: [PATCH 15/20] Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture. --- tools/tojs/cocos2dx.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index 1adc23b24c..54b1159bfc 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -96,7 +96,7 @@ skip = Node::[^setPosition$ getGrid setGLServerState description getUserObject . Scheduler::[pause resume unschedule schedule update isTargetPaused], TextureCache::[addPVRTCImage], Timer::[getSelector], - *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType ^visit$], + *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType], FileUtils::[(g|s)etSearchResolutionsOrder$ (g|s)etSearchPaths$ getClassTypeInfo], SimpleAudioEngine::[getClassTypeInfo], Application::[^application.* ^run$], From fcc02d476c1eb3a7bd9f87b9ffcfdbba9b7aac99 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 3 Jul 2013 18:06:14 +0800 Subject: [PATCH 16/20] Updating AppDelegate.cpp --- .../CocosDragonJS/Classes/AppDelegate.cpp | 4 ++++ .../Javascript/CrystalCraze/Classes/AppDelegate.cpp | 4 ++++ .../Javascript/MoonWarriors/Classes/AppDelegate.cpp | 13 +++++++++++++ 3 files changed, 21 insertions(+) diff --git a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp b/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp index d29b239b3f..7fbcfba505 100644 --- a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp +++ b/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp @@ -12,6 +12,8 @@ #include "cocos2d_specifics.hpp" #include "js_bindings_ccbreader.h" #include "js_bindings_system_registration.h" +#include "js_bindings_chipmunk_registration.h" +#include "jsb_opengl_registration.h" USING_NS_CC; using namespace CocosDenshion; @@ -122,6 +124,8 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(register_all_cocos2dx_extension_manual); sc->addRegisterCallback(register_CCBuilderReader); sc->addRegisterCallback(jsb_register_system); + sc->addRegisterCallback(JSB_register_opengl); + sc->addRegisterCallback(jsb_register_chipmunk); sc->start(); diff --git a/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp b/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp index 1e65bf4734..c0eb0d54cc 100644 --- a/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp +++ b/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp @@ -9,6 +9,8 @@ #include "cocos2d_specifics.hpp" #include "js_bindings_ccbreader.h" #include "js_bindings_system_registration.h" +#include "js_bindings_chipmunk_registration.h" +#include "jsb_opengl_registration.h" USING_NS_CC; using namespace CocosDenshion; @@ -101,9 +103,11 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(register_all_cocos2dx); sc->addRegisterCallback(register_all_cocos2dx_extension); sc->addRegisterCallback(register_cocos2dx_js_extensions); + sc->addRegisterCallback(jsb_register_chipmunk); sc->addRegisterCallback(register_all_cocos2dx_extension_manual); sc->addRegisterCallback(register_CCBuilderReader); sc->addRegisterCallback(jsb_register_system); + sc->addRegisterCallback(JSB_register_opengl); sc->start(); diff --git a/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp b/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp index a453ce4363..4299a95179 100644 --- a/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp +++ b/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp @@ -4,7 +4,13 @@ #include "SimpleAudioEngine.h" #include "ScriptingCore.h" #include "generated/jsb_cocos2dx_auto.hpp" +#include "generated/jsb_cocos2dx_extension_auto.hpp" +#include "jsb_cocos2dx_extension_manual.h" #include "cocos2d_specifics.hpp" +#include "js_bindings_ccbreader.h" +#include "js_bindings_system_registration.h" +#include "js_bindings_chipmunk_registration.h" +#include "jsb_opengl_registration.h" USING_NS_CC; using namespace CocosDenshion; @@ -36,7 +42,14 @@ bool AppDelegate::applicationDidFinishLaunching() ScriptingCore* sc = ScriptingCore::getInstance(); sc->addRegisterCallback(register_all_cocos2dx); + sc->addRegisterCallback(register_all_cocos2dx_extension); sc->addRegisterCallback(register_cocos2dx_js_extensions); + sc->addRegisterCallback(jsb_register_chipmunk); + sc->addRegisterCallback(register_all_cocos2dx_extension_manual); + sc->addRegisterCallback(register_CCBuilderReader); + sc->addRegisterCallback(jsb_register_system); + sc->addRegisterCallback(JSB_register_opengl); + sc->start(); ScriptEngineProtocol *pEngine = ScriptingCore::getInstance(); From d6da357795bb4c5278e9b1fe3407920947d097a0 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 15:30:12 +0800 Subject: [PATCH 17/20] issue #2368: Using cocos2d/cocos2d-js-tests.git as the submodule. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5d1959ba87..717eb7adb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = git://github.com/folecr/cocos2dx-autogen-bindings.git [submodule "samples/Javascript/Shared"] path = samples/Javascript/Shared - url = https://github.com/minggo/cocos2d-js-tests.git + url = https://github.com/cocos2d/cocos2d-js-tests.git [submodule "external/emscripten"] path = external/emscripten url = https://github.com/kripken/emscripten.git From a996b878cda00da529cd93d464641cbde6390e7a Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 15:30:33 +0800 Subject: [PATCH 18/20] issue #2368: Updating JS-test. --- samples/Javascript/Shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared index e4b1b15b70..e0c7c459a6 160000 --- a/samples/Javascript/Shared +++ b/samples/Javascript/Shared @@ -1 +1 @@ -Subproject commit e4b1b15b70075dee1f20afff4741eb0be88b0a8b +Subproject commit e0c7c459a6ed1d85625fe3c3f554fcab0b4db4ff From 47c28c43c9b3a5bb9e616b87626100530f05cc67 Mon Sep 17 00:00:00 2001 From: James Chen Date: Fri, 5 Jul 2013 15:34:45 +0800 Subject: [PATCH 19/20] Updating auto jsbindings glue codes. --- scripting/javascript/bindings/generated | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripting/javascript/bindings/generated b/scripting/javascript/bindings/generated index 5df9199315..31bac728ae 160000 --- a/scripting/javascript/bindings/generated +++ b/scripting/javascript/bindings/generated @@ -1 +1 @@ -Subproject commit 5df9199315b9e9972da23e478808a2e9152e9980 +Subproject commit 31bac728ae0730bba6293a84b8ec17244696cb07 From ec2f5376f1ee47c07121ce105ab56adf0f04591a Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 5 Jul 2013 16:05:38 +0800 Subject: [PATCH 20/20] issue #2244:Add namespace to some enums --- extensions/GUI/CCEditBox/CCEditBoxImplMac.mm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm index 18ddbf3c5e..2fd610f86a 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm @@ -151,7 +151,7 @@ if (NULL != pEditBox && 0 != pEditBox->getScriptEditBoxHandler()) { cocos2d::CommonScriptData data(pEditBox->getScriptEditBoxHandler(), "began",pEditBox); - cocos2d::ScriptEvent event(kCommonEvent,(void*)&data); + cocos2d::ScriptEvent event(cocos2d::kCommonEvent,(void*)&data); cocos2d::ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); } return YES; @@ -171,7 +171,7 @@ if (NULL != pEditBox && 0 != pEditBox->getScriptEditBoxHandler()) { cocos2d::CommonScriptData data(pEditBox->getScriptEditBoxHandler(), "ended",pEditBox); - cocos2d::ScriptEvent event(kCommonEvent,(void*)&data); + cocos2d::ScriptEvent event(cocos2d::kCommonEvent,(void*)&data); cocos2d::ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); memset(data.eventName,0,64*sizeof(char)); strncpy(data.eventName,"return",64); @@ -219,7 +219,7 @@ if (NULL != pEditBox && 0 != pEditBox->getScriptEditBoxHandler()) { cocos2d::CommonScriptData data(pEditBox->getScriptEditBoxHandler(), "changed",pEditBox); - cocos2d::ScriptEvent event(kCommonEvent,(void*)&data); + cocos2d::ScriptEvent event(cocos2d::kCommonEvent,(void*)&data); cocos2d::ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(&event); } }