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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode

This commit is contained in:
samuele3hu 2013-07-27 21:58:24 +08:00
parent 5e37e53e14 4dde992b70
commit 3d60019eb1
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,6 +605,7 @@
"\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"",
"\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-O2";
PRODUCT_NAME = HelloCpp;
PROVISIONING_PROFILE = "";
@ -655,6 +656,7 @@
"\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"",
"\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"",
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = HelloCpp;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";

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

@ -693,6 +693,7 @@
"\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"",
"\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-lxml2",
"-lz",
@ -741,6 +742,7 @@
"\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"",
"\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-lxml2",
"-lz",

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

@ -735,6 +735,7 @@
"\"$(SRCROOT)/../../../scripting/lua/luajit/ios\"",
"\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
@ -784,6 +785,7 @@
"\"$(SRCROOT)/../../../scripting/lua/luajit/ios\"",
"\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"",
);
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";