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

Merge pull request #4053 from minggo/iss2905-adjust_folder 

[ci skip]Iss2905 adjust folder
This commit is contained in:
minggo 2013-11-01 01:54:07 -07:00
parent 485c9e7fbe 915d75ea7c
commit cd0a1b4d6d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/android-build.py
View File

@ -176,7 +176,7 @@ def build_samples(target,ndk_build_param):
elif target == 'simplegame':
app_android_root = os.path.join(cocos_root, 'samples/Cpp/SimpleGame/proj.android')
elif target == 'assetsmanager':
app_android_root = os.path.join(cocos_root, 'samples/Cpp/AssetsManager/proj.android')
app_android_root = os.path.join(cocos_root, 'samples/Cpp/AssetsManagerTest/proj.android')
elif target == 'hellolua':
app_android_root = os.path.join(cocos_root, 'samples/Lua/HelloLua/proj.android')
elif target == 'testlua':

2
tools/travis-scripts/run-script.sh
View File

@ -50,7 +50,7 @@ elif [ "$PLATFORM"x = "android"x ]; then
# Build all samples
echo "Building all samples ..."
cd $COCOS2DX_ROOT/build
./android-build.py all
./android-build.py -n NDK_DEBUG=0 all
# Build template
# echo "Building template ..."