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/dumganhar/cocos2d-x into develop

This commit is contained in:
James Chen 2014-03-15 00:12:30 +08:00
parent 306df0537e 1f1ead6d3f
commit a8c960c7f1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -36,7 +36,7 @@ Example:
### Build and run new project for android ###
$ cocos run -p -j4 android
$ cocos run -p -j 4 android
### Build and run new project for iOS ###
@ -57,8 +57,7 @@ script in **cocos2d/build/install-deps-linux.sh**
Then
$ cd /home/MyGame
$ cmake .
$ make
$ cocos run -p linux
Run

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit 410f631397244fad67a6a7b21d55975719cd40c3
Subproject commit 2b88fb0bfb1277f480c721f1d520d8555acc2d5d