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

Merge pull request #1714 from minggo/gles20 

Do some changes before releasing
This commit is contained in:
minggo 2012-12-04 00:26:37 -08:00
parent b2581ff456 9691886582
commit 21d01ae5c0
3 changed files with 17 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
fdd8a5d4e5a94b517f86c0f1b7d334adc1eb9c9c
84cd25be53945443ed529554d1a4035b6989d150

60
samples/TestLua/proj.ios/TestLua.xcodeproj/project.pbxproj
View File

@ -61,13 +61,6 @@
F293BC2115EB838A00256477 /* lvm.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBE915EB838A00256477 /* lvm.c */; };
F293BC2215EB838A00256477 /* lzio.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBEB15EB838A00256477 /* lzio.c */; };
F293BC2315EB838A00256477 /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBED15EB838A00256477 /* print.c */; };
F293BC2415EB838A00256477 /* Android.mk in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF015EB838A00256477 /* Android.mk */; };
F293BC2515EB838A00256477 /* .cproject in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF215EB838A00256477 /* .cproject */; };
F293BC2615EB838A00256477 /* .project in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF315EB838A00256477 /* .project */; };
F293BC2715EB838A00256477 /* liblua.vcproj in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF515EB838A00256477 /* liblua.vcproj */; };
F293BC2815EB838A00256477 /* liblua.vcxproj in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF615EB838A00256477 /* liblua.vcxproj */; };
F293BC2915EB838A00256477 /* liblua.vcxproj.filters in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF715EB838A00256477 /* liblua.vcxproj.filters */; };
F293BC2A15EB838A00256477 /* liblua.vcxproj.user in Resources */ = {isa = PBXBuildFile; fileRef = F293BBF815EB838A00256477 /* liblua.vcxproj.user */; };
F293BC2B15EB838A00256477 /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBFB15EB838A00256477 /* tolua_event.c */; };
F293BC2C15EB838A00256477 /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBFD15EB838A00256477 /* tolua_is.c */; };
F293BC2D15EB838A00256477 /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = F293BBFE15EB838A00256477 /* tolua_map.c */; };
@ -215,13 +208,6 @@
F293BBEB15EB838A00256477 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lzio.c; sourceTree = "<group>"; };
F293BBEC15EB838A00256477 /* lzio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzio.h; sourceTree = "<group>"; };
F293BBED15EB838A00256477 /* print.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print.c; sourceTree = "<group>"; };
F293BBF015EB838A00256477 /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = "<group>"; };
F293BBF215EB838A00256477 /* .cproject */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = .cproject; sourceTree = "<group>"; };
F293BBF315EB838A00256477 /* .project */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = .project; sourceTree = "<group>"; };
F293BBF515EB838A00256477 /* liblua.vcproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcproj; sourceTree = "<group>"; };
F293BBF615EB838A00256477 /* liblua.vcxproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcxproj; sourceTree = "<group>"; };
F293BBF715EB838A00256477 /* liblua.vcxproj.filters */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcxproj.filters; sourceTree = "<group>"; };
F293BBF815EB838A00256477 /* liblua.vcxproj.user */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = liblua.vcxproj.user; sourceTree = "<group>"; };
F293BBFA15EB838A00256477 /* tolua++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "tolua++.h"; sourceTree = "<group>"; };
F293BBFB15EB838A00256477 /* tolua_event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tolua_event.c; sourceTree = "<group>"; };
F293BBFC15EB838A00256477 /* tolua_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tolua_event.h; sourceTree = "<group>"; };
@ -364,9 +350,6 @@
children = (
F293BBAE15EB838A00256477 /* cocos2dx_support */,
F293BBB715EB838A00256477 /* lua */,
F293BBEE15EB838A00256477 /* proj.android */,
F293BBF115EB838A00256477 /* proj.blackberry */,
F293BBF415EB838A00256477 /* proj.win32 */,
F293BBF915EB838A00256477 /* tolua */,
);
name = lua;
@ -449,42 +432,6 @@
path = lua;
sourceTree = "<group>";
};
F293BBEE15EB838A00256477 /* proj.android */ = {
isa = PBXGroup;
children = (
F293BBEF15EB838A00256477 /* jni */,
);
path = proj.android;
sourceTree = "<group>";
};
F293BBEF15EB838A00256477 /* jni */ = {
isa = PBXGroup;
children = (
F293BBF015EB838A00256477 /* Android.mk */,
);
path = jni;
sourceTree = "<group>";
};
F293BBF115EB838A00256477 /* proj.blackberry */ = {
isa = PBXGroup;
children = (
F293BBF215EB838A00256477 /* .cproject */,
F293BBF315EB838A00256477 /* .project */,
);
path = proj.blackberry;
sourceTree = "<group>";
};
F293BBF415EB838A00256477 /* proj.win32 */ = {
isa = PBXGroup;
children = (
F293BBF515EB838A00256477 /* liblua.vcproj */,
F293BBF615EB838A00256477 /* liblua.vcxproj */,
F293BBF715EB838A00256477 /* liblua.vcxproj.filters */,
F293BBF815EB838A00256477 /* liblua.vcxproj.user */,
);
path = proj.win32;
sourceTree = "<group>";
};
F293BBF915EB838A00256477 /* tolua */ = {
isa = PBXGroup;
children = (
@ -678,13 +625,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
F293BC2415EB838A00256477 /* Android.mk in Resources */,
F293BC2515EB838A00256477 /* .cproject in Resources */,
F293BC2615EB838A00256477 /* .project in Resources */,
F293BC2715EB838A00256477 /* liblua.vcproj in Resources */,
F293BC2815EB838A00256477 /* liblua.vcxproj in Resources */,
F293BC2915EB838A00256477 /* liblua.vcxproj.filters in Resources */,
F293BC2A15EB838A00256477 /* liblua.vcxproj.user in Resources */,
F2A1553E15EB91DE00C9B0B6 /* Collision in Resources */,
F2A1553F15EB91DE00C9B0B6 /* Common in Resources */,
F2A1554015EB91DE00C9B0B6 /* Dynamics in Resources */,

16
samples/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj
View File

@ -51,6 +51,10 @@
15426FE915B5743C00712A7F /* SimpleAudioEngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD615B5743C00712A7F /* SimpleAudioEngine.mm */; };
15426FEA15B5743C00712A7F /* SimpleAudioEngine_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 15426FD815B5743C00712A7F /* SimpleAudioEngine_objc.m */; };
15900400166DAD84006BF838 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 159003FF166DAD84006BF838 /* res */; };
159004CC166DE338006BF838 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004CB166DE338006BF838 /* Icon-57.png */; };
159004CE166DE33E006BF838 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004CD166DE33E006BF838 /* Icon-114.png */; };
159004D0166DE346006BF838 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004CF166DE346006BF838 /* Icon-72.png */; };
159004D2166DE34B006BF838 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 159004D1166DE34B006BF838 /* Icon-144.png */; };
15CFE1A61612FD0E00BF2188 /* CCControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE18D1612FD0E00BF2188 /* CCControl.cpp */; };
15CFE1A71612FD0E00BF2188 /* CCControlButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE18F1612FD0E00BF2188 /* CCControlButton.cpp */; };
15CFE1A81612FD0E00BF2188 /* CCControlColourPicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CFE1911612FD0E00BF2188 /* CCControlColourPicker.cpp */; };
@ -243,6 +247,10 @@
15426FD715B5743C00712A7F /* SimpleAudioEngine_objc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleAudioEngine_objc.h; sourceTree = "<group>"; };
15426FD815B5743C00712A7F /* SimpleAudioEngine_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleAudioEngine_objc.m; sourceTree = "<group>"; };
159003FF166DAD84006BF838 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = "../../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe/res"; sourceTree = "<group>"; };
159004CB166DE338006BF838 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
159004CD166DE33E006BF838 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
159004CF166DE346006BF838 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
159004D1166DE34B006BF838 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
15CFE18D1612FD0E00BF2188 /* CCControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControl.cpp; sourceTree = "<group>"; };
15CFE18E1612FD0E00BF2188 /* CCControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControl.h; sourceTree = "<group>"; };
15CFE18F1612FD0E00BF2188 /* CCControlButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlButton.cpp; sourceTree = "<group>"; };
@ -771,6 +779,10 @@
A92275321517C094001B78AA = {
isa = PBXGroup;
children = (
159004D1166DE34B006BF838 /* Icon-144.png */,
159004CF166DE346006BF838 /* Icon-72.png */,
159004CD166DE33E006BF838 /* Icon-114.png */,
159004CB166DE338006BF838 /* Icon-57.png */,
15426AE915B5733200712A7F /* cocos2dx.xcodeproj */,
15384E3C16119CC30021DC07 /* bindings */,
2628297C15EC7196002C4240 /* chipmunk */,
@ -913,6 +925,10 @@
D446FDA516102D82000ADA7B /* Default@2x.png in Resources */,
D446FDA716102D86000ADA7B /* Default-568h@2x.png in Resources */,
15900400166DAD84006BF838 /* res in Resources */,
159004CC166DE338006BF838 /* Icon-57.png in Resources */,
159004CE166DE33E006BF838 /* Icon-114.png in Resources */,
159004D0166DE346006BF838 /* Icon-72.png in Resources */,
159004D2166DE34B006BF838 /* Icon-144.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};