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

lua-tests works again for Android.

This commit is contained in:
James Chen 2014-03-10 16:04:46 +08:00
parent 705ab115b8
commit 6deadf34b8
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/android-build.py
View File

@ -148,18 +148,18 @@ def copy_resources(target, app_android_root):
# copy resources(cpp samples and lua samples)
os.mkdir(assets_dir)
resources_dir = os.path.join(app_android_root, "../Resources")
resources_dir = os.path.join(app_android_root, "../../res")
if os.path.isdir(resources_dir):
copy_files(resources_dir, assets_dir)
# lua samples should copy lua script
if target in LUA_SAMPLES:
resources_dir = os.path.join(app_android_root, "../../../cocos/scripting/lua/script")
resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script")
copy_files(resources_dir, assets_dir)
# TestLua shared resources with TestCpp
if target == "testlua":
resources_dir = os.path.join(app_android_root, "../../cpp-tests/Resources")
resources_dir = os.path.join(app_android_root, "../../../cpp-tests/Resources")
copy_files(resources_dir, assets_dir)
def build_samples(target,ndk_build_param,android_platform,build_mode):
@ -190,7 +190,7 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
if target == 'testcpp':
app_android_root = os.path.join(cocos_root, 'samples/cpp-tests/proj.android')
elif target == 'testlua':
app_android_root = os.path.join(cocos_root, 'samples/lua-tests/proj.android')
app_android_root = os.path.join(cocos_root, 'samples/lua-tests/project/proj.android')
else:
print 'unknown target: %s' % target
continue

64
cocos/scripting/lua-bindings/Android.mk
View File

@ -35,45 +35,45 @@ LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \
auto/lua_cocos2dx_gui_auto.cpp \
auto/lua_cocos2dx_spine_auto.cpp \
auto/lua_cocos2dx_physics_auto.cpp \
../external/tolua/tolua_event.c \
../external/tolua/tolua_is.c \
../external/tolua/tolua_map.c \
../external/tolua/tolua_push.c \
../external/tolua/tolua_to.c \
../external/luasocket/auxiliar.c \
../external/luasocket/luasocket_buffer.c \
../external/luasocket/except.c \
../external/luasocket/inet.c \
../external/luasocket/luasocket_io.c \
../external/luasocket/luasocket.c \
../external/luasocket/mime.c \
../external/luasocket/options.c \
../external/luasocket/select.c \
../external/luasocket/serial.c \
../external/luasocket/socket_scripts.c \
../external/luasocket/tcp.c \
../external/luasocket/timeout.c \
../external/luasocket/udp.c \
../external/luasocket/unix.c \
../external/luasocket/usocket.c
../../../external/lua/tolua/tolua_event.c \
../../../external/lua/tolua/tolua_is.c \
../../../external/lua/tolua/tolua_map.c \
../../../external/lua/tolua/tolua_push.c \
../../../external/lua/tolua/tolua_to.c \
../../../external/lua/luasocket/auxiliar.c \
../../../external/lua/luasocket/luasocket_buffer.c \
../../../external/lua/luasocket/except.c \
../../../external/lua/luasocket/inet.c \
../../../external/lua/luasocket/luasocket_io.c \
../../../external/lua/luasocket/luasocket.c \
../../../external/lua/luasocket/mime.c \
../../../external/lua/luasocket/options.c \
../../../external/lua/luasocket/select.c \
../../../external/lua/luasocket/serial.c \
../../../external/lua/luasocket/socket_scripts.c \
../../../external/lua/luasocket/tcp.c \
../../../external/lua/luasocket/timeout.c \
../../../external/lua/luasocket/udp.c \
../../../external/lua/luasocket/unix.c \
../../../external/lua/luasocket/usocket.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../external/tolua \
$(LOCAL_PATH)/../external/luajit/include \
$(LOCAL_PATH)/../external \
$(LOCAL_PATH)/../cocos2d-x/extensions \
$(LOCAL_PATH)/../cocos2d-x/cocos/editor-support/spine \
$(LOCAL_PATH)/../cocos2d-x/cocos/editor-support/cocosbuilder \
$(LOCAL_PATH)/../cocos2d-x/cocos/editor-support/cocostudio \
$(LOCAL_PATH)/../cocos2d-x/cocos/gui \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
$(LOCAL_PATH)/../../../external/lua/luajit/include \
$(LOCAL_PATH)/../../../external/lua \
$(LOCAL_PATH)/../../../extensions \
$(LOCAL_PATH)/../../editor-support/spine \
$(LOCAL_PATH)/../../editor-support/cocosbuilder \
$(LOCAL_PATH)/../../editor-support/cocostudio \
$(LOCAL_PATH)/../../gui \
$(LOCAL_PATH)/auto \
$(LOCAL_PATH)/manual \
$(LOCAL_PATH)/manual/platform/android \
$(LOCAL_PATH)/manual/platform/android/jni
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../external/tolua \
$(LOCAL_PATH)/../external/luajit/include \
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \
$(LOCAL_PATH)/../../../external/lua/luajit/include \
$(LOCAL_PATH)/../external \
$(LOCAL_PATH)/auto \
$(LOCAL_PATH)/manual
@ -93,7 +93,7 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi
include $(BUILD_STATIC_LIBRARY)
$(call import-module,luajit/prebuilt/android)
$(call import-module,lua/luajit/prebuilt/android)
$(call import-module,extensions)
$(call import-module,2d)
$(call import-module,websockets/prebuilt/android)

2
samples/lua-tests/project/proj.android/jni/Android.mk
View File

@ -19,4 +19,4 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static
include $(BUILD_SHARED_LIBRARY)
$(call import-module,bindings)
$(call import-module,scripting/lua-bindings)

2
samples/lua-tests/project/proj.android/project.properties
View File

@ -10,4 +10,4 @@
# Project target.
target=android-10
android.library.reference.1=../../../../frameworks/lua-bindings/cocos2d-x/cocos/2d/platform/android/java
android.library.reference.1=../../../../cocos/2d/platform/android/java