From 8f9756f0302110ec337e07874b2d7b763cc47c93 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Oct 2013 11:28:57 +0800 Subject: [PATCH 1/3] issue #2905:TestJavascript build ok on Android --- .../project.pbxproj.REMOVED.git-id | 2 +- cocos/gui/Android.mk | 2 +- cocos/network/Android.mk | 2 +- .../scripting/javascript/bindings/Android.mk | 34 +++++++++++++++---- .../javascript/bindings/ScriptingCore.cpp | 2 +- .../javascript/bindings/XMLHTTPRequest.cpp | 2 +- .../cocos2d_specifics.cpp.REMOVED.git-id | 2 +- .../bindings/js_bindings_chipmunk_manual.cpp | 2 +- .../bindings/js_bindings_system_functions.cpp | 2 +- .../js_bindings_system_registration.cpp | 2 +- .../jsb_cocos2dx_extension_manual.cpp | 2 +- .../javascript/bindings/jsb_websocket.cpp | 2 +- cocos/storage/local-storage/Android.mk | 13 ++++--- .../spidermonkey/prebuilt/android/Android.mk | 4 +-- .../websockets/prebuilt/android/Android.mk | 2 +- samples/Cpp/TestCpp/Android.mk | 4 +-- .../proj.android/build_native.sh | 4 +-- .../proj.android/jni/Android.mk | 14 ++------ 18 files changed, 57 insertions(+), 40 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index 81b945434f..e48cb4ba94 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -7658fe75258895d82e9432317ff63b182547bcdc \ No newline at end of file +9fac2ba89faf5e6f3c870c02f5186641e6be1590 \ No newline at end of file diff --git a/cocos/gui/Android.mk b/cocos/gui/Android.mk index 197a65f3ad..31edffec85 100644 --- a/cocos/gui/Android.mk +++ b/cocos/gui/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := gui_static +LOCAL_MODULE := cocos_gui_static LOCAL_MODULE_FILENAME := libgui diff --git a/cocos/network/Android.mk b/cocos/network/Android.mk index 1e739f3d69..d2f83a52dc 100644 --- a/cocos/network/Android.mk +++ b/cocos/network/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := network_static +LOCAL_MODULE := cocos_network_static LOCAL_MODULE_FILENAME := libnetwork diff --git a/cocos/scripting/javascript/bindings/Android.mk b/cocos/scripting/javascript/bindings/Android.mk index 2aca99df10..7482cdef26 100644 --- a/cocos/scripting/javascript/bindings/Android.mk +++ b/cocos/scripting/javascript/bindings/Android.mk @@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := scriptingcore-spidermonkey +LOCAL_MODULE := cocos_jsb_static -LOCAL_MODULE_FILENAME := libscriptingcore-spidermonkey +LOCAL_MODULE_FILENAME := libcocos2dxjsb LOCAL_SRC_FILES := ScriptingCore.cpp \ cocos2d_specifics.cpp \ @@ -34,18 +34,40 @@ LOCAL_EXPORT_CFLAGS := -DCOCOS2D_JAVASCRIPT LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/../../../CocosDenshion/include \ - $(LOCAL_PATH)/../../auto-generated/js-bindings + $(LOCAL_PATH)/../../auto-generated/js-bindings \ + $(LOCAL_PATH)/../../../../extensions \ + $(LOCAL_PATH)/../../../editor-support/cocostudio LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../auto-generated/js-bindings + $(LOCAL_PATH)/../../auto-generated/js-bindings -LOCAL_WHOLE_STATIC_LIBRARIES := spidermonkey_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static +LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static +LOCAL_WHOLE_STATIC_LIBRARIES += spine_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static +LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static LOCAL_LDLIBS := -landroid LOCAL_LDLIBS += -llog include $(BUILD_STATIC_LIBRARY) -$(call import-module,scripting/javascript/spidermonkey-android) +$(call import-module,spidermonkey/prebuilt/android) $(call import-module,extensions) +$(call import-module,2d) +$(call import-module,extensions) +$(call import-module,editor-support/cocosbuilder) +$(call import-module,editor-support/spine) +$(call import-module,network) +$(call import-module,chipmunk) +$(call import-module,storage/local-storage) +$(call import-module,editor-support/cocostudio) +$(call import-module,websockets/prebuilt/android) +$(call import-module,gui) diff --git a/cocos/scripting/javascript/bindings/ScriptingCore.cpp b/cocos/scripting/javascript/bindings/ScriptingCore.cpp index 101005be60..c4603fc8c0 100644 --- a/cocos/scripting/javascript/bindings/ScriptingCore.cpp +++ b/cocos/scripting/javascript/bindings/ScriptingCore.cpp @@ -16,7 +16,7 @@ #include "ScriptingCore.h" #include "jsdbgapi.h" #include "cocos2d.h" -#include "LocalStorage.h" +#include "local-storage/LocalStorage.h" #include "cocos2d_specifics.hpp" #include "js_bindings_config.h" // for debug socket diff --git a/cocos/scripting/javascript/bindings/XMLHTTPRequest.cpp b/cocos/scripting/javascript/bindings/XMLHTTPRequest.cpp index 2230a4a94d..cc7b72c586 100644 --- a/cocos/scripting/javascript/bindings/XMLHTTPRequest.cpp +++ b/cocos/scripting/javascript/bindings/XMLHTTPRequest.cpp @@ -67,7 +67,7 @@ void MinXmlHttpRequest::_gotHeader(string header) { // Seems like we have the response Code! Parse it and check for it. char * pch; - std::strcpy(cstr, header.c_str()); + strcpy(cstr, header.c_str()); pch = strtok(cstr," "); while (pch != NULL) diff --git a/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id index 0204ef566e..b8cda9a498 100644 --- a/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id +++ b/cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id @@ -1 +1 @@ -2641da58037c13f92ae771830a1fdf943e4964d2 \ No newline at end of file +bf994ad1fc8ac1044957d83708f7848e99ca59e6 \ No newline at end of file diff --git a/cocos/scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp b/cocos/scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp index 6233ae2553..14a88c87bb 100644 --- a/cocos/scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp +++ b/cocos/scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "js_bindings_config.h" #ifdef JSB_INCLUDE_CHIPMUNK diff --git a/cocos/scripting/javascript/bindings/js_bindings_system_functions.cpp b/cocos/scripting/javascript/bindings/js_bindings_system_functions.cpp index 1cb171224b..7d1a819fc8 100644 --- a/cocos/scripting/javascript/bindings/js_bindings_system_functions.cpp +++ b/cocos/scripting/javascript/bindings/js_bindings_system_functions.cpp @@ -7,7 +7,7 @@ #include "js_bindings_config.h" //#ifdef JSB_INCLUDE_SYSTEM -#include "LocalStorage.h" +#include "local-storage/LocalStorage.h" #include "jsfriendapi.h" #include "js_bindings_config.h" diff --git a/cocos/scripting/javascript/bindings/js_bindings_system_registration.cpp b/cocos/scripting/javascript/bindings/js_bindings_system_registration.cpp index 040a49b410..bf55e188f0 100644 --- a/cocos/scripting/javascript/bindings/js_bindings_system_registration.cpp +++ b/cocos/scripting/javascript/bindings/js_bindings_system_registration.cpp @@ -24,7 +24,7 @@ #include "js_bindings_config.h" #include "js_bindings_core.h" -#include "LocalStorage.h" +#include "local-storage/LocalStorage.h" #include "cocos2d.h" // system diff --git a/cocos/scripting/javascript/bindings/jsb_cocos2dx_extension_manual.cpp b/cocos/scripting/javascript/bindings/jsb_cocos2dx_extension_manual.cpp index 7a6d8bfc46..413f941bca 100644 --- a/cocos/scripting/javascript/bindings/jsb_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/javascript/bindings/jsb_cocos2dx_extension_manual.cpp @@ -6,7 +6,7 @@ // #include "jsb_cocos2dx_extension_manual.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "ScriptingCore.h" #include "cocos2d_specifics.hpp" #include "cocostudio/CocoStudio.h" diff --git a/cocos/scripting/javascript/bindings/jsb_websocket.cpp b/cocos/scripting/javascript/bindings/jsb_websocket.cpp index 49ecf7e57e..b5083ad268 100644 --- a/cocos/scripting/javascript/bindings/jsb_websocket.cpp +++ b/cocos/scripting/javascript/bindings/jsb_websocket.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "jsb_websocket.h" #include "cocos2d.h" -#include "WebSocket.h" +#include "network/WebSocket.h" #include "spidermonkey_specifics.h" #include "ScriptingCore.h" #include "cocos2d_specifics.hpp" diff --git a/cocos/storage/local-storage/Android.mk b/cocos/storage/local-storage/Android.mk index 67db9c191b..ee9d93e36b 100644 --- a/cocos/storage/local-storage/Android.mk +++ b/cocos/storage/local-storage/Android.mk @@ -1,19 +1,24 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := localstorage_static +LOCAL_MODULE := cocos_localstorage_static LOCAL_MODULE_FILENAME := liblocalstorage -LOCAL_SRC_FILES := LocalStorage.cpp -LocalStorageAndroid.cpp \ +LOCAL_SRC_FILES := LocalStorage.cpp \ +LocalStorageAndroid.cpp -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. + LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static + include $(BUILD_STATIC_LIBRARY) + +$(call import-module,2d) diff --git a/external/spidermonkey/prebuilt/android/Android.mk b/external/spidermonkey/prebuilt/android/Android.mk index 7891f4a46e..74f0e9b6a8 100644 --- a/external/spidermonkey/prebuilt/android/Android.mk +++ b/external/spidermonkey/prebuilt/android/Android.mk @@ -3,8 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := spidermonkey_static LOCAL_MODULE_FILENAME := js_static -LOCAL_SRC_FILES := ./lib/$(TARGET_ARCH_ABI)/libjs_static.a -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjs_static.a +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 -Wno-invalid-offsetof LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 -Wno-invalid-offsetof include $(PREBUILT_STATIC_LIBRARY) diff --git a/external/websockets/prebuilt/android/Android.mk b/external/websockets/prebuilt/android/Android.mk index a5f14e0456..1547fc6140 100644 --- a/external/websockets/prebuilt/android/Android.mk +++ b/external/websockets/prebuilt/android/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := libwebsockets_static +LOCAL_MODULE := websockets_static LOCAL_MODULE_FILENAME := libwebsockets_static LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebsockets.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk index bd0a8e37e6..f54ac22e3b 100644 --- a/samples/Cpp/TestCpp/Android.mk +++ b/samples/Cpp/TestCpp/Android.mk @@ -148,9 +148,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static LOCAL_WHOLE_STATIC_LIBRARIES += spine_static -LOCAL_WHOLE_STATIC_LIBRARIES += gui_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static -LOCAL_WHOLE_STATIC_LIBRARIES += network_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes diff --git a/samples/Javascript/TestJavascript/proj.android/build_native.sh b/samples/Javascript/TestJavascript/proj.android/build_native.sh index b3f633e707..3378f4006a 100755 --- a/samples/Javascript/TestJavascript/proj.android/build_native.sh +++ b/samples/Javascript/TestJavascript/proj.android/build_native.sh @@ -76,7 +76,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" COCOS2DX_ROOT="$DIR/../../../.." APP_ROOT="$DIR/.." APP_ANDROID_ROOT="$DIR" -BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js" +BINDINGS_JS_ROOT="$APP_ROOT/../../../cocos/scripting/javascript/script" echo echo "Paths" @@ -110,5 +110,5 @@ echo set -x "$NDK_ROOT"/ndk-build $PARALLEL_BUILD_FLAG -C "$APP_ANDROID_ROOT" $* \ - "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" \ + "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}/external" \ NDK_LOG=0 V=0 diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Android.mk b/samples/Javascript/TestJavascript/proj.android/jni/Android.mk index 5655c291c2..89d17346d0 100644 --- a/samples/Javascript/TestJavascript/proj.android/jni/Android.mk +++ b/samples/Javascript/TestJavascript/proj.android/jni/Android.mk @@ -11,20 +11,10 @@ LOCAL_SRC_FILES := testjavascript/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static -LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey -LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT +LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 include $(BUILD_SHARED_LIBRARY) -$(call import-module,cocos2dx) -$(call import-module,audio/android) -$(call import-module,extensions) -$(call import-module,scripting/javascript/spidermonkey-android) $(call import-module,scripting/javascript/bindings) -$(call import-module,cocos2dx/platform/android) From 34fe2ba02c87aa62ce8aecd69bed71c658eb7a2f Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 17 Oct 2013 14:12:43 +0800 Subject: [PATCH 2/3] Added missing icons for some iOS and Mac samples. --- build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id index 04a9dc0568..70bb169acc 100644 --- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -f0ce606901bf2ba3acceae9e9562214dde6a4c69 \ No newline at end of file +83265c81797ca614f19372a96adf326aeb21b396 \ No newline at end of file From e50f9fc43b47a24f8e51cb859635abac9edb90b8 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 17 Oct 2013 15:04:30 +0800 Subject: [PATCH 3/3] issue #2905: jsbinding samples and lua binding samples build ok on android --- cocos/2d/Android.mk | 4 +- cocos/editor-support/cocosbuilder/Android.mk | 2 +- cocos/editor-support/cocostudio/Android.mk | 2 + .../scripting/javascript/bindings/Android.mk | 2 - cocos/scripting/lua/bindings/Android.mk | 84 +++++++++--------- cocos/scripting/lua/bindings/CCBProxy.h | 2 +- .../lua/bindings/LuaOpengl.cpp.REMOVED.git-id | 2 +- .../lua/bindings/LuaScriptHandlerMgr.cpp | 2 +- external/lua/luajit/.DS_Store | Bin 0 -> 6148 bytes .../luajit/{ => prebuilt/android}/Android.mk | 4 +- .../armeabi-v7a/libluajit.a.REMOVED.git-id | 0 .../armeabi/libluajit.a.REMOVED.git-id | 0 .../android/x86/libluajit.a.REMOVED.git-id | 0 .../ios/libluajit.a.REMOVED.git-id | 0 .../mac/libluajit.a.REMOVED.git-id | 0 .../win32/lua51.dll.REMOVED.git-id | 0 .../luajit/{LuaJIT-2.0.1 => src}/COPYRIGHT | 0 .../lua/luajit/{LuaJIT-2.0.1 => src}/Makefile | 0 .../lua/luajit/{LuaJIT-2.0.1 => src}/README | 0 .../doc/bluequad-print.css | 0 .../{LuaJIT-2.0.1 => src}/doc/bluequad.css | 0 .../{LuaJIT-2.0.1 => src}/doc/changes.html | 0 .../{LuaJIT-2.0.1 => src}/doc/contact.html | 0 .../{LuaJIT-2.0.1 => src}/doc/ext_c_api.html | 0 .../{LuaJIT-2.0.1 => src}/doc/ext_ffi.html | 0 .../doc/ext_ffi_api.html | 0 .../doc/ext_ffi_semantics.html | 0 .../doc/ext_ffi_tutorial.html | 0 .../{LuaJIT-2.0.1 => src}/doc/ext_jit.html | 0 .../{LuaJIT-2.0.1 => src}/doc/extensions.html | 0 .../luajit/{LuaJIT-2.0.1 => src}/doc/faq.html | 0 .../{LuaJIT-2.0.1 => src}/doc/install.html | 0 .../{LuaJIT-2.0.1 => src}/doc/luajit.html | 0 .../{LuaJIT-2.0.1 => src}/doc/running.html | 0 .../{LuaJIT-2.0.1 => src}/doc/status.html | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.h | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.lua | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_mips.h | 0 .../dynasm/dasm_mips.lua | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.h | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.lua | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_proto.h | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_x64.lua | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.h | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.lua | 0 .../{LuaJIT-2.0.1 => src}/dynasm/dynasm.lua | 0 .../luajit/{LuaJIT-2.0.1 => src}/etc/luajit.1 | 0 .../{LuaJIT-2.0.1 => src}/etc/luajit.pc | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/Makefile | 0 .../{LuaJIT-2.0.1 => src}/src/Makefile.dep | 0 .../{LuaJIT-2.0.1 => src}/src/host/README | 0 .../{LuaJIT-2.0.1 => src}/src/host/buildvm.c | 0 .../{LuaJIT-2.0.1 => src}/src/host/buildvm.h | 0 .../src/host/buildvm_asm.c | 0 .../src/host/buildvm_fold.c | 0 .../src/host/buildvm_lib.c | 0 .../src/host/buildvm_peobj.c | 0 .../src/host/genminilua.lua | 0 .../src/host/minilua.c.REMOVED.git-id | 0 .../{LuaJIT-2.0.1 => src}/src/jit/bc.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/bcsave.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/dis_arm.lua | 0 .../src/jit/dis_mips.lua | 0 .../src/jit/dis_mipsel.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/dis_ppc.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/dis_x64.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/dis_x86.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/dump.lua | 0 .../{LuaJIT-2.0.1 => src}/src/jit/v.lua | 0 .../{LuaJIT-2.0.1 => src}/src/lauxlib.h | 0 .../{LuaJIT-2.0.1 => src}/src/lib_aux.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_base.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_bit.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_debug.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_ffi.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_init.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lib_io.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_jit.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_math.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lib_os.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_package.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_string.c | 0 .../{LuaJIT-2.0.1 => src}/src/lib_table.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj.supp | 0 .../{LuaJIT-2.0.1 => src}/src/lj_alloc.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_alloc.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_api.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_arch.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_asm_arm.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_asm_mips.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_asm_ppc.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_asm_x86.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_bcdump.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_bcread.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_bcwrite.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_carith.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_carith.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ccall.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ccall.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ccallback.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ccallback.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_cconv.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_cconv.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_cdata.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_cdata.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_char.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_char.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_clib.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_clib.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_cparse.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_cparse.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_crecord.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_crecord.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ctype.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ctype.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_debug.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_debug.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_def.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_dispatch.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_dispatch.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_emit_arm.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_emit_mips.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_emit_ppc.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_emit_x86.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_err.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_err.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_errmsg.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_ff.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ffrecord.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ffrecord.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_frame.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_func.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_func.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_gdbjit.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_gdbjit.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_ircall.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_iropt.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_jit.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_load.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_mcode.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_mcode.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_meta.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_meta.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_dce.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_fold.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_loop.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_mem.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_narrow.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_sink.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_opt_split.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_parse.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_parse.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_record.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_record.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_snap.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_snap.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_state.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_state.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_str.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_str.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_strscan.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_strscan.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_target.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_target_arm.h | 0 .../src/lj_target_mips.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_target_ppc.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_target_x86.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_trace.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_trace.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_traceerr.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_udata.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_udata.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lj_vm.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_vmevent.c | 0 .../{LuaJIT-2.0.1 => src}/src/lj_vmevent.h | 0 .../{LuaJIT-2.0.1 => src}/src/lj_vmmath.c | 0 .../{LuaJIT-2.0.1 => src}/src/ljamalg.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lua.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lua.hpp | 0 .../{LuaJIT-2.0.1 => src}/src/luaconf.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/luajit.c | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/luajit.h | 0 .../luajit/{LuaJIT-2.0.1 => src}/src/lualib.h | 0 .../{LuaJIT-2.0.1 => src}/src/msvcbuild.bat | 0 .../src/vm_arm.dasc.REMOVED.git-id | 0 .../src/vm_mips.dasc.REMOVED.git-id | 0 .../src/vm_ppc.dasc.REMOVED.git-id | 0 .../src/vm_ppcspe.dasc.REMOVED.git-id | 0 .../src/vm_x86.dasc.REMOVED.git-id | 0 .../{LuaJIT-2.0.1 => src}/src/xedkbuild.bat | 0 .../v2.0.1_hotfix1.patch | 0 samples/Cpp/TestCpp/Android.mk | 2 - .../proj.android/build_native.sh | 4 +- .../CocosDragonJS/proj.android/jni/Android.mk | 10 +-- .../CrystalCraze/proj.android/build_native.sh | 4 +- .../CrystalCraze/proj.android/jni/Android.mk | 10 +-- .../MoonWarriors/proj.android/build_native.sh | 4 +- .../MoonWarriors/proj.android/jni/Android.mk | 12 +-- .../proj.android/build_native.sh | 4 +- .../proj.android/jni/Android.mk | 12 +-- .../Lua/HelloLua/proj.android/build_native.sh | 2 +- .../Lua/HelloLua/proj.android/jni/Android.mk | 2 +- .../Lua/TestLua/proj.android/build_native.sh | 6 +- .../Lua/TestLua/proj.android/jni/Android.mk | 15 +--- .../proj.android/build_native.sh | 4 +- .../proj.android/jni/Android.mk | 12 +-- .../proj.android/build_native.sh | 6 +- .../proj.android/jni/Android.mk | 11 +-- 224 files changed, 84 insertions(+), 140 deletions(-) create mode 100644 external/lua/luajit/.DS_Store rename external/lua/luajit/{ => prebuilt/android}/Android.mk (58%) rename external/lua/luajit/{ => prebuilt}/android/armeabi-v7a/libluajit.a.REMOVED.git-id (100%) rename external/lua/luajit/{ => prebuilt}/android/armeabi/libluajit.a.REMOVED.git-id (100%) rename external/lua/luajit/{ => prebuilt}/android/x86/libluajit.a.REMOVED.git-id (100%) rename external/lua/luajit/{ => prebuilt}/ios/libluajit.a.REMOVED.git-id (100%) rename external/lua/luajit/{ => prebuilt}/mac/libluajit.a.REMOVED.git-id (100%) rename external/lua/luajit/{ => prebuilt}/win32/lua51.dll.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/COPYRIGHT (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/Makefile (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/README (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/bluequad-print.css (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/bluequad.css (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/changes.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/contact.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_c_api.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi_api.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi_semantics.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_ffi_tutorial.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/ext_jit.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/extensions.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/faq.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/install.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/luajit.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/running.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/doc/status.html (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_arm.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_mips.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_mips.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_ppc.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_proto.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_x64.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dasm_x86.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/dynasm/dynasm.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/etc/luajit.1 (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/etc/luajit.pc (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/Makefile (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/Makefile.dep (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/README (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_asm.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_fold.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_lib.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/buildvm_peobj.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/genminilua.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/host/minilua.c.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/bc.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/bcsave.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_arm.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_mips.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_mipsel.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_ppc.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_x64.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dis_x86.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/dump.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/jit/v.lua (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lauxlib.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_aux.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_base.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_bit.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_debug.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_ffi.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_init.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_io.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_jit.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_math.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_os.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_package.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_string.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lib_table.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj.supp (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_alloc.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_alloc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_api.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_arch.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_arm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_mips.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_ppc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_asm_x86.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bcdump.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bcread.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_bcwrite.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_carith.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_carith.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccall.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccall.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccallback.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ccallback.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cconv.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cconv.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cdata.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cdata.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_char.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_char.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_clib.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_clib.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cparse.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_cparse.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_crecord.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_crecord.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ctype.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ctype.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_debug.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_debug.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_def.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_dispatch.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_dispatch.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_arm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_mips.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_ppc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_emit_x86.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_err.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_err.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_errmsg.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ff.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ffrecord.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ffrecord.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_frame.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_func.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_func.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gdbjit.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_gdbjit.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ir.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_ircall.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_iropt.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_jit.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lex.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_lib.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_load.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_mcode.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_mcode.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_meta.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_meta.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_obj.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_dce.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_fold.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_loop.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_mem.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_narrow.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_sink.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_opt_split.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_parse.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_parse.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_record.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_record.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_snap.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_snap.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_state.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_state.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_str.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_str.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_strscan.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_strscan.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_tab.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_arm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_mips.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_ppc.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_target_x86.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_trace.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_trace.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_traceerr.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_udata.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_udata.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vm.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vmevent.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vmevent.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lj_vmmath.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/ljamalg.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lua.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lua.hpp (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/luaconf.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/luajit.c (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/luajit.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/lualib.h (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/msvcbuild.bat (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_arm.dasc.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_mips.dasc.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_ppc.dasc.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_ppcspe.dasc.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/vm_x86.dasc.REMOVED.git-id (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/src/xedkbuild.bat (100%) rename external/lua/luajit/{LuaJIT-2.0.1 => src}/v2.0.1_hotfix1.patch (100%) diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk index 20017089fe..7e60320ddb 100644 --- a/cocos/2d/Android.mk +++ b/cocos/2d/Android.mk @@ -201,8 +201,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static # define the macro to compile through support/zip_support/ioapi.c -LOCAL_CFLAGS := -Wno-psabi -DUSE_FILE32API +LOCAL_CFLAGS := -Wno-psabi -DUSE_FILE32API +LOCAL_CPPFLAGS := -Wno-literal-suffix LOCAL_EXPORT_CFLAGS := -Wno-psabi -DUSE_FILE32API +LOCAL_EXPORT_CPPFLAGS := -Wno-literal-suffix include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk index dd6b2b3b77..4685debd1b 100644 --- a/cocos/editor-support/cocosbuilder/Android.mk +++ b/cocos/editor-support/cocosbuilder/Android.mk @@ -29,7 +29,7 @@ CCScale9SpriteLoader.cpp \ CCScrollViewLoader.cpp \ CCSpriteLoader.cpp -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/ \ +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../../.. LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \ diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index b7dfa3838c..380eeba149 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -56,9 +56,11 @@ LOCAL_EXPORT_CFLAGS += -Wno-psabi LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static include $(BUILD_STATIC_LIBRARY) $(call import-module,2d) $(call import-module,audio/android) +$(call import-module,gui) diff --git a/cocos/scripting/javascript/bindings/Android.mk b/cocos/scripting/javascript/bindings/Android.mk index 7482cdef26..27a3b51306 100644 --- a/cocos/scripting/javascript/bindings/Android.mk +++ b/cocos/scripting/javascript/bindings/Android.mk @@ -52,7 +52,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static LOCAL_LDLIBS := -landroid LOCAL_LDLIBS += -llog @@ -70,4 +69,3 @@ $(call import-module,chipmunk) $(call import-module,storage/local-storage) $(call import-module,editor-support/cocostudio) $(call import-module,websockets/prebuilt/android) -$(call import-module,gui) diff --git a/cocos/scripting/lua/bindings/Android.mk b/cocos/scripting/lua/bindings/Android.mk index 8d1130ba3c..a5293f66a2 100644 --- a/cocos/scripting/lua/bindings/Android.mk +++ b/cocos/scripting/lua/bindings/Android.mk @@ -5,61 +5,59 @@ LOCAL_MODULE := cocos_lua_static LOCAL_MODULE_FILENAME := liblua -LOCAL_SRC_FILES := ../cocos2dx_support/CCLuaBridge.cpp \ - ../cocos2dx_support/CCLuaEngine.cpp \ - ../cocos2dx_support/CCLuaStack.cpp \ - ../cocos2dx_support/CCLuaValue.cpp \ - ../cocos2dx_support/Cocos2dxLuaLoader.cpp \ - ../cocos2dx_support/CCBProxy.cpp \ - ../cocos2dx_support/Lua_web_socket.cpp \ - ../cocos2dx_support/LuaOpengl.cpp \ - ../cocos2dx_support/LuaScriptHandlerMgr.cpp \ - ../cocos2dx_support/LuaBasicConversions.cpp \ +LOCAL_SRC_FILES := CCLuaBridge.cpp \ + CCLuaEngine.cpp \ + CCLuaStack.cpp \ + CCLuaValue.cpp \ + Cocos2dxLuaLoader.cpp \ + CCBProxy.cpp \ + Lua_web_socket.cpp \ + LuaOpengl.cpp \ + LuaScriptHandlerMgr.cpp \ + LuaBasicConversions.cpp \ ../../auto-generated/lua-bindings/lua_cocos2dx_auto.cpp \ ../../auto-generated/lua-bindings/lua_cocos2dx_extension_auto.cpp \ - ../cocos2dx_support/lua_cocos2dx_manual.cpp \ - ../cocos2dx_support/lua_cocos2dx_extension_manual.cpp \ - ../cocos2dx_support/lua_cocos2dx_deprecated.cpp \ - ../cocos2dx_support/platform/android/CCLuaJavaBridge.cpp \ - ../cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \ - ../tolua/tolua_event.c \ - ../tolua/tolua_is.c \ - ../tolua/tolua_map.c \ - ../tolua/tolua_push.c \ - ../tolua/tolua_to.c \ - ../cocos2dx_support/tolua_fix.c + lua_cocos2dx_manual.cpp \ + lua_cocos2dx_extension_manual.cpp \ + lua_cocos2dx_deprecated.cpp \ + platform/android/CCLuaJavaBridge.cpp \ + platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \ + ../../../../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 \ + tolua_fix.c -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../luajit/include \ - $(LOCAL_PATH)/../tolua \ - $(LOCAL_PATH)/../cocos2dx_support \ - $(LOCAL_PATH)/../../auto-generated/lua-bindings \ - $(LOCAL_PATH)/../cocos2dx_support/platform/android \ - $(LOCAL_PATH)/../cocos2dx_support/platform/android/jni - - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/ \ - $(LOCAL_PATH)/../luajit/include \ - $(LOCAL_PATH)/../tolua \ - $(LOCAL_PATH)/../../../cocos2dx \ - $(LOCAL_PATH)/../../../cocos2dx/include \ - $(LOCAL_PATH)/../../../cocos2dx/platform \ - $(LOCAL_PATH)/../../../cocos2dx/platform/android \ - $(LOCAL_PATH)/../../../cocos2dx/kazmath/include \ - $(LOCAL_PATH)/../../../CocosDenshion/include \ - $(LOCAL_PATH)/../../../extensions \ - $(LOCAL_PATH)/../cocos2dx_support \ +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \ $(LOCAL_PATH)/../../auto-generated/lua-bindings \ - $(LOCAL_PATH)/../cocos2dx_support/platform/android \ - $(LOCAL_PATH)/../cocos2dx_support/platform/android/jni + $(LOCAL_PATH)/platform/android \ + $(LOCAL_PATH)/platform/android/jni \ + $(LOCAL_PATH)/../../../../extensions \ + $(LOCAL_PATH)/../../../editor-support/cocosbuilder \ + $(LOCAL_PATH)/../../../editor-support/cocostudio + + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static +LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi include $(BUILD_STATIC_LIBRARY) -$(call import-module,scripting/lua/luajit) +$(call import-module,lua/luajit/prebuilt/android) $(call import-module,extensions) +$(call import-module,2d) +$(call import-module,websockets/prebuilt/android) +$(call import-module,network) +$(call import-module,editor-support/cocostudio) +$(call import-module,editor-support/cocosbuilder) diff --git a/cocos/scripting/lua/bindings/CCBProxy.h b/cocos/scripting/lua/bindings/CCBProxy.h index 082bf09db1..a073db913b 100644 --- a/cocos/scripting/lua/bindings/CCBProxy.h +++ b/cocos/scripting/lua/bindings/CCBProxy.h @@ -4,7 +4,7 @@ #include "cocos2d.h" #include "CCLuaEngine.h" #include "SimpleAudioEngine.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" USING_NS_CC; diff --git a/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id b/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id index a50fda9d51..bc4c41058d 100644 --- a/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id +++ b/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id @@ -1 +1 @@ -a57fbb5f0f9564858ced00cf47af905e6a7900c6 \ No newline at end of file +4456a3ba6fbd68175b40e607c6bc19bdfc378ce1 \ No newline at end of file diff --git a/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp index 7b663307a3..ab4d01bd01 100644 --- a/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp +++ b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp @@ -10,7 +10,7 @@ extern "C" { #include #include "LuaScriptHandlerMgr.h" #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "CCLuaStack.h" #include "CCLuaValue.h" #include "CCLuaEngine.h" diff --git a/external/lua/luajit/.DS_Store b/external/lua/luajit/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0