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

Merge https://github.com/cocos2d/cocos2d-x

This commit is contained in:
unknown 2011-07-08 20:23:38 +08:00
parent 7b30969991 2066cebd08
commit 950c5ecd75
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
58728dc0be18955fcaabb9d6cd2ead3fdf389132 ef940d5753a60f54cba21c8c503248f75bd3ab98

2
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
f04508231e03751a17872c963c91f97e4335132a 55a23e272c4ae52bb22a27f5bd0f4309bcb4c683

2
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
62513e048519ce58a6a7b19d444f751b0e6ae9a4 e927644074613ed3644c897bdb0912660335380e

2
template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
c8cbd6aa2f9f570eda299b591f7b2903a4c954c7 dec21d9705b1a93bf01aac9fb46e3e65996adfba

12
tests/test.android/jni/tests/Android.mk
View File

@ -11,6 +11,17 @@ LOCAL_SRC_FILES := main.cpp \
../../../tests/Box2DTestBed/GLES-Render.cpp \ ../../../tests/Box2DTestBed/GLES-Render.cpp \
../../../tests/Box2DTestBed/Test.cpp \ ../../../tests/Box2DTestBed/Test.cpp \
../../../tests/Box2DTestBed/TestEntries.cpp \ ../../../tests/Box2DTestBed/TestEntries.cpp \
../../../tests/BugsTest/Bug-1159.cpp \
../../../tests/BugsTest/Bug-1174.cpp \
../../../tests/BugsTest/Bug-350.cpp \
../../../tests/BugsTest/Bug-422.cpp \
../../../tests/BugsTest/Bug-624.cpp \
../../../tests/BugsTest/Bug-886.cpp \
../../../tests/BugsTest/Bug-899.cpp \
../../../tests/BugsTest/Bug-914.cpp \
../../../tests/BugsTest/BugsTest.cpp \
../../../tests/BugsTest/Bug-458/Bug-458.cpp \
../../../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp \
../../../tests/ChipmunkTest/Bounce.cpp \ ../../../tests/ChipmunkTest/Bounce.cpp \
../../../tests/ChipmunkTest/Joints.cpp \ ../../../tests/ChipmunkTest/Joints.cpp \
../../../tests/ChipmunkTest/LogoSmash.cpp \ ../../../tests/ChipmunkTest/LogoSmash.cpp \
@ -36,6 +47,7 @@ LOCAL_SRC_FILES := main.cpp \
../../../tests/CocosDenshionTest/CocosDenshionTest.cpp \ ../../../tests/CocosDenshionTest/CocosDenshionTest.cpp \
../../../tests/CocosNodeTest/CocosNodeTest.cpp \ ../../../tests/CocosNodeTest/CocosNodeTest.cpp \
../../../tests/CurlTest/CurlTest.cpp \ ../../../tests/CurlTest/CurlTest.cpp \
../../../tests/DirectorTest/DirectorTest.cpp \
../../../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ ../../../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
../../../tests/EaseActionsTest/EaseActionsTest.cpp \ ../../../tests/EaseActionsTest/EaseActionsTest.cpp \
../../../tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ ../../../tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
57222087555cb82a58a60b5b605e2a63d9c4fa25 ca6671a2edbcbfdddbb140f60d4a868feab7747f