From b88a222fc5f1c38c8a30e539f0ce07189b153d75 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 4 Jun 2013 19:49:03 +0800 Subject: [PATCH 1/2] Updating multi-platform-xxx template for iOS and Mac. --- .../proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- template/multi-platform-js/Classes/AppDelegate.cpp | 2 ++ .../HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) 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 index 54e06b3033..9db578f9fd 100644 --- 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 @@ -1 +1 @@ -d66be62ea8d88bb1db39015df7e55bd72d020a14 \ No newline at end of file +544fcad57c860332a2c21668f765ad67d36892f4 \ No newline at end of file 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 index 2ead07b7bb..c9f65cb543 100644 --- 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 @@ -1 +1 @@ -c473664cb14a1cd343c93e144ce1bc3593f861b7 \ No newline at end of file +d0206a594e006f1270725318e67aabcff1b8929f \ No newline at end of file diff --git a/template/multi-platform-js/Classes/AppDelegate.cpp b/template/multi-platform-js/Classes/AppDelegate.cpp index 06d136d263..6d9bc18a35 100644 --- a/template/multi-platform-js/Classes/AppDelegate.cpp +++ b/template/multi-platform-js/Classes/AppDelegate.cpp @@ -12,6 +12,7 @@ #include "js_bindings_ccbreader.h" #include "jsb_opengl_registration.h" #include "XMLHTTPRequest.h" +#include "jsb_websocket.h" USING_NS_CC; using namespace CocosDenshion; @@ -47,6 +48,7 @@ bool AppDelegate::applicationDidFinishLaunching() sc->addRegisterCallback(jsb_register_system); sc->addRegisterCallback(JSB_register_opengl); sc->addRegisterCallback(MinXmlHttpRequest::_js_register); + sc->addRegisterCallback(register_jsb_websocket); sc->start(); 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 index 13f0b324ca..8124cfbe37 100644 --- 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 @@ -1 +1 @@ -9eadb432b763f1b49204ce8588b2a9c888ed854d \ No newline at end of file +5760ebb718b64aa62f223e90b7f682ab19704e90 \ No newline at end of file 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 index 9c613808df..1f24369669 100644 --- 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 @@ -1 +1 @@ -9294948eaa551285cf91c8f7426fb7ee2e21f0b0 \ No newline at end of file +37277f3e1eed9c7856e60390a23a11413b87be76 \ No newline at end of file From bb635c280c9a3252395c122c25d36f3f189ad64f Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 4 Jun 2013 20:52:29 +0800 Subject: [PATCH 2/2] Updating multi-platform-xxx template for iOS and Android after enabling c++ 11. --- .../proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- .../proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id b/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id index 83dc43e22e..c07308b2bb 100644 --- a/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -e8ebb7f5fd50bd7d91c24ce0aac9d63a92f4f43c \ No newline at end of file +214624b54f2baf92a539bacaf87917fe64ad439c \ No newline at end of file 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 index 9db578f9fd..8c59a7ab7b 100644 --- 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 @@ -1 +1 @@ -544fcad57c860332a2c21668f765ad67d36892f4 \ No newline at end of file +2a27890e1483789f1497834fc5492f39f55d826b \ No newline at end of file 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 index c9f65cb543..4e56c68fc2 100644 --- 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 @@ -1 +1 @@ -d0206a594e006f1270725318e67aabcff1b8929f \ No newline at end of file +f9f78f7848a9ee31f7c4c919fca1555101c48767 \ No newline at end of file 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 index 8124cfbe37..2e2c1a8530 100644 --- 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 @@ -1 +1 @@ -5760ebb718b64aa62f223e90b7f682ab19704e90 \ No newline at end of file +d26a11f8c730fe2aebb4087b16b6c3a70bb7feb1 \ No newline at end of file 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 index 1f24369669..7aea6c94af 100644 --- 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 @@ -1 +1 @@ -37277f3e1eed9c7856e60390a23a11413b87be76 \ No newline at end of file +076fe9adb2bd90144e4ac19089e9e0b884c92af8 \ No newline at end of file