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

issue #3828: Updates android build.

This commit is contained in:
James Chen 2014-01-28 15:33:23 +08:00
parent ebe22aaeec
commit ffd8970996
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/android-build.py
View File

@ -163,7 +163,7 @@ def copy_resources(target, app_android_root):
copy_files(resources_dir, assets_dir)
if target == "testjavascript":
resources_dir = os.path.join(app_android_root, "../../tests/")
resources_dir = os.path.join(app_android_root, "../tests/")
copy_files(resources_dir, assets_dir)
@ -189,12 +189,12 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
cocos_root = os.path.join(current_dir, "..")
if android_platform is not None:
sdk_root = check_environment_variables_sdk()
if android_platform.isdigit():
android_platform = 'android-'+android_platform
else:
print 'please use vaild android platform'
exit(1)
sdk_root = check_environment_variables_sdk()
if android_platform.isdigit():
android_platform = 'android-'+android_platform
else:
print 'please use vaild android platform'
exit(1)
if build_mode is None:
build_mode = 'debug'

6
samples/test-lua/proj.android/jni/Android.mk
View File

@ -12,9 +12,9 @@ LOCAL_SRC_FILES += testlua/main.cpp \
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../../extensions \
$(LOCAL_PATH)/../../../../../cocos/scripting/lua/bindings
$(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../../extensions \
$(LOCAL_PATH)/../../../../cocos/scripting/lua/bindings
LOCAL_STATIC_LIBRARIES := curl_static_prebuilt