Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2752 from dumganhar/template-fix-develop 

Updating multi-platform-xxx template for iOS and Mac. [develop]
This commit is contained in:
James Chen 2013-06-04 05:57:38 -07:00
parent c678664085 bb635c280c
commit 2ee96f81e1
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
e8ebb7f5fd50bd7d91c24ce0aac9d63a92f4f43c 214624b54f2baf92a539bacaf87917fe64ad439c

2
template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
d66be62ea8d88bb1db39015df7e55bd72d020a14 2a27890e1483789f1497834fc5492f39f55d826b

2
template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
c473664cb14a1cd343c93e144ce1bc3593f861b7 f9f78f7848a9ee31f7c4c919fca1555101c48767

2
template/multi-platform-js/Classes/AppDelegate.cpp
View File

@ -12,6 +12,7 @@
#include "js_bindings_ccbreader.h" #include "js_bindings_ccbreader.h"
#include "jsb_opengl_registration.h" #include "jsb_opengl_registration.h"
#include "XMLHTTPRequest.h" #include "XMLHTTPRequest.h"
#include "jsb_websocket.h"
USING_NS_CC; USING_NS_CC;
using namespace CocosDenshion; using namespace CocosDenshion;
@ -47,6 +48,7 @@ bool AppDelegate::applicationDidFinishLaunching()
sc->addRegisterCallback(jsb_register_system); sc->addRegisterCallback(jsb_register_system);
sc->addRegisterCallback(JSB_register_opengl); sc->addRegisterCallback(JSB_register_opengl);
sc->addRegisterCallback(MinXmlHttpRequest::_js_register); sc->addRegisterCallback(MinXmlHttpRequest::_js_register);
sc->addRegisterCallback(register_jsb_websocket);
sc->start(); sc->start();

2
template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
9eadb432b763f1b49204ce8588b2a9c888ed854d d26a11f8c730fe2aebb4087b16b6c3a70bb7feb1

2
template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
9294948eaa551285cf91c8f7426fb7ee2e21f0b0 076fe9adb2bd90144e4ac19089e9e0b884c92af8