From 00ee4160064f682a436eb4e1c6386f5bdad51d55 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2013 16:21:55 +0800 Subject: [PATCH 1/5] issue #2905: [iOS Mac] All js games work now. --- build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp | 2 ++ samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp | 3 ++- samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp | 2 +- samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id index 5be8a11389..cc5cbe86bf 100644 --- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -eb61a6b65e5947b285b970192a8d0c129f807556 \ No newline at end of file +a4c6fec549057de458346127f489e6e6bea2f0d1 \ No newline at end of file diff --git a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp b/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp index 3530e7e4fe..3276d5deda 100644 --- a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp +++ b/samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp @@ -36,6 +36,8 @@ bool AppDelegate::applicationDidFinishLaunching() pDirector->setProjection(Director::Projection::_2D); + FileUtils::getInstance()->addSearchPath("script"); + auto screenSize = EGLView::getInstance()->getFrameSize(); auto designSize = Size(320, 480); diff --git a/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp b/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp index 5b607d407c..27520db220 100644 --- a/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp +++ b/samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp @@ -31,13 +31,14 @@ bool AppDelegate::applicationDidFinishLaunching() pDirector->setOpenGLView(EGLView::getInstance()); pDirector->setProjection(Director::Projection::_2D); + FileUtils::getInstance()->addSearchPath("script"); auto screenSize = EGLView::getInstance()->getFrameSize(); auto designSize = Size(320, 480); auto resourceSize = Size(320, 480); - std::vector searchPaths; + std::vector searchPaths = FileUtils::getInstance()->getSearchPaths(); std::vector resDirOrders; Application::Platform platform = Application::getInstance()->getTargetPlatform(); diff --git a/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp b/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp index 0f69f2cff7..7e7a33a156 100644 --- a/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp +++ b/samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp @@ -40,7 +40,7 @@ bool AppDelegate::applicationDidFinishLaunching() // set FPS. the default value is 1.0/60 if you don't call this pDirector->setAnimationInterval(1.0 / 60); - FileUtils::getInstance()->addSearchPath("js"); + FileUtils::getInstance()->addSearchPath("script"); ScriptingCore* sc = ScriptingCore::getInstance(); sc->addRegisterCallback(register_all_cocos2dx); diff --git a/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp b/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp index dcfdb8e970..3e9c616b35 100644 --- a/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp +++ b/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp @@ -38,6 +38,8 @@ bool AppDelegate::applicationDidFinishLaunching() EGLView::getInstance()->setDesignResolutionSize(480, 320, ResolutionPolicy::FIXED_HEIGHT); + FileUtils::getInstance()->addSearchPath("script"); + ScriptingCore* sc = ScriptingCore::getInstance(); sc->addRegisterCallback(register_all_cocos2dx); sc->addRegisterCallback(register_all_cocos2dx_extension); From 5c5f2d84e2a1d4018fa5311c029a9b5591bf79c3 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2013 16:27:45 +0800 Subject: [PATCH 2/5] issue #2905: Updating tolua settings. --- tools/tolua/cocos2dx.ini | 6 +++--- tools/tolua/cocos2dx_extension.ini | 6 +++--- tools/tolua/genbindings.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index cc59df0bdb..8721cdba4f 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -13,16 +13,16 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos2dx/include -I%(cocosdir)s/cocos2dx/platform -I%(cocosdir)s/cocos2dx/platform/android -I%(cocosdir)s/cocos2dx -I%(cocosdir)s/cocos2dx/kazmath/include +cocos_headers = -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath/include cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT -cxxgenerator_headers = -I%(cxxgeneratordir)s/targets/spidermonkey/common +cxxgenerator_headers = # extra arguments for clang extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/cocos2dx/include/cocos2d.h %(cocosdir)s/audio/include/SimpleAudioEngine.h +headers = %(cocosdir)s/cocos/2d/cocos2d.h %(cocosdir)s/cocos/audio/include/SimpleAudioEngine.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/cocos2dx_extension.ini b/tools/tolua/cocos2dx_extension.ini index ce914cf508..67d87c51d6 100644 --- a/tools/tolua/cocos2dx_extension.ini +++ b/tools/tolua/cocos2dx_extension.ini @@ -13,16 +13,16 @@ android_flags = -D_SIZE_T_DEFINED_ clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include clang_flags = -nostdinc -x c++ -std=c++11 -cocos_headers = -I%(cocosdir)s/cocos2dx/include -I%(cocosdir)s/cocos2dx/platform -I%(cocosdir)s/cocos2dx/platform/android -I%(cocosdir)s/cocos2dx -I%(cocosdir)s/cocos2dx/kazmath/include -I%(cocosdir)s/extensions +cocos_headers = -I%(cocosdir)s/cocos/2d -I%(cocosdir)s/cocos/base -I%(cocosdir)s/cocos/gui -I%(cocosdir)s/cocos/physics -I%(cocosdir)s/cocos/2d/platform -I%(cocosdir)s/cocos/2d/platform/android -I%(cocosdir)s/cocos/math/kazmath/include -I%(cocosdir)s/extensions -I%(cocosdir)s/external -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s cocos_flags = -DANDROID -DCOCOS2D_JAVASCRIPT -cxxgenerator_headers = -I%(cxxgeneratordir)s/targets/spidermonkey/common +cxxgenerator_headers = # extra arguments for clang extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/extensions/cocos-ext.h +headers = %(cocosdir)s/extensions/cocos-ext.h %(cocosdir)s/cocos/editor-support/cocosbuilder/CocosBuilder.h %(cocosdir)s/cocos/editor-support/cocostudio/CocoStudio.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". diff --git a/tools/tolua/genbindings.sh b/tools/tolua/genbindings.sh index ba6033c7fc..b236c43ae8 100755 --- a/tools/tolua/genbindings.sh +++ b/tools/tolua/genbindings.sh @@ -80,7 +80,7 @@ echo --- # Generate bindings for cocos2dx echo "Generating bindings for cocos2dx..." set -x -LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx.ini -s cocos2d-x -t lua -o ${COCOS2DX_ROOT}/scripting/auto-generated/lua-bindings -n lua_cocos2dx_auto +LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx.ini -s cocos2d-x -t lua -o ${COCOS2DX_ROOT}/cocos/scripting/auto-generated/lua-bindings -n lua_cocos2dx_auto echo "Generating bindings for cocos2dx_extension..." -LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx_extension.ini -s cocos2dx_extension -t lua -o ${COCOS2DX_ROOT}/scripting/auto-generated/lua-bindings -n lua_cocos2dx_extension_auto +LD_LIBRARY_PATH=${CLANG_ROOT}/lib $PYTHON_BIN ${CXX_GENERATOR_ROOT}/generator.py ${TO_JS_ROOT}/cocos2dx_extension.ini -s cocos2dx_extension -t lua -o ${COCOS2DX_ROOT}/cocos/scripting/auto-generated/lua-bindings -n lua_cocos2dx_extension_auto From 352d1f676808706e1ec032f3ec1801c584614e4a Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2013 16:40:07 +0800 Subject: [PATCH 3/5] issue #2905: Renaming lua/cocos2dx_support to lua/bindings. --- cocos/scripting/lua/{proj.linux => bindings}/.cproject | 0 cocos/scripting/lua/{proj.linux => bindings}/.project | 0 cocos/scripting/lua/{proj.android => bindings}/Android.mk | 0 .../lua/{cocos2dx_support => bindings}/CCBProxy.cpp | 0 .../lua/{cocos2dx_support => bindings}/CCBProxy.h | 0 .../lua/{cocos2dx_support => bindings}/CCLuaBridge.cpp | 0 .../lua/{cocos2dx_support => bindings}/CCLuaBridge.h | 0 .../lua/{cocos2dx_support => bindings}/CCLuaEngine.cpp | 0 .../lua/{cocos2dx_support => bindings}/CCLuaEngine.h | 0 .../lua/{cocos2dx_support => bindings}/CCLuaStack.cpp | 0 .../lua/{cocos2dx_support => bindings}/CCLuaStack.h | 0 .../lua/{cocos2dx_support => bindings}/CCLuaValue.cpp | 0 .../lua/{cocos2dx_support => bindings}/CCLuaValue.h | 0 .../{cocos2dx_support => bindings}/Cocos2dxLuaLoader.cpp | 0 .../lua/{cocos2dx_support => bindings}/Cocos2dxLuaLoader.h | 0 .../{cocos2dx_support => bindings}/LuaBasicConversions.cpp | 0 .../{cocos2dx_support => bindings}/LuaBasicConversions.h | 0 .../LuaOpengl.cpp.REMOVED.git-id | 0 .../lua/{cocos2dx_support => bindings}/LuaOpengl.h | 0 .../{cocos2dx_support => bindings}/LuaScriptHandlerMgr.cpp | 0 .../{cocos2dx_support => bindings}/LuaScriptHandlerMgr.h | 0 .../lua/{cocos2dx_support => bindings}/Lua_web_socket.cpp | 0 .../lua/{cocos2dx_support => bindings}/Lua_web_socket.h | 0 cocos/scripting/lua/{proj.linux => bindings}/Makefile | 0 .../scripting/lua/{proj.win32 => bindings}/liblua.vcxproj | 0 .../lua/{proj.win32 => bindings}/liblua.vcxproj.filters | 0 .../lua/{proj.win32 => bindings}/liblua.vcxproj.user | 0 .../lua_cocos2dx_deprecated.cpp.REMOVED.git-id | 0 .../lua_cocos2dx_deprecated.h | 0 .../lua_cocos2dx_extension_manual.cpp | 0 .../lua_cocos2dx_extension_manual.h | 0 .../{cocos2dx_support => bindings}/lua_cocos2dx_manual.cpp | 0 .../{cocos2dx_support => bindings}/lua_cocos2dx_manual.hpp | 0 .../platform/android/CCLuaJavaBridge.cpp | 0 .../platform/android/CCLuaJavaBridge.h | 0 .../jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp | 0 .../jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h | 0 .../platform/ios/CCLuaObjcBridge.h | 0 .../platform/ios/CCLuaObjcBridge.mm | 0 .../lua/{cocos2dx_support => bindings}/tolua_fix.c | 0 .../lua/{cocos2dx_support => bindings}/tolua_fix.h | 0 cocos/scripting/lua/proj.ios/luabindings-Prefix.pch | 7 ------- {cocos/scripting => external}/lua/lua/lapi.c | 0 {cocos/scripting => external}/lua/lua/lapi.h | 0 {cocos/scripting => external}/lua/lua/lauxlib.c | 0 {cocos/scripting => external}/lua/lua/lauxlib.h | 0 {cocos/scripting => external}/lua/lua/lbaselib.c | 0 {cocos/scripting => external}/lua/lua/lcode.c | 0 {cocos/scripting => external}/lua/lua/lcode.h | 0 {cocos/scripting => external}/lua/lua/ldblib.c | 0 {cocos/scripting => external}/lua/lua/ldebug.c | 0 {cocos/scripting => external}/lua/lua/ldebug.h | 0 {cocos/scripting => external}/lua/lua/ldo.c | 0 {cocos/scripting => external}/lua/lua/ldo.h | 0 {cocos/scripting => external}/lua/lua/ldump.c | 0 {cocos/scripting => external}/lua/lua/lfunc.c | 0 {cocos/scripting => external}/lua/lua/lfunc.h | 0 {cocos/scripting => external}/lua/lua/lgc.c | 0 {cocos/scripting => external}/lua/lua/lgc.h | 0 {cocos/scripting => external}/lua/lua/linit.c | 0 {cocos/scripting => external}/lua/lua/liolib.c | 0 {cocos/scripting => external}/lua/lua/llex.c | 0 {cocos/scripting => external}/lua/lua/llex.h | 0 {cocos/scripting => external}/lua/lua/llimits.h | 0 {cocos/scripting => external}/lua/lua/lmathlib.c | 0 {cocos/scripting => external}/lua/lua/lmem.c | 0 {cocos/scripting => external}/lua/lua/lmem.h | 0 {cocos/scripting => external}/lua/lua/loadlib.c | 0 {cocos/scripting => external}/lua/lua/lobject.c | 0 {cocos/scripting => external}/lua/lua/lobject.h | 0 {cocos/scripting => external}/lua/lua/lopcodes.c | 0 {cocos/scripting => external}/lua/lua/lopcodes.h | 0 {cocos/scripting => external}/lua/lua/loslib.c | 0 {cocos/scripting => external}/lua/lua/lparser.c | 0 {cocos/scripting => external}/lua/lua/lparser.h | 0 {cocos/scripting => external}/lua/lua/lstate.c | 0 {cocos/scripting => external}/lua/lua/lstate.h | 0 {cocos/scripting => external}/lua/lua/lstring.c | 0 {cocos/scripting => external}/lua/lua/lstring.h | 0 {cocos/scripting => external}/lua/lua/lstrlib.c | 0 {cocos/scripting => external}/lua/lua/ltable.c | 0 {cocos/scripting => external}/lua/lua/ltable.h | 0 {cocos/scripting => external}/lua/lua/ltablib.c | 0 {cocos/scripting => external}/lua/lua/ltm.c | 0 {cocos/scripting => external}/lua/lua/ltm.h | 0 {cocos/scripting => external}/lua/lua/lua.c | 0 {cocos/scripting => external}/lua/lua/lua.h | 0 {cocos/scripting => external}/lua/lua/luaconf.h | 0 {cocos/scripting => external}/lua/lua/lualib.h | 0 {cocos/scripting => external}/lua/lua/lundump.c | 0 {cocos/scripting => external}/lua/lua/lundump.h | 0 {cocos/scripting => external}/lua/lua/lvm.c | 0 {cocos/scripting => external}/lua/lua/lvm.h | 0 {cocos/scripting => external}/lua/lua/lzio.c | 0 {cocos/scripting => external}/lua/lua/lzio.h | 0 {cocos/scripting => external}/lua/lua/print.c | 0 {cocos/scripting => external}/lua/luajit/Android.mk | 0 .../lua/luajit/LuaJIT-2.0.1/COPYRIGHT | 0 .../lua/luajit/LuaJIT-2.0.1/Makefile | 0 .../scripting => external}/lua/luajit/LuaJIT-2.0.1/README | 0 .../lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css | 0 .../lua/luajit/LuaJIT-2.0.1/doc/bluequad.css | 0 .../lua/luajit/LuaJIT-2.0.1/doc/changes.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/contact.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/extensions.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/faq.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/install.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/luajit.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/running.html | 0 .../lua/luajit/LuaJIT-2.0.1/doc/status.html | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua | 0 .../lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua | 0 .../lua/luajit/LuaJIT-2.0.1/etc/luajit.1 | 0 .../lua/luajit/LuaJIT-2.0.1/etc/luajit.pc | 0 .../lua/luajit/LuaJIT-2.0.1/src/Makefile | 0 .../lua/luajit/LuaJIT-2.0.1/src/Makefile.dep | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/README | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua | 0 .../luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/jit/v.lua | 0 .../lua/luajit/LuaJIT-2.0.1/src/lauxlib.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_aux.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_base.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_bit.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_debug.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_init.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_io.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_jit.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_math.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_os.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_package.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_string.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lib_table.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj.supp | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_api.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_arch.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_asm.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_asm.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_bc.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_bc.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_carith.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_carith.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_char.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_char.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_clib.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_clib.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_debug.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_debug.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_def.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_err.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_err.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ff.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_frame.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_func.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_func.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_gc.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_gc.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ir.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ir.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_jit.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_lex.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_lex.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_lib.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_lib.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_load.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_meta.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_meta.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_obj.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_obj.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_parse.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_parse.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_record.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_record.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_snap.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_snap.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_state.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_state.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_str.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_str.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_tab.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_tab.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_target.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_trace.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_trace.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_udata.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_udata.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_vm.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/ljamalg.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/lua.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lua.hpp | 0 .../lua/luajit/LuaJIT-2.0.1/src/luaconf.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/luajit.c | 0 .../lua/luajit/LuaJIT-2.0.1/src/luajit.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/lualib.h | 0 .../lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat | 0 .../lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id | 0 .../luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id | 0 .../lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id | 0 .../luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id | 0 .../lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id | 0 .../lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat | 0 .../lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch | 0 .../luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id | 0 .../lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id | 0 .../lua/luajit/android/x86/libluajit.a.REMOVED.git-id | 0 {cocos/scripting => external}/lua/luajit/build_android.sh | 0 {cocos/scripting => external}/lua/luajit/build_ios.sh | 0 {cocos/scripting => external}/lua/luajit/build_mac.sh | 0 {cocos/scripting => external}/lua/luajit/include/lauxlib.h | 0 {cocos/scripting => external}/lua/luajit/include/lua.h | 0 {cocos/scripting => external}/lua/luajit/include/luaconf.h | 0 {cocos/scripting => external}/lua/luajit/include/lualib.h | 0 .../lua/luajit/ios/libluajit.a.REMOVED.git-id | 0 .../lua/luajit/mac/libluajit.a.REMOVED.git-id | 0 .../lua/luajit/win32/lua51.dll.REMOVED.git-id | 0 {cocos/scripting => external}/lua/tolua/tolua++.h | 0 {cocos/scripting => external}/lua/tolua/tolua_event.c | 0 {cocos/scripting => external}/lua/tolua/tolua_event.h | 0 {cocos/scripting => external}/lua/tolua/tolua_is.c | 0 {cocos/scripting => external}/lua/tolua/tolua_map.c | 0 {cocos/scripting => external}/lua/tolua/tolua_push.c | 0 {cocos/scripting => external}/lua/tolua/tolua_to.c | 0 308 files changed, 7 deletions(-) rename cocos/scripting/lua/{proj.linux => bindings}/.cproject (100%) rename cocos/scripting/lua/{proj.linux => bindings}/.project (100%) rename cocos/scripting/lua/{proj.android => bindings}/Android.mk (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCBProxy.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCBProxy.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaBridge.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaBridge.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaEngine.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaEngine.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaStack.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaStack.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaValue.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/CCLuaValue.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/Cocos2dxLuaLoader.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/Cocos2dxLuaLoader.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/LuaBasicConversions.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/LuaBasicConversions.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/LuaOpengl.cpp.REMOVED.git-id (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/LuaOpengl.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/LuaScriptHandlerMgr.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/LuaScriptHandlerMgr.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/Lua_web_socket.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/Lua_web_socket.h (100%) rename cocos/scripting/lua/{proj.linux => bindings}/Makefile (100%) rename cocos/scripting/lua/{proj.win32 => bindings}/liblua.vcxproj (100%) rename cocos/scripting/lua/{proj.win32 => bindings}/liblua.vcxproj.filters (100%) rename cocos/scripting/lua/{proj.win32 => bindings}/liblua.vcxproj.user (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/lua_cocos2dx_deprecated.cpp.REMOVED.git-id (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/lua_cocos2dx_deprecated.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/lua_cocos2dx_extension_manual.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/lua_cocos2dx_extension_manual.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/lua_cocos2dx_manual.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/lua_cocos2dx_manual.hpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/platform/android/CCLuaJavaBridge.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/platform/android/CCLuaJavaBridge.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/platform/ios/CCLuaObjcBridge.h (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/platform/ios/CCLuaObjcBridge.mm (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/tolua_fix.c (100%) rename cocos/scripting/lua/{cocos2dx_support => bindings}/tolua_fix.h (100%) delete mode 100644 cocos/scripting/lua/proj.ios/luabindings-Prefix.pch rename {cocos/scripting => external}/lua/lua/lapi.c (100%) rename {cocos/scripting => external}/lua/lua/lapi.h (100%) rename {cocos/scripting => external}/lua/lua/lauxlib.c (100%) rename {cocos/scripting => external}/lua/lua/lauxlib.h (100%) rename {cocos/scripting => external}/lua/lua/lbaselib.c (100%) rename {cocos/scripting => external}/lua/lua/lcode.c (100%) rename {cocos/scripting => external}/lua/lua/lcode.h (100%) rename {cocos/scripting => external}/lua/lua/ldblib.c (100%) rename {cocos/scripting => external}/lua/lua/ldebug.c (100%) rename {cocos/scripting => external}/lua/lua/ldebug.h (100%) rename {cocos/scripting => external}/lua/lua/ldo.c (100%) rename {cocos/scripting => external}/lua/lua/ldo.h (100%) rename {cocos/scripting => external}/lua/lua/ldump.c (100%) rename {cocos/scripting => external}/lua/lua/lfunc.c (100%) rename {cocos/scripting => external}/lua/lua/lfunc.h (100%) rename {cocos/scripting => external}/lua/lua/lgc.c (100%) rename {cocos/scripting => external}/lua/lua/lgc.h (100%) rename {cocos/scripting => external}/lua/lua/linit.c (100%) rename {cocos/scripting => external}/lua/lua/liolib.c (100%) rename {cocos/scripting => external}/lua/lua/llex.c (100%) rename {cocos/scripting => external}/lua/lua/llex.h (100%) rename {cocos/scripting => external}/lua/lua/llimits.h (100%) rename {cocos/scripting => external}/lua/lua/lmathlib.c (100%) rename {cocos/scripting => external}/lua/lua/lmem.c (100%) rename {cocos/scripting => external}/lua/lua/lmem.h (100%) rename {cocos/scripting => external}/lua/lua/loadlib.c (100%) rename {cocos/scripting => external}/lua/lua/lobject.c (100%) rename {cocos/scripting => external}/lua/lua/lobject.h (100%) rename {cocos/scripting => external}/lua/lua/lopcodes.c (100%) rename {cocos/scripting => external}/lua/lua/lopcodes.h (100%) rename {cocos/scripting => external}/lua/lua/loslib.c (100%) rename {cocos/scripting => external}/lua/lua/lparser.c (100%) rename {cocos/scripting => external}/lua/lua/lparser.h (100%) rename {cocos/scripting => external}/lua/lua/lstate.c (100%) rename {cocos/scripting => external}/lua/lua/lstate.h (100%) rename {cocos/scripting => external}/lua/lua/lstring.c (100%) rename {cocos/scripting => external}/lua/lua/lstring.h (100%) rename {cocos/scripting => external}/lua/lua/lstrlib.c (100%) rename {cocos/scripting => external}/lua/lua/ltable.c (100%) rename {cocos/scripting => external}/lua/lua/ltable.h (100%) rename {cocos/scripting => external}/lua/lua/ltablib.c (100%) rename {cocos/scripting => external}/lua/lua/ltm.c (100%) rename {cocos/scripting => external}/lua/lua/ltm.h (100%) rename {cocos/scripting => external}/lua/lua/lua.c (100%) rename {cocos/scripting => external}/lua/lua/lua.h (100%) rename {cocos/scripting => external}/lua/lua/luaconf.h (100%) rename {cocos/scripting => external}/lua/lua/lualib.h (100%) rename {cocos/scripting => external}/lua/lua/lundump.c (100%) rename {cocos/scripting => external}/lua/lua/lundump.h (100%) rename {cocos/scripting => external}/lua/lua/lvm.c (100%) rename {cocos/scripting => external}/lua/lua/lvm.h (100%) rename {cocos/scripting => external}/lua/lua/lzio.c (100%) rename {cocos/scripting => external}/lua/lua/lzio.h (100%) rename {cocos/scripting => external}/lua/lua/print.c (100%) rename {cocos/scripting => external}/lua/luajit/Android.mk (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/COPYRIGHT (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/Makefile (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/README (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/changes.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/contact.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/extensions.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/faq.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/install.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/luajit.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/running.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/doc/status.html (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/etc/luajit.1 (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/Makefile (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/README (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_base.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_init.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_io.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_math.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_os.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_package.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_string.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lib_table.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj.supp (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_api.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_char.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_char.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_def.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_err.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_err.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_func.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_func.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_load.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_record.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_record.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_state.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_state.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_str.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_str.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_target.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lua.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lua.hpp (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/luaconf.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/luajit.c (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/luajit.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/lualib.h (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat (100%) rename {cocos/scripting => external}/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch (100%) rename {cocos/scripting => external}/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/android/x86/libluajit.a.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/build_android.sh (100%) rename {cocos/scripting => external}/lua/luajit/build_ios.sh (100%) rename {cocos/scripting => external}/lua/luajit/build_mac.sh (100%) rename {cocos/scripting => external}/lua/luajit/include/lauxlib.h (100%) rename {cocos/scripting => external}/lua/luajit/include/lua.h (100%) rename {cocos/scripting => external}/lua/luajit/include/luaconf.h (100%) rename {cocos/scripting => external}/lua/luajit/include/lualib.h (100%) rename {cocos/scripting => external}/lua/luajit/ios/libluajit.a.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/mac/libluajit.a.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/luajit/win32/lua51.dll.REMOVED.git-id (100%) rename {cocos/scripting => external}/lua/tolua/tolua++.h (100%) rename {cocos/scripting => external}/lua/tolua/tolua_event.c (100%) rename {cocos/scripting => external}/lua/tolua/tolua_event.h (100%) rename {cocos/scripting => external}/lua/tolua/tolua_is.c (100%) rename {cocos/scripting => external}/lua/tolua/tolua_map.c (100%) rename {cocos/scripting => external}/lua/tolua/tolua_push.c (100%) rename {cocos/scripting => external}/lua/tolua/tolua_to.c (100%) diff --git a/cocos/scripting/lua/proj.linux/.cproject b/cocos/scripting/lua/bindings/.cproject similarity index 100% rename from cocos/scripting/lua/proj.linux/.cproject rename to cocos/scripting/lua/bindings/.cproject diff --git a/cocos/scripting/lua/proj.linux/.project b/cocos/scripting/lua/bindings/.project similarity index 100% rename from cocos/scripting/lua/proj.linux/.project rename to cocos/scripting/lua/bindings/.project diff --git a/cocos/scripting/lua/proj.android/Android.mk b/cocos/scripting/lua/bindings/Android.mk similarity index 100% rename from cocos/scripting/lua/proj.android/Android.mk rename to cocos/scripting/lua/bindings/Android.mk diff --git a/cocos/scripting/lua/cocos2dx_support/CCBProxy.cpp b/cocos/scripting/lua/bindings/CCBProxy.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCBProxy.cpp rename to cocos/scripting/lua/bindings/CCBProxy.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/CCBProxy.h b/cocos/scripting/lua/bindings/CCBProxy.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCBProxy.h rename to cocos/scripting/lua/bindings/CCBProxy.h diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaBridge.cpp b/cocos/scripting/lua/bindings/CCLuaBridge.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaBridge.cpp rename to cocos/scripting/lua/bindings/CCLuaBridge.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaBridge.h b/cocos/scripting/lua/bindings/CCLuaBridge.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaBridge.h rename to cocos/scripting/lua/bindings/CCLuaBridge.h diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaEngine.cpp b/cocos/scripting/lua/bindings/CCLuaEngine.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaEngine.cpp rename to cocos/scripting/lua/bindings/CCLuaEngine.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaEngine.h b/cocos/scripting/lua/bindings/CCLuaEngine.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaEngine.h rename to cocos/scripting/lua/bindings/CCLuaEngine.h diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaStack.cpp b/cocos/scripting/lua/bindings/CCLuaStack.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaStack.cpp rename to cocos/scripting/lua/bindings/CCLuaStack.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaStack.h b/cocos/scripting/lua/bindings/CCLuaStack.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaStack.h rename to cocos/scripting/lua/bindings/CCLuaStack.h diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaValue.cpp b/cocos/scripting/lua/bindings/CCLuaValue.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaValue.cpp rename to cocos/scripting/lua/bindings/CCLuaValue.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/CCLuaValue.h b/cocos/scripting/lua/bindings/CCLuaValue.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/CCLuaValue.h rename to cocos/scripting/lua/bindings/CCLuaValue.h diff --git a/cocos/scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.cpp b/cocos/scripting/lua/bindings/Cocos2dxLuaLoader.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.cpp rename to cocos/scripting/lua/bindings/Cocos2dxLuaLoader.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.h b/cocos/scripting/lua/bindings/Cocos2dxLuaLoader.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.h rename to cocos/scripting/lua/bindings/Cocos2dxLuaLoader.h diff --git a/cocos/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp b/cocos/scripting/lua/bindings/LuaBasicConversions.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp rename to cocos/scripting/lua/bindings/LuaBasicConversions.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/LuaBasicConversions.h b/cocos/scripting/lua/bindings/LuaBasicConversions.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/LuaBasicConversions.h rename to cocos/scripting/lua/bindings/LuaBasicConversions.h diff --git a/cocos/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id b/cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id rename to cocos/scripting/lua/bindings/LuaOpengl.cpp.REMOVED.git-id diff --git a/cocos/scripting/lua/cocos2dx_support/LuaOpengl.h b/cocos/scripting/lua/bindings/LuaOpengl.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/LuaOpengl.h rename to cocos/scripting/lua/bindings/LuaOpengl.h diff --git a/cocos/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.cpp rename to cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.h b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/LuaScriptHandlerMgr.h rename to cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h diff --git a/cocos/scripting/lua/cocos2dx_support/Lua_web_socket.cpp b/cocos/scripting/lua/bindings/Lua_web_socket.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/Lua_web_socket.cpp rename to cocos/scripting/lua/bindings/Lua_web_socket.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/Lua_web_socket.h b/cocos/scripting/lua/bindings/Lua_web_socket.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/Lua_web_socket.h rename to cocos/scripting/lua/bindings/Lua_web_socket.h diff --git a/cocos/scripting/lua/proj.linux/Makefile b/cocos/scripting/lua/bindings/Makefile similarity index 100% rename from cocos/scripting/lua/proj.linux/Makefile rename to cocos/scripting/lua/bindings/Makefile diff --git a/cocos/scripting/lua/proj.win32/liblua.vcxproj b/cocos/scripting/lua/bindings/liblua.vcxproj similarity index 100% rename from cocos/scripting/lua/proj.win32/liblua.vcxproj rename to cocos/scripting/lua/bindings/liblua.vcxproj diff --git a/cocos/scripting/lua/proj.win32/liblua.vcxproj.filters b/cocos/scripting/lua/bindings/liblua.vcxproj.filters similarity index 100% rename from cocos/scripting/lua/proj.win32/liblua.vcxproj.filters rename to cocos/scripting/lua/bindings/liblua.vcxproj.filters diff --git a/cocos/scripting/lua/proj.win32/liblua.vcxproj.user b/cocos/scripting/lua/bindings/liblua.vcxproj.user similarity index 100% rename from cocos/scripting/lua/proj.win32/liblua.vcxproj.user rename to cocos/scripting/lua/bindings/liblua.vcxproj.user diff --git a/cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id b/cocos/scripting/lua/bindings/lua_cocos2dx_deprecated.cpp.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.cpp.REMOVED.git-id rename to cocos/scripting/lua/bindings/lua_cocos2dx_deprecated.cpp.REMOVED.git-id diff --git a/cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.h b/cocos/scripting/lua/bindings/lua_cocos2dx_deprecated.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_deprecated.h rename to cocos/scripting/lua/bindings/lua_cocos2dx_deprecated.h diff --git a/cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.cpp rename to cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.h b/cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.h rename to cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.h diff --git a/cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp b/cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp rename to cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.hpp b/cocos/scripting/lua/bindings/lua_cocos2dx_manual.hpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.hpp rename to cocos/scripting/lua/bindings/lua_cocos2dx_manual.hpp diff --git a/cocos/scripting/lua/cocos2dx_support/platform/android/CCLuaJavaBridge.cpp b/cocos/scripting/lua/bindings/platform/android/CCLuaJavaBridge.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/platform/android/CCLuaJavaBridge.cpp rename to cocos/scripting/lua/bindings/platform/android/CCLuaJavaBridge.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/platform/android/CCLuaJavaBridge.h b/cocos/scripting/lua/bindings/platform/android/CCLuaJavaBridge.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/platform/android/CCLuaJavaBridge.h rename to cocos/scripting/lua/bindings/platform/android/CCLuaJavaBridge.h diff --git a/cocos/scripting/lua/cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp b/cocos/scripting/lua/bindings/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp rename to cocos/scripting/lua/bindings/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp diff --git a/cocos/scripting/lua/cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h b/cocos/scripting/lua/bindings/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h rename to cocos/scripting/lua/bindings/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h diff --git a/cocos/scripting/lua/cocos2dx_support/platform/ios/CCLuaObjcBridge.h b/cocos/scripting/lua/bindings/platform/ios/CCLuaObjcBridge.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/platform/ios/CCLuaObjcBridge.h rename to cocos/scripting/lua/bindings/platform/ios/CCLuaObjcBridge.h diff --git a/cocos/scripting/lua/cocos2dx_support/platform/ios/CCLuaObjcBridge.mm b/cocos/scripting/lua/bindings/platform/ios/CCLuaObjcBridge.mm similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/platform/ios/CCLuaObjcBridge.mm rename to cocos/scripting/lua/bindings/platform/ios/CCLuaObjcBridge.mm diff --git a/cocos/scripting/lua/cocos2dx_support/tolua_fix.c b/cocos/scripting/lua/bindings/tolua_fix.c similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/tolua_fix.c rename to cocos/scripting/lua/bindings/tolua_fix.c diff --git a/cocos/scripting/lua/cocos2dx_support/tolua_fix.h b/cocos/scripting/lua/bindings/tolua_fix.h similarity index 100% rename from cocos/scripting/lua/cocos2dx_support/tolua_fix.h rename to cocos/scripting/lua/bindings/tolua_fix.h diff --git a/cocos/scripting/lua/proj.ios/luabindings-Prefix.pch b/cocos/scripting/lua/proj.ios/luabindings-Prefix.pch deleted file mode 100644 index 175f3ccb23..0000000000 --- a/cocos/scripting/lua/proj.ios/luabindings-Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'luabindings' target in the 'luabindings' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/cocos/scripting/lua/lua/lapi.c b/external/lua/lua/lapi.c similarity index 100% rename from cocos/scripting/lua/lua/lapi.c rename to external/lua/lua/lapi.c diff --git a/cocos/scripting/lua/lua/lapi.h b/external/lua/lua/lapi.h similarity index 100% rename from cocos/scripting/lua/lua/lapi.h rename to external/lua/lua/lapi.h diff --git a/cocos/scripting/lua/lua/lauxlib.c b/external/lua/lua/lauxlib.c similarity index 100% rename from cocos/scripting/lua/lua/lauxlib.c rename to external/lua/lua/lauxlib.c diff --git a/cocos/scripting/lua/lua/lauxlib.h b/external/lua/lua/lauxlib.h similarity index 100% rename from cocos/scripting/lua/lua/lauxlib.h rename to external/lua/lua/lauxlib.h diff --git a/cocos/scripting/lua/lua/lbaselib.c b/external/lua/lua/lbaselib.c similarity index 100% rename from cocos/scripting/lua/lua/lbaselib.c rename to external/lua/lua/lbaselib.c diff --git a/cocos/scripting/lua/lua/lcode.c b/external/lua/lua/lcode.c similarity index 100% rename from cocos/scripting/lua/lua/lcode.c rename to external/lua/lua/lcode.c diff --git a/cocos/scripting/lua/lua/lcode.h b/external/lua/lua/lcode.h similarity index 100% rename from cocos/scripting/lua/lua/lcode.h rename to external/lua/lua/lcode.h diff --git a/cocos/scripting/lua/lua/ldblib.c b/external/lua/lua/ldblib.c similarity index 100% rename from cocos/scripting/lua/lua/ldblib.c rename to external/lua/lua/ldblib.c diff --git a/cocos/scripting/lua/lua/ldebug.c b/external/lua/lua/ldebug.c similarity index 100% rename from cocos/scripting/lua/lua/ldebug.c rename to external/lua/lua/ldebug.c diff --git a/cocos/scripting/lua/lua/ldebug.h b/external/lua/lua/ldebug.h similarity index 100% rename from cocos/scripting/lua/lua/ldebug.h rename to external/lua/lua/ldebug.h diff --git a/cocos/scripting/lua/lua/ldo.c b/external/lua/lua/ldo.c similarity index 100% rename from cocos/scripting/lua/lua/ldo.c rename to external/lua/lua/ldo.c diff --git a/cocos/scripting/lua/lua/ldo.h b/external/lua/lua/ldo.h similarity index 100% rename from cocos/scripting/lua/lua/ldo.h rename to external/lua/lua/ldo.h diff --git a/cocos/scripting/lua/lua/ldump.c b/external/lua/lua/ldump.c similarity index 100% rename from cocos/scripting/lua/lua/ldump.c rename to external/lua/lua/ldump.c diff --git a/cocos/scripting/lua/lua/lfunc.c b/external/lua/lua/lfunc.c similarity index 100% rename from cocos/scripting/lua/lua/lfunc.c rename to external/lua/lua/lfunc.c diff --git a/cocos/scripting/lua/lua/lfunc.h b/external/lua/lua/lfunc.h similarity index 100% rename from cocos/scripting/lua/lua/lfunc.h rename to external/lua/lua/lfunc.h diff --git a/cocos/scripting/lua/lua/lgc.c b/external/lua/lua/lgc.c similarity index 100% rename from cocos/scripting/lua/lua/lgc.c rename to external/lua/lua/lgc.c diff --git a/cocos/scripting/lua/lua/lgc.h b/external/lua/lua/lgc.h similarity index 100% rename from cocos/scripting/lua/lua/lgc.h rename to external/lua/lua/lgc.h diff --git a/cocos/scripting/lua/lua/linit.c b/external/lua/lua/linit.c similarity index 100% rename from cocos/scripting/lua/lua/linit.c rename to external/lua/lua/linit.c diff --git a/cocos/scripting/lua/lua/liolib.c b/external/lua/lua/liolib.c similarity index 100% rename from cocos/scripting/lua/lua/liolib.c rename to external/lua/lua/liolib.c diff --git a/cocos/scripting/lua/lua/llex.c b/external/lua/lua/llex.c similarity index 100% rename from cocos/scripting/lua/lua/llex.c rename to external/lua/lua/llex.c diff --git a/cocos/scripting/lua/lua/llex.h b/external/lua/lua/llex.h similarity index 100% rename from cocos/scripting/lua/lua/llex.h rename to external/lua/lua/llex.h diff --git a/cocos/scripting/lua/lua/llimits.h b/external/lua/lua/llimits.h similarity index 100% rename from cocos/scripting/lua/lua/llimits.h rename to external/lua/lua/llimits.h diff --git a/cocos/scripting/lua/lua/lmathlib.c b/external/lua/lua/lmathlib.c similarity index 100% rename from cocos/scripting/lua/lua/lmathlib.c rename to external/lua/lua/lmathlib.c diff --git a/cocos/scripting/lua/lua/lmem.c b/external/lua/lua/lmem.c similarity index 100% rename from cocos/scripting/lua/lua/lmem.c rename to external/lua/lua/lmem.c diff --git a/cocos/scripting/lua/lua/lmem.h b/external/lua/lua/lmem.h similarity index 100% rename from cocos/scripting/lua/lua/lmem.h rename to external/lua/lua/lmem.h diff --git a/cocos/scripting/lua/lua/loadlib.c b/external/lua/lua/loadlib.c similarity index 100% rename from cocos/scripting/lua/lua/loadlib.c rename to external/lua/lua/loadlib.c diff --git a/cocos/scripting/lua/lua/lobject.c b/external/lua/lua/lobject.c similarity index 100% rename from cocos/scripting/lua/lua/lobject.c rename to external/lua/lua/lobject.c diff --git a/cocos/scripting/lua/lua/lobject.h b/external/lua/lua/lobject.h similarity index 100% rename from cocos/scripting/lua/lua/lobject.h rename to external/lua/lua/lobject.h diff --git a/cocos/scripting/lua/lua/lopcodes.c b/external/lua/lua/lopcodes.c similarity index 100% rename from cocos/scripting/lua/lua/lopcodes.c rename to external/lua/lua/lopcodes.c diff --git a/cocos/scripting/lua/lua/lopcodes.h b/external/lua/lua/lopcodes.h similarity index 100% rename from cocos/scripting/lua/lua/lopcodes.h rename to external/lua/lua/lopcodes.h diff --git a/cocos/scripting/lua/lua/loslib.c b/external/lua/lua/loslib.c similarity index 100% rename from cocos/scripting/lua/lua/loslib.c rename to external/lua/lua/loslib.c diff --git a/cocos/scripting/lua/lua/lparser.c b/external/lua/lua/lparser.c similarity index 100% rename from cocos/scripting/lua/lua/lparser.c rename to external/lua/lua/lparser.c diff --git a/cocos/scripting/lua/lua/lparser.h b/external/lua/lua/lparser.h similarity index 100% rename from cocos/scripting/lua/lua/lparser.h rename to external/lua/lua/lparser.h diff --git a/cocos/scripting/lua/lua/lstate.c b/external/lua/lua/lstate.c similarity index 100% rename from cocos/scripting/lua/lua/lstate.c rename to external/lua/lua/lstate.c diff --git a/cocos/scripting/lua/lua/lstate.h b/external/lua/lua/lstate.h similarity index 100% rename from cocos/scripting/lua/lua/lstate.h rename to external/lua/lua/lstate.h diff --git a/cocos/scripting/lua/lua/lstring.c b/external/lua/lua/lstring.c similarity index 100% rename from cocos/scripting/lua/lua/lstring.c rename to external/lua/lua/lstring.c diff --git a/cocos/scripting/lua/lua/lstring.h b/external/lua/lua/lstring.h similarity index 100% rename from cocos/scripting/lua/lua/lstring.h rename to external/lua/lua/lstring.h diff --git a/cocos/scripting/lua/lua/lstrlib.c b/external/lua/lua/lstrlib.c similarity index 100% rename from cocos/scripting/lua/lua/lstrlib.c rename to external/lua/lua/lstrlib.c diff --git a/cocos/scripting/lua/lua/ltable.c b/external/lua/lua/ltable.c similarity index 100% rename from cocos/scripting/lua/lua/ltable.c rename to external/lua/lua/ltable.c diff --git a/cocos/scripting/lua/lua/ltable.h b/external/lua/lua/ltable.h similarity index 100% rename from cocos/scripting/lua/lua/ltable.h rename to external/lua/lua/ltable.h diff --git a/cocos/scripting/lua/lua/ltablib.c b/external/lua/lua/ltablib.c similarity index 100% rename from cocos/scripting/lua/lua/ltablib.c rename to external/lua/lua/ltablib.c diff --git a/cocos/scripting/lua/lua/ltm.c b/external/lua/lua/ltm.c similarity index 100% rename from cocos/scripting/lua/lua/ltm.c rename to external/lua/lua/ltm.c diff --git a/cocos/scripting/lua/lua/ltm.h b/external/lua/lua/ltm.h similarity index 100% rename from cocos/scripting/lua/lua/ltm.h rename to external/lua/lua/ltm.h diff --git a/cocos/scripting/lua/lua/lua.c b/external/lua/lua/lua.c similarity index 100% rename from cocos/scripting/lua/lua/lua.c rename to external/lua/lua/lua.c diff --git a/cocos/scripting/lua/lua/lua.h b/external/lua/lua/lua.h similarity index 100% rename from cocos/scripting/lua/lua/lua.h rename to external/lua/lua/lua.h diff --git a/cocos/scripting/lua/lua/luaconf.h b/external/lua/lua/luaconf.h similarity index 100% rename from cocos/scripting/lua/lua/luaconf.h rename to external/lua/lua/luaconf.h diff --git a/cocos/scripting/lua/lua/lualib.h b/external/lua/lua/lualib.h similarity index 100% rename from cocos/scripting/lua/lua/lualib.h rename to external/lua/lua/lualib.h diff --git a/cocos/scripting/lua/lua/lundump.c b/external/lua/lua/lundump.c similarity index 100% rename from cocos/scripting/lua/lua/lundump.c rename to external/lua/lua/lundump.c diff --git a/cocos/scripting/lua/lua/lundump.h b/external/lua/lua/lundump.h similarity index 100% rename from cocos/scripting/lua/lua/lundump.h rename to external/lua/lua/lundump.h diff --git a/cocos/scripting/lua/lua/lvm.c b/external/lua/lua/lvm.c similarity index 100% rename from cocos/scripting/lua/lua/lvm.c rename to external/lua/lua/lvm.c diff --git a/cocos/scripting/lua/lua/lvm.h b/external/lua/lua/lvm.h similarity index 100% rename from cocos/scripting/lua/lua/lvm.h rename to external/lua/lua/lvm.h diff --git a/cocos/scripting/lua/lua/lzio.c b/external/lua/lua/lzio.c similarity index 100% rename from cocos/scripting/lua/lua/lzio.c rename to external/lua/lua/lzio.c diff --git a/cocos/scripting/lua/lua/lzio.h b/external/lua/lua/lzio.h similarity index 100% rename from cocos/scripting/lua/lua/lzio.h rename to external/lua/lua/lzio.h diff --git a/cocos/scripting/lua/lua/print.c b/external/lua/lua/print.c similarity index 100% rename from cocos/scripting/lua/lua/print.c rename to external/lua/lua/print.c diff --git a/cocos/scripting/lua/luajit/Android.mk b/external/lua/luajit/Android.mk similarity index 100% rename from cocos/scripting/lua/luajit/Android.mk rename to external/lua/luajit/Android.mk diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/COPYRIGHT b/external/lua/luajit/LuaJIT-2.0.1/COPYRIGHT similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/COPYRIGHT rename to external/lua/luajit/LuaJIT-2.0.1/COPYRIGHT diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/Makefile b/external/lua/luajit/LuaJIT-2.0.1/Makefile similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/Makefile rename to external/lua/luajit/LuaJIT-2.0.1/Makefile diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/README b/external/lua/luajit/LuaJIT-2.0.1/README similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/README rename to external/lua/luajit/LuaJIT-2.0.1/README diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css b/external/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css rename to external/lua/luajit/LuaJIT-2.0.1/doc/bluequad-print.css diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css b/external/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css rename to external/lua/luajit/LuaJIT-2.0.1/doc/bluequad.css diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/changes.html b/external/lua/luajit/LuaJIT-2.0.1/doc/changes.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/changes.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/changes.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/contact.html b/external/lua/luajit/LuaJIT-2.0.1/doc/contact.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/contact.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/contact.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html b/external/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/ext_c_api.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html b/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html b/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_api.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html b/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_semantics.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html b/external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/ext_ffi_tutorial.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html b/external/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/ext_jit.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/extensions.html b/external/lua/luajit/LuaJIT-2.0.1/doc/extensions.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/extensions.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/extensions.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/faq.html b/external/lua/luajit/LuaJIT-2.0.1/doc/faq.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/faq.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/faq.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/install.html b/external/lua/luajit/LuaJIT-2.0.1/doc/install.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/install.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/install.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/luajit.html b/external/lua/luajit/LuaJIT-2.0.1/doc/luajit.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/luajit.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/luajit.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/running.html b/external/lua/luajit/LuaJIT-2.0.1/doc/running.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/running.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/running.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/status.html b/external/lua/luajit/LuaJIT-2.0.1/doc/status.html similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/doc/status.html rename to external/lua/luajit/LuaJIT-2.0.1/doc/status.html diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_arm.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_mips.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_ppc.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_proto.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x64.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dasm_x86.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua b/external/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua rename to external/lua/luajit/LuaJIT-2.0.1/dynasm/dynasm.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/etc/luajit.1 b/external/lua/luajit/LuaJIT-2.0.1/etc/luajit.1 similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/etc/luajit.1 rename to external/lua/luajit/LuaJIT-2.0.1/etc/luajit.1 diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc b/external/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc rename to external/lua/luajit/LuaJIT-2.0.1/etc/luajit.pc diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/Makefile b/external/lua/luajit/LuaJIT-2.0.1/src/Makefile similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/Makefile rename to external/lua/luajit/LuaJIT-2.0.1/src/Makefile diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep b/external/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep rename to external/lua/luajit/LuaJIT-2.0.1/src/Makefile.dep diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/README b/external/lua/luajit/LuaJIT-2.0.1/src/host/README similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/README rename to external/lua/luajit/LuaJIT-2.0.1/src/host/README diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c b/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c rename to external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h b/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h rename to external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c b/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c rename to external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_asm.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c b/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c rename to external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_fold.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c b/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c rename to external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_lib.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c b/external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c rename to external/lua/luajit/LuaJIT-2.0.1/src/host/buildvm_peobj.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua b/external/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/host/genminilua.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id b/external/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id rename to external/lua/luajit/LuaJIT-2.0.1/src/host/minilua.c.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/bc.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/bcsave.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_arm.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mips.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_mipsel.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_ppc.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x64.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dis_x86.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/dump.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua b/external/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua rename to external/lua/luajit/LuaJIT-2.0.1/src/jit/v.lua diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h b/external/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lauxlib.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_aux.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_base.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_base.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_base.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_base.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_bit.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_debug.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_ffi.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_init.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_init.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_init.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_init.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_io.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_io.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_io.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_io.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_jit.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_math.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_math.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_math.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_math.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_os.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_os.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_os.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_os.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_package.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_package.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_package.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_package.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_string.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_string.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_string.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_string.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_table.c b/external/lua/luajit/LuaJIT-2.0.1/src/lib_table.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lib_table.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lib_table.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj.supp b/external/lua/luajit/LuaJIT-2.0.1/src/lj.supp similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj.supp rename to external/lua/luajit/LuaJIT-2.0.1/src/lj.supp diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_alloc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_api.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_api.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_api.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_api.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_arch.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_asm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_arm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_mips.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_ppc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_asm_x86.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_bc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_bcdump.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_bcread.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_bcwrite.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_carith.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ccall.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ccallback.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_cconv.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_cdata.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_char.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_char.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_char.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_char.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_char.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_char.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_char.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_char.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_clib.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_cparse.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_crecord.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ctype.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_debug.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_def.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_def.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_def.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_def.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_dispatch.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_arm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_mips.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_ppc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_emit_x86.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_err.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_err.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_err.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_err.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_err.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_err.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_err.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_err.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_errmsg.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ff.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ffrecord.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_frame.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_func.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_func.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_func.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_func.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_func.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_func.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_func.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_func.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_gc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_gdbjit.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ir.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_ircall.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_iropt.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_jit.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_lex.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_lib.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_load.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_load.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_load.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_load.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_mcode.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_meta.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_obj.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_dce.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_fold.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_loop.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_mem.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_narrow.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_sink.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_opt_split.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_parse.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_record.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_record.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_record.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_record.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_record.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_record.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_record.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_record.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_snap.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_state.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_state.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_state.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_state.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_state.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_state.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_state.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_state.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_str.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_str.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_str.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_str.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_str.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_str.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_str.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_str.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_strscan.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_tab.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_target.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_target.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_target_arm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_target_mips.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_target_ppc.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_target_x86.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_trace.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_traceerr.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_udata.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_vm.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h b/external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_vmevent.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c b/external/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c rename to external/lua/luajit/LuaJIT-2.0.1/src/lj_vmmath.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c b/external/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c rename to external/lua/luajit/LuaJIT-2.0.1/src/ljamalg.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lua.h b/external/lua/luajit/LuaJIT-2.0.1/src/lua.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lua.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lua.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lua.hpp b/external/lua/luajit/LuaJIT-2.0.1/src/lua.hpp similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lua.hpp rename to external/lua/luajit/LuaJIT-2.0.1/src/lua.hpp diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/luaconf.h b/external/lua/luajit/LuaJIT-2.0.1/src/luaconf.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/luaconf.h rename to external/lua/luajit/LuaJIT-2.0.1/src/luaconf.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/luajit.c b/external/lua/luajit/LuaJIT-2.0.1/src/luajit.c similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/luajit.c rename to external/lua/luajit/LuaJIT-2.0.1/src/luajit.c diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/luajit.h b/external/lua/luajit/LuaJIT-2.0.1/src/luajit.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/luajit.h rename to external/lua/luajit/LuaJIT-2.0.1/src/luajit.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lualib.h b/external/lua/luajit/LuaJIT-2.0.1/src/lualib.h similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/lualib.h rename to external/lua/luajit/LuaJIT-2.0.1/src/lualib.h diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat b/external/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat rename to external/lua/luajit/LuaJIT-2.0.1/src/msvcbuild.bat diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id b/external/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id rename to external/lua/luajit/LuaJIT-2.0.1/src/vm_arm.dasc.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id b/external/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id rename to external/lua/luajit/LuaJIT-2.0.1/src/vm_mips.dasc.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id b/external/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id rename to external/lua/luajit/LuaJIT-2.0.1/src/vm_ppc.dasc.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id b/external/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id rename to external/lua/luajit/LuaJIT-2.0.1/src/vm_ppcspe.dasc.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id b/external/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id rename to external/lua/luajit/LuaJIT-2.0.1/src/vm_x86.dasc.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat b/external/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat rename to external/lua/luajit/LuaJIT-2.0.1/src/xedkbuild.bat diff --git a/cocos/scripting/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch b/external/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch similarity index 100% rename from cocos/scripting/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch rename to external/lua/luajit/LuaJIT-2.0.1/v2.0.1_hotfix1.patch diff --git a/cocos/scripting/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id b/external/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id rename to external/lua/luajit/android/armeabi-v7a/libluajit.a.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id b/external/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id rename to external/lua/luajit/android/armeabi/libluajit.a.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/android/x86/libluajit.a.REMOVED.git-id b/external/lua/luajit/android/x86/libluajit.a.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/android/x86/libluajit.a.REMOVED.git-id rename to external/lua/luajit/android/x86/libluajit.a.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/build_android.sh b/external/lua/luajit/build_android.sh similarity index 100% rename from cocos/scripting/lua/luajit/build_android.sh rename to external/lua/luajit/build_android.sh diff --git a/cocos/scripting/lua/luajit/build_ios.sh b/external/lua/luajit/build_ios.sh similarity index 100% rename from cocos/scripting/lua/luajit/build_ios.sh rename to external/lua/luajit/build_ios.sh diff --git a/cocos/scripting/lua/luajit/build_mac.sh b/external/lua/luajit/build_mac.sh similarity index 100% rename from cocos/scripting/lua/luajit/build_mac.sh rename to external/lua/luajit/build_mac.sh diff --git a/cocos/scripting/lua/luajit/include/lauxlib.h b/external/lua/luajit/include/lauxlib.h similarity index 100% rename from cocos/scripting/lua/luajit/include/lauxlib.h rename to external/lua/luajit/include/lauxlib.h diff --git a/cocos/scripting/lua/luajit/include/lua.h b/external/lua/luajit/include/lua.h similarity index 100% rename from cocos/scripting/lua/luajit/include/lua.h rename to external/lua/luajit/include/lua.h diff --git a/cocos/scripting/lua/luajit/include/luaconf.h b/external/lua/luajit/include/luaconf.h similarity index 100% rename from cocos/scripting/lua/luajit/include/luaconf.h rename to external/lua/luajit/include/luaconf.h diff --git a/cocos/scripting/lua/luajit/include/lualib.h b/external/lua/luajit/include/lualib.h similarity index 100% rename from cocos/scripting/lua/luajit/include/lualib.h rename to external/lua/luajit/include/lualib.h diff --git a/cocos/scripting/lua/luajit/ios/libluajit.a.REMOVED.git-id b/external/lua/luajit/ios/libluajit.a.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/ios/libluajit.a.REMOVED.git-id rename to external/lua/luajit/ios/libluajit.a.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/mac/libluajit.a.REMOVED.git-id b/external/lua/luajit/mac/libluajit.a.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/mac/libluajit.a.REMOVED.git-id rename to external/lua/luajit/mac/libluajit.a.REMOVED.git-id diff --git a/cocos/scripting/lua/luajit/win32/lua51.dll.REMOVED.git-id b/external/lua/luajit/win32/lua51.dll.REMOVED.git-id similarity index 100% rename from cocos/scripting/lua/luajit/win32/lua51.dll.REMOVED.git-id rename to external/lua/luajit/win32/lua51.dll.REMOVED.git-id diff --git a/cocos/scripting/lua/tolua/tolua++.h b/external/lua/tolua/tolua++.h similarity index 100% rename from cocos/scripting/lua/tolua/tolua++.h rename to external/lua/tolua/tolua++.h diff --git a/cocos/scripting/lua/tolua/tolua_event.c b/external/lua/tolua/tolua_event.c similarity index 100% rename from cocos/scripting/lua/tolua/tolua_event.c rename to external/lua/tolua/tolua_event.c diff --git a/cocos/scripting/lua/tolua/tolua_event.h b/external/lua/tolua/tolua_event.h similarity index 100% rename from cocos/scripting/lua/tolua/tolua_event.h rename to external/lua/tolua/tolua_event.h diff --git a/cocos/scripting/lua/tolua/tolua_is.c b/external/lua/tolua/tolua_is.c similarity index 100% rename from cocos/scripting/lua/tolua/tolua_is.c rename to external/lua/tolua/tolua_is.c diff --git a/cocos/scripting/lua/tolua/tolua_map.c b/external/lua/tolua/tolua_map.c similarity index 100% rename from cocos/scripting/lua/tolua/tolua_map.c rename to external/lua/tolua/tolua_map.c diff --git a/cocos/scripting/lua/tolua/tolua_push.c b/external/lua/tolua/tolua_push.c similarity index 100% rename from cocos/scripting/lua/tolua/tolua_push.c rename to external/lua/tolua/tolua_push.c diff --git a/cocos/scripting/lua/tolua/tolua_to.c b/external/lua/tolua/tolua_to.c similarity index 100% rename from cocos/scripting/lua/tolua/tolua_to.c rename to external/lua/tolua/tolua_to.c From 8f7a489a4d43131b575b4727388303f0736d129a Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 16 Oct 2013 16:48:39 +0800 Subject: [PATCH 4/5] issue #2905:make cocostudio and gui flat --- cocos/2d/Android.mk | 310 +++++++++--------- .../cocosbuilder/CCBAnimationManager.h | 2 +- cocos/editor-support/cocostudio/Android.mk | 72 ++-- .../cocostudio/{action => }/CCActionFrame.cpp | 0 .../cocostudio/{action => }/CCActionFrame.h | 0 .../{action => }/CCActionFrameEasing.cpp | 4 +- .../{action => }/CCActionFrameEasing.h | 2 +- .../{action => }/CCActionManagerEx.cpp | 4 +- .../{action => }/CCActionManagerEx.h | 4 +- .../cocostudio/{action => }/CCActionNode.cpp | 10 +- .../cocostudio/{action => }/CCActionNode.h | 4 +- .../{action => }/CCActionObject.cpp | 4 +- .../cocostudio/{action => }/CCActionObject.h | 2 +- .../cocostudio/{armature => }/CCArmature.cpp | 12 +- .../cocostudio/{armature => }/CCArmature.h | 12 +- .../animation => }/CCArmatureAnimation.cpp | 12 +- .../animation => }/CCArmatureAnimation.h | 2 +- .../utils => }/CCArmatureDataManager.cpp | 8 +- .../utils => }/CCArmatureDataManager.h | 4 +- .../{armature/utils => }/CCArmatureDefine.cpp | 2 +- .../{armature/utils => }/CCArmatureDefine.h | 0 .../{armature/display => }/CCBatchNode.cpp | 6 +- .../{armature/display => }/CCBatchNode.h | 2 +- .../cocostudio/{armature => }/CCBone.cpp | 12 +- .../cocostudio/{armature => }/CCBone.h | 10 +- .../physics => }/CCColliderDetector.cpp | 6 +- .../physics => }/CCColliderDetector.h | 4 +- .../{components => }/CCComAttribute.cpp | 2 +- .../{components => }/CCComAttribute.h | 2 +- .../{components => }/CCComAudio.cpp | 2 +- .../cocostudio/{components => }/CCComAudio.h | 0 .../{components => }/CCComController.cpp | 2 +- .../{components => }/CCComController.h | 2 +- .../{components => }/CCComRender.cpp | 2 +- .../cocostudio/{components => }/CCComRender.h | 0 .../utils => }/CCDataReaderHelper.cpp | 12 +- .../{armature/utils => }/CCDataReaderHelper.h | 8 +- .../{armature/datas => }/CCDatas.cpp | 6 +- .../cocostudio/{armature/datas => }/CCDatas.h | 4 +- .../display => }/CCDecorativeDisplay.cpp | 2 +- .../display => }/CCDecorativeDisplay.h | 8 +- .../display => }/CCDisplayFactory.cpp | 14 +- .../{armature/display => }/CCDisplayFactory.h | 4 +- .../display => }/CCDisplayManager.cpp | 10 +- .../{armature/display => }/CCDisplayManager.h | 6 +- .../{components => }/CCInputDelegate.cpp | 2 +- .../{components => }/CCInputDelegate.h | 0 .../animation => }/CCProcessBase.cpp | 4 +- .../{armature/animation => }/CCProcessBase.h | 4 +- .../cocostudio/{reader => }/CCSGUIReader.cpp | 8 +- .../cocostudio/{reader => }/CCSGUIReader.h | 4 +- .../{reader => }/CCSSceneReader.cpp | 5 +- .../cocostudio/{reader => }/CCSSceneReader.h | 2 +- .../{armature/display => }/CCSkin.cpp | 8 +- .../{armature/display => }/CCSkin.h | 4 +- .../utils => }/CCSpriteFrameCacheHelper.cpp | 2 +- .../utils => }/CCSpriteFrameCacheHelper.h | 2 +- .../{armature/utils => }/CCTransformHelp.cpp | 4 +- .../{armature/utils => }/CCTransformHelp.h | 4 +- .../{armature/animation => }/CCTween.cpp | 14 +- .../{armature/animation => }/CCTween.h | 4 +- .../{armature/utils => }/CCTweenFunction.cpp | 4 +- .../{armature/utils => }/CCTweenFunction.h | 2 +- .../{armature/utils => }/CCUtilMath.cpp | 2 +- .../{armature/utils => }/CCUtilMath.h | 2 +- .../{json => }/CSContentJsonDictionary.cpp | 2 +- .../{json => }/CSContentJsonDictionary.h | 0 cocos/editor-support/cocostudio/CocoStudio.h | 66 ++-- .../{json => }/DictionaryHelper.cpp | 2 +- .../cocostudio/{json => }/DictionaryHelper.h | 2 +- .../editor-support/cocostudio/json/.DS_Store | Bin 6148 -> 0 bytes cocos/gui/Android.mk | 47 ++- cocos/gui/{system => }/CocosGUI.cpp | 2 +- cocos/gui/{system => }/CocosGUI.h | 37 +-- cocos/gui/{layouts => }/Layout.cpp | 6 +- cocos/gui/{layouts => }/Layout.h | 2 +- cocos/gui/{layouts => }/LayoutParameter.cpp | 4 +- cocos/gui/{layouts => }/LayoutParameter.h | 2 +- cocos/gui/{widgets => }/UIButton.cpp | 2 +- cocos/gui/{widgets => }/UIButton.h | 2 +- cocos/gui/{widgets => }/UICheckBox.cpp | 2 +- cocos/gui/{widgets => }/UICheckBox.h | 2 +- .../scroll-widget => }/UIDragPanel.cpp | 4 +- .../{widgets/scroll-widget => }/UIDragPanel.h | 4 +- cocos/gui/{system => }/UIHelper.cpp | 7 +- cocos/gui/{system => }/UIHelper.h | 4 +- cocos/gui/{widgets => }/UIImageView.cpp | 2 +- cocos/gui/{widgets => }/UIImageView.h | 2 +- cocos/gui/{system => }/UIInputManager.cpp | 4 +- cocos/gui/{system => }/UIInputManager.h | 2 +- cocos/gui/{widgets => }/UILabel.cpp | 2 +- cocos/gui/{widgets => }/UILabel.h | 2 +- cocos/gui/{widgets => }/UILabelAtlas.cpp | 2 +- cocos/gui/{widgets => }/UILabelAtlas.h | 2 +- cocos/gui/{widgets => }/UILabelBMFont.cpp | 2 +- cocos/gui/{widgets => }/UILabelBMFont.h | 2 +- cocos/gui/{system => }/UILayer.cpp | 4 +- cocos/gui/{system => }/UILayer.h | 4 +- cocos/gui/{layouts => }/UILayoutDefine.cpp | 2 +- cocos/gui/{layouts => }/UILayoutDefine.h | 0 .../scroll-widget => }/UIListView.cpp | 2 +- .../{widgets/scroll-widget => }/UIListView.h | 2 +- cocos/gui/{widgets => }/UILoadingBar.cpp | 2 +- cocos/gui/{widgets => }/UILoadingBar.h | 2 +- .../scroll-widget => }/UIPageView.cpp | 2 +- .../{widgets/scroll-widget => }/UIPageView.h | 4 +- cocos/gui/{base-classes => }/UIRootWidget.cpp | 2 +- cocos/gui/{base-classes => }/UIRootWidget.h | 2 +- .../scroll-widget => }/UIScrollInterface.h | 2 +- .../scroll-widget => }/UIScrollView.cpp | 4 +- .../scroll-widget => }/UIScrollView.h | 4 +- cocos/gui/{widgets => }/UISlider.cpp | 2 +- cocos/gui/{widgets => }/UISlider.h | 2 +- cocos/gui/{widgets => }/UITextField.cpp | 2 +- cocos/gui/{widgets => }/UITextField.h | 2 +- cocos/gui/{base-classes => }/UIWidget.cpp | 8 +- cocos/gui/{base-classes => }/UIWidget.h | 4 +- cocos/network/Android.mk | 5 +- cocos/network/HttpClient.h | 6 +- cocos/network/HttpResponse.h | 2 +- extensions/Android.mk | 5 +- extensions/GUI/CCEditBox/CCEditBox.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImpl.h | 2 +- .../GUI/CCEditBox/CCEditBoxImplAndroid.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImplIOS.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImplMac.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImplTizen.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImplWin.h | 2 +- extensions/GUI/CCScrollView/CCScrollView.h | 2 +- extensions/GUI/CCScrollView/CCSorting.h | 2 +- extensions/assets-manager/AssetsManager.h | 2 +- extensions/physics-nodes/CCPhysicsDebugNode.h | 2 +- extensions/physics-nodes/CCPhysicsSprite.h | 2 +- samples/Cpp/TestCpp/Android.mk | 264 +++++++-------- samples/Cpp/TestCpp/Classes/AppDelegate.cpp | 2 +- .../TestCpp/Classes/Box2DTest/Box2dTest.cpp | 2 +- .../Classes/ChipmunkTest/ChipmunkTest.h | 2 +- .../CocosDenshionTest/CocosDenshionTest.cpp | 2 +- .../CocoStudioArmatureTest/ArmatureScene.h | 2 +- .../ComponentsTestScene.h | 2 +- .../EnemyController.h | 2 +- .../PlayerController.h | 2 +- .../ProjectileController.h | 2 +- .../SceneController.h | 2 +- .../CocoStudioGUITest/CocosGUIScene.h | 4 +- .../UINodeContainerTest.cpp | 2 +- .../CocoStudioGUITest/UIScene.cpp | 2 +- .../CocoStudioGUITest/UIScene.h | 4 +- .../CocoStudioSceneTest/SceneEditorTest.cpp | 4 +- .../CocoStudioSceneTest/SceneEditorTest.h | 2 +- .../AnimationsTest/AnimationsTestLayer.h | 2 +- .../ButtonTest/ButtonTestLayer.h | 2 +- .../HelloCocosBuilderLayer.h | 2 +- .../LabelTest/LabelTestLayer.h | 2 +- .../CocosBuilderTest/MenuTest/MenuTestLayer.h | 2 +- .../ParticleSystemTestLayer.h | 2 +- .../ScrollViewTest/ScrollViewTestLayer.h | 2 +- .../SpriteTest/SpriteTestLayer.h | 2 +- .../TestHeader/TestHeaderLayer.h | 2 +- .../TimelineCallbackTestLayer.h | 2 +- .../CCControlColourPickerTest.h | 2 +- .../ControlExtensionTest/CCControlScene.h | 2 +- .../CCControlSceneManager.h | 2 +- .../ExtensionsTest/EditBoxTest/EditBoxTest.h | 2 +- .../NetworkTest/HttpClientTest.h | 4 +- .../ExtensionsTest/NetworkTest/SocketIOTest.h | 4 +- .../NetworkTest/WebSocketTest.h | 4 +- .../Scale9SpriteTest/Scale9SpriteTest.cpp | 2 +- .../TableViewTest/CustomTableViewCell.h | 2 +- .../TableViewTest/TableViewTestScene.h | 2 +- .../Classes/SchedulerTest/SchedulerTest.h | 2 +- .../TestCpp/Classes/ShaderTest/ShaderTest.h | 2 +- .../TestCpp/Classes/ShaderTest/ShaderTest2.h | 2 +- samples/Cpp/TestCpp/Classes/testBasic.cpp | 2 +- .../Cpp/TestCpp/proj.android/jni/Android.mk | 2 +- samples/Lua/HelloLua/Classes/AppDelegate.cpp | 2 +- .../Lua/HelloLua/proj.android/build_native.sh | 4 +- .../Lua/HelloLua/proj.android/jni/Android.mk | 11 +- 178 files changed, 682 insertions(+), 691 deletions(-) rename cocos/editor-support/cocostudio/{action => }/CCActionFrame.cpp (100%) rename cocos/editor-support/cocostudio/{action => }/CCActionFrame.h (100%) rename cocos/editor-support/cocostudio/{action => }/CCActionFrameEasing.cpp (98%) rename cocos/editor-support/cocostudio/{action => }/CCActionFrameEasing.h (97%) rename cocos/editor-support/cocostudio/{action => }/CCActionManagerEx.cpp (97%) rename cocos/editor-support/cocostudio/{action => }/CCActionManagerEx.h (96%) rename cocos/editor-support/cocostudio/{action => }/CCActionNode.cpp (98%) rename cocos/editor-support/cocostudio/{action => }/CCActionNode.h (98%) rename cocos/editor-support/cocostudio/{action => }/CCActionObject.cpp (98%) rename cocos/editor-support/cocostudio/{action => }/CCActionObject.h (98%) rename cocos/editor-support/cocostudio/{armature => }/CCArmature.cpp (98%) rename cocos/editor-support/cocostudio/{armature => }/CCArmature.h (96%) rename cocos/editor-support/cocostudio/{armature/animation => }/CCArmatureAnimation.cpp (97%) rename cocos/editor-support/cocostudio/{armature/animation => }/CCArmatureAnimation.h (99%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCArmatureDataManager.cpp (97%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCArmatureDataManager.h (98%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCArmatureDefine.cpp (96%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCArmatureDefine.h (100%) rename cocos/editor-support/cocostudio/{armature/display => }/CCBatchNode.cpp (95%) rename cocos/editor-support/cocostudio/{armature/display => }/CCBatchNode.h (96%) rename cocos/editor-support/cocostudio/{armature => }/CCBone.cpp (97%) rename cocos/editor-support/cocostudio/{armature => }/CCBone.h (96%) rename cocos/editor-support/cocostudio/{armature/physics => }/CCColliderDetector.cpp (98%) rename cocos/editor-support/cocostudio/{armature/physics => }/CCColliderDetector.h (96%) rename cocos/editor-support/cocostudio/{components => }/CCComAttribute.cpp (99%) rename cocos/editor-support/cocostudio/{components => }/CCComAttribute.h (97%) rename cocos/editor-support/cocostudio/{components => }/CCComAudio.cpp (99%) rename cocos/editor-support/cocostudio/{components => }/CCComAudio.h (100%) rename cocos/editor-support/cocostudio/{components => }/CCComController.cpp (97%) rename cocos/editor-support/cocostudio/{components => }/CCComController.h (97%) rename cocos/editor-support/cocostudio/{components => }/CCComRender.cpp (98%) rename cocos/editor-support/cocostudio/{components => }/CCComRender.h (100%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCDataReaderHelper.cpp (99%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCDataReaderHelper.h (96%) rename cocos/editor-support/cocostudio/{armature/datas => }/CCDatas.cpp (98%) rename cocos/editor-support/cocostudio/{armature/datas => }/CCDatas.h (99%) rename cocos/editor-support/cocostudio/{armature/display => }/CCDecorativeDisplay.cpp (97%) rename cocos/editor-support/cocostudio/{armature/display => }/CCDecorativeDisplay.h (91%) rename cocos/editor-support/cocostudio/{armature/display => }/CCDisplayFactory.cpp (96%) rename cocos/editor-support/cocostudio/{armature/display => }/CCDisplayFactory.h (96%) rename cocos/editor-support/cocostudio/{armature/display => }/CCDisplayManager.cpp (97%) rename cocos/editor-support/cocostudio/{armature/display => }/CCDisplayManager.h (96%) rename cocos/editor-support/cocostudio/{components => }/CCInputDelegate.cpp (99%) rename cocos/editor-support/cocostudio/{components => }/CCInputDelegate.h (100%) rename cocos/editor-support/cocostudio/{armature/animation => }/CCProcessBase.cpp (98%) rename cocos/editor-support/cocostudio/{armature/animation => }/CCProcessBase.h (98%) rename cocos/editor-support/cocostudio/{reader => }/CCSGUIReader.cpp (99%) rename cocos/editor-support/cocostudio/{reader => }/CCSGUIReader.h (97%) rename cocos/editor-support/cocostudio/{reader => }/CCSSceneReader.cpp (99%) rename cocos/editor-support/cocostudio/{reader => }/CCSSceneReader.h (97%) rename cocos/editor-support/cocostudio/{armature/display => }/CCSkin.cpp (96%) rename cocos/editor-support/cocostudio/{armature/display => }/CCSkin.h (95%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCSpriteFrameCacheHelper.cpp (98%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCSpriteFrameCacheHelper.h (98%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCTransformHelp.cpp (98%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCTransformHelp.h (96%) rename cocos/editor-support/cocostudio/{armature/animation => }/CCTween.cpp (97%) rename cocos/editor-support/cocostudio/{armature/animation => }/CCTween.h (98%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCTweenFunction.cpp (99%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCTweenFunction.h (99%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCUtilMath.cpp (98%) rename cocos/editor-support/cocostudio/{armature/utils => }/CCUtilMath.h (98%) rename cocos/editor-support/cocostudio/{json => }/CSContentJsonDictionary.cpp (99%) rename cocos/editor-support/cocostudio/{json => }/CSContentJsonDictionary.h (100%) rename cocos/editor-support/cocostudio/{json => }/DictionaryHelper.cpp (99%) rename cocos/editor-support/cocostudio/{json => }/DictionaryHelper.h (98%) delete mode 100644 cocos/editor-support/cocostudio/json/.DS_Store rename cocos/gui/{system => }/CocosGUI.cpp (98%) rename cocos/gui/{system => }/CocosGUI.h (67%) rename cocos/gui/{layouts => }/Layout.cpp (99%) rename cocos/gui/{layouts => }/Layout.h (99%) rename cocos/gui/{layouts => }/LayoutParameter.cpp (98%) rename cocos/gui/{layouts => }/LayoutParameter.h (99%) rename cocos/gui/{widgets => }/UIButton.cpp (99%) rename cocos/gui/{widgets => }/UIButton.h (99%) rename cocos/gui/{widgets => }/UICheckBox.cpp (99%) rename cocos/gui/{widgets => }/UICheckBox.h (99%) rename cocos/gui/{widgets/scroll-widget => }/UIDragPanel.cpp (99%) rename cocos/gui/{widgets/scroll-widget => }/UIDragPanel.h (99%) rename cocos/gui/{system => }/UIHelper.cpp (98%) rename cocos/gui/{system => }/UIHelper.h (97%) rename cocos/gui/{widgets => }/UIImageView.cpp (99%) rename cocos/gui/{widgets => }/UIImageView.h (99%) rename cocos/gui/{system => }/UIInputManager.cpp (99%) rename cocos/gui/{system => }/UIInputManager.h (99%) rename cocos/gui/{widgets => }/UILabel.cpp (99%) rename cocos/gui/{widgets => }/UILabel.h (99%) rename cocos/gui/{widgets => }/UILabelAtlas.cpp (99%) rename cocos/gui/{widgets => }/UILabelAtlas.h (98%) rename cocos/gui/{widgets => }/UILabelBMFont.cpp (99%) rename cocos/gui/{widgets => }/UILabelBMFont.h (98%) rename cocos/gui/{system => }/UILayer.cpp (98%) rename cocos/gui/{system => }/UILayer.h (98%) rename cocos/gui/{layouts => }/UILayoutDefine.cpp (98%) rename cocos/gui/{layouts => }/UILayoutDefine.h (100%) rename cocos/gui/{widgets/scroll-widget => }/UIListView.cpp (99%) rename cocos/gui/{widgets/scroll-widget => }/UIListView.h (99%) rename cocos/gui/{widgets => }/UILoadingBar.cpp (99%) rename cocos/gui/{widgets => }/UILoadingBar.h (99%) rename cocos/gui/{widgets/scroll-widget => }/UIPageView.cpp (99%) rename cocos/gui/{widgets/scroll-widget => }/UIPageView.h (98%) rename cocos/gui/{base-classes => }/UIRootWidget.cpp (98%) rename cocos/gui/{base-classes => }/UIRootWidget.h (98%) rename cocos/gui/{widgets/scroll-widget => }/UIScrollInterface.h (98%) rename cocos/gui/{widgets/scroll-widget => }/UIScrollView.cpp (99%) rename cocos/gui/{widgets/scroll-widget => }/UIScrollView.h (99%) rename cocos/gui/{widgets => }/UISlider.cpp (99%) rename cocos/gui/{widgets => }/UISlider.h (99%) rename cocos/gui/{widgets => }/UITextField.cpp (99%) rename cocos/gui/{widgets => }/UITextField.h (99%) rename cocos/gui/{base-classes => }/UIWidget.cpp (99%) rename cocos/gui/{base-classes => }/UIWidget.h (99%) diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk index 74c8b0313f..20017089fe 100644 --- a/cocos/2d/Android.mk +++ b/cocos/2d/Android.mk @@ -7,165 +7,164 @@ LOCAL_MODULE := cocos2dx_static LOCAL_MODULE_FILENAME := libcocos2d LOCAL_SRC_FILES := \ -$(LOCAL_PATH)/base64.cpp \ -$(LOCAL_PATH)/CCAction.cpp \ -$(LOCAL_PATH)/CCActionCamera.cpp \ -$(LOCAL_PATH)/CCActionCatmullRom.cpp \ -$(LOCAL_PATH)/CCActionEase.cpp \ -$(LOCAL_PATH)/CCActionGrid.cpp \ -$(LOCAL_PATH)/CCActionGrid3D.cpp \ -$(LOCAL_PATH)/CCActionInstant.cpp \ -$(LOCAL_PATH)/CCActionInterval.cpp \ -$(LOCAL_PATH)/CCActionManager.cpp \ -$(LOCAL_PATH)/CCActionPageTurn3D.cpp \ -$(LOCAL_PATH)/CCActionProgressTimer.cpp \ -$(LOCAL_PATH)/CCActionTiledGrid.cpp \ -$(LOCAL_PATH)/CCActionTween.cpp \ -$(LOCAL_PATH)/CCAnimation.cpp \ -$(LOCAL_PATH)/CCAnimationCache.cpp \ -$(LOCAL_PATH)/CCAtlasNode.cpp \ -$(LOCAL_PATH)/CCCamera.cpp \ -$(LOCAL_PATH)/ccCArray.cpp \ -$(LOCAL_PATH)/CCClippingNode.cpp \ -$(LOCAL_PATH)/CCComponent.cpp \ -$(LOCAL_PATH)/CCComponentContainer.cpp \ -$(LOCAL_PATH)/CCConfiguration.cpp \ -$(LOCAL_PATH)/CCDeprecated.cpp \ -$(LOCAL_PATH)/CCDirector.cpp \ -$(LOCAL_PATH)/CCDrawingPrimitives.cpp \ -$(LOCAL_PATH)/CCDrawNode.cpp \ -$(LOCAL_PATH)/CCEvent.cpp \ -$(LOCAL_PATH)/CCEventAcceleration.cpp \ -$(LOCAL_PATH)/CCEventCustom.cpp \ -$(LOCAL_PATH)/CCEventDispatcher.cpp \ -$(LOCAL_PATH)/CCEventKeyboard.cpp \ -$(LOCAL_PATH)/CCEventListener.cpp \ -$(LOCAL_PATH)/CCEventListenerAcceleration.cpp \ -$(LOCAL_PATH)/CCEventListenerCustom.cpp \ -$(LOCAL_PATH)/CCEventListenerKeyboard.cpp \ -$(LOCAL_PATH)/CCEventListenerTouch.cpp \ -$(LOCAL_PATH)/CCEventTouch.cpp \ -$(LOCAL_PATH)/CCFont.cpp \ -$(LOCAL_PATH)/CCFontAtlas.cpp \ -$(LOCAL_PATH)/CCFontAtlasCache.cpp \ -$(LOCAL_PATH)/CCFontAtlasFactory.cpp \ -$(LOCAL_PATH)/CCFontDefinition.cpp \ -$(LOCAL_PATH)/CCFontFNT.cpp \ -$(LOCAL_PATH)/CCFontFreeType.cpp \ -$(LOCAL_PATH)/ccFPSImages.c \ -$(LOCAL_PATH)/CCGLBufferedNode.cpp \ -$(LOCAL_PATH)/CCGLProgram.cpp \ -$(LOCAL_PATH)/ccGLStateCache.cpp \ -$(LOCAL_PATH)/CCGrabber.cpp \ -$(LOCAL_PATH)/CCGrid.cpp \ -$(LOCAL_PATH)/CCIMEDispatcher.cpp \ -$(LOCAL_PATH)/CCLabel.cpp \ -$(LOCAL_PATH)/CCLabelAtlas.cpp \ -$(LOCAL_PATH)/CCLabelBMFont.cpp \ -$(LOCAL_PATH)/CCLabelTextFormatter.cpp \ -$(LOCAL_PATH)/CCLabelTTF.cpp \ -$(LOCAL_PATH)/CCLayer.cpp \ -$(LOCAL_PATH)/CCMenu.cpp \ -$(LOCAL_PATH)/CCMenuItem.cpp \ -$(LOCAL_PATH)/CCMotionStreak.cpp \ -$(LOCAL_PATH)/CCNode.cpp \ -$(LOCAL_PATH)/CCNotificationCenter.cpp \ -$(LOCAL_PATH)/CCParallaxNode.cpp \ -$(LOCAL_PATH)/CCParticleBatchNode.cpp \ -$(LOCAL_PATH)/CCParticleExamples.cpp \ -$(LOCAL_PATH)/CCParticleSystem.cpp \ -$(LOCAL_PATH)/CCParticleSystemQuad.cpp \ -$(LOCAL_PATH)/CCProfiling.cpp \ -$(LOCAL_PATH)/CCProgressTimer.cpp \ -$(LOCAL_PATH)/CCRenderTexture.cpp \ -$(LOCAL_PATH)/CCScene.cpp \ -$(LOCAL_PATH)/CCScheduler.cpp \ -$(LOCAL_PATH)/CCScriptSupport.cpp \ -$(LOCAL_PATH)/CCShaderCache.cpp \ -$(LOCAL_PATH)/ccShaders.cpp \ -$(LOCAL_PATH)/CCSprite.cpp \ -$(LOCAL_PATH)/CCSpriteBatchNode.cpp \ -$(LOCAL_PATH)/CCSpriteFrame.cpp \ -$(LOCAL_PATH)/CCSpriteFrameCache.cpp \ -$(LOCAL_PATH)/CCTextFieldTTF.cpp \ -$(LOCAL_PATH)/CCTextImage.cpp \ -$(LOCAL_PATH)/CCTexture2D.cpp \ -$(LOCAL_PATH)/CCTextureAtlas.cpp \ -$(LOCAL_PATH)/CCTextureCache.cpp \ -$(LOCAL_PATH)/CCTileMapAtlas.cpp \ -$(LOCAL_PATH)/CCTMXLayer.cpp \ -$(LOCAL_PATH)/CCTMXObjectGroup.cpp \ -$(LOCAL_PATH)/CCTMXTiledMap.cpp \ -$(LOCAL_PATH)/CCTMXXMLParser.cpp \ -$(LOCAL_PATH)/CCTouch.cpp \ -$(LOCAL_PATH)/CCTransition.cpp \ -$(LOCAL_PATH)/CCTransitionPageTurn.cpp \ -$(LOCAL_PATH)/CCTransitionProgress.cpp \ -$(LOCAL_PATH)/ccTypes.cpp \ -$(LOCAL_PATH)/CCUserDefault.cpp \ -$(LOCAL_PATH)/CCUserDefaultAndroid.cpp \ -$(LOCAL_PATH)/ccUTF8.cpp \ -$(LOCAL_PATH)/ccUtils.cpp \ -$(LOCAL_PATH)/CCVertex.cpp \ -$(LOCAL_PATH)/cocos2d.cpp \ -$(LOCAL_PATH)/TGAlib.cpp \ -$(LOCAL_PATH)/TransformUtils.cpp \ -$(LOCAL_PATH)/ZipUtils.cpp \ -$(LOCAL_PATH)/platform/CCEGLViewProtocol.cpp \ -$(LOCAL_PATH)/platform/CCFileUtils.cpp \ -$(LOCAL_PATH)/platform/CCSAXParser.cpp \ -$(LOCAL_PATH)/platform/CCThread.cpp \ -$(LOCAL_PATH)/../base/atitc.cpp \ -$(LOCAL_PATH)/../base/CCAffineTransform.cpp \ -$(LOCAL_PATH)/../base/CCArray.cpp \ -$(LOCAL_PATH)/../base/CCAutoreleasePool.cpp \ -$(LOCAL_PATH)/../base/CCData.cpp \ -$(LOCAL_PATH)/../base/CCDataVisitor.cpp \ -$(LOCAL_PATH)/../base/CCDictionary.cpp \ -$(LOCAL_PATH)/../base/CCGeometry.cpp \ -$(LOCAL_PATH)/../base/CCNS.cpp \ -$(LOCAL_PATH)/../base/CCObject.cpp \ -$(LOCAL_PATH)/../base/CCSet.cpp \ -$(LOCAL_PATH)/../base/CCString.cpp \ -$(LOCAL_PATH)/../base/etc1.cpp \ -$(LOCAL_PATH)/../base/s3tc.cpp \ -$(LOCAL_PATH)/../math/kazmath/src/aabb.c \ -$(LOCAL_PATH)/../math/kazmath/src/mat3.c \ -$(LOCAL_PATH)/../math/kazmath/src/mat4.c \ -$(LOCAL_PATH)/../math/kazmath/src/neon_matrix_impl.c \ -$(LOCAL_PATH)/../math/kazmath/src/plane.c \ -$(LOCAL_PATH)/../math/kazmath/src/quaternion.c \ -$(LOCAL_PATH)/../math/kazmath/src/ray2.c \ -$(LOCAL_PATH)/../math/kazmath/src/utility.c \ -$(LOCAL_PATH)/../math/kazmath/src/vec2.c \ -$(LOCAL_PATH)/../math/kazmath/src/vec3.c \ -$(LOCAL_PATH)/../math/kazmath/src/vec4.c \ -$(LOCAL_PATH)/../math/kazmath/src/GL/mat4stack.c \ -$(LOCAL_PATH)/../math/kazmath/src/GL/matrix.c \ -$(LOCAL_PATH)/../physics/CCPhysicsBody.cpp \ -$(LOCAL_PATH)/../physics/CCPhysicsContact.cpp \ -$(LOCAL_PATH)/../physics/CCPhysicsJoint.cpp \ -$(LOCAL_PATH)/../physics/CCPhysicsShape.cpp \ -$(LOCAL_PATH)/../physics/CCPhysicsWorld.cpp \ -$(LOCAL_PATH)/../physics/box2d/CCPhysicsBodyInfo.cpp \ -$(LOCAL_PATH)/../physics/box2d/CCPhysicsContactInfo.cpp \ -$(LOCAL_PATH)/../physics/box2d/CCPhysicsJointInfo.cpp \ -$(LOCAL_PATH)/../physics/box2d/CCPhysicsShapeInfo.cpp \ -$(LOCAL_PATH)/../physics/box2d/CCPhysicsWorldInfo.cpp \ -$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsBodyInfo.cpp \ -$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsContactInfo.cpp \ -$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsJointInfo.cpp \ -$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsShapeInfo.cpp \ -$(LOCAL_PATH)/../physics/chipmunk/CCPhysicsWorldInfo.cpp \ -$(LOCAL_PATH)/../../external/tinyxml2/tinyxml2.cpp \ -$(LOCAL_PATH)/../../external/unzip/ioapi.cpp \ -$(LOCAL_PATH)/../../external/unzip/unzip.cpp +base64.cpp \ +CCAction.cpp \ +CCActionCamera.cpp \ +CCActionCatmullRom.cpp \ +CCActionEase.cpp \ +CCActionGrid.cpp \ +CCActionGrid3D.cpp \ +CCActionInstant.cpp \ +CCActionInterval.cpp \ +CCActionManager.cpp \ +CCActionPageTurn3D.cpp \ +CCActionProgressTimer.cpp \ +CCActionTiledGrid.cpp \ +CCActionTween.cpp \ +CCAnimation.cpp \ +CCAnimationCache.cpp \ +CCAtlasNode.cpp \ +CCCamera.cpp \ +ccCArray.cpp \ +CCClippingNode.cpp \ +CCComponent.cpp \ +CCComponentContainer.cpp \ +CCConfiguration.cpp \ +CCDeprecated.cpp \ +CCDirector.cpp \ +CCDrawingPrimitives.cpp \ +CCDrawNode.cpp \ +CCEvent.cpp \ +CCEventAcceleration.cpp \ +CCEventCustom.cpp \ +CCEventDispatcher.cpp \ +CCEventKeyboard.cpp \ +CCEventListener.cpp \ +CCEventListenerAcceleration.cpp \ +CCEventListenerCustom.cpp \ +CCEventListenerKeyboard.cpp \ +CCEventListenerTouch.cpp \ +CCEventTouch.cpp \ +CCFont.cpp \ +CCFontAtlas.cpp \ +CCFontAtlasCache.cpp \ +CCFontAtlasFactory.cpp \ +CCFontDefinition.cpp \ +CCFontFNT.cpp \ +CCFontFreeType.cpp \ +ccFPSImages.c \ +CCGLBufferedNode.cpp \ +CCGLProgram.cpp \ +ccGLStateCache.cpp \ +CCGrabber.cpp \ +CCGrid.cpp \ +CCIMEDispatcher.cpp \ +CCLabel.cpp \ +CCLabelAtlas.cpp \ +CCLabelBMFont.cpp \ +CCLabelTextFormatter.cpp \ +CCLabelTTF.cpp \ +CCLayer.cpp \ +CCMenu.cpp \ +CCMenuItem.cpp \ +CCMotionStreak.cpp \ +CCNode.cpp \ +CCNotificationCenter.cpp \ +CCParallaxNode.cpp \ +CCParticleBatchNode.cpp \ +CCParticleExamples.cpp \ +CCParticleSystem.cpp \ +CCParticleSystemQuad.cpp \ +CCProfiling.cpp \ +CCProgressTimer.cpp \ +CCRenderTexture.cpp \ +CCScene.cpp \ +CCScheduler.cpp \ +CCScriptSupport.cpp \ +CCShaderCache.cpp \ +ccShaders.cpp \ +CCSprite.cpp \ +CCSpriteBatchNode.cpp \ +CCSpriteFrame.cpp \ +CCSpriteFrameCache.cpp \ +CCTextFieldTTF.cpp \ +CCTextImage.cpp \ +CCTexture2D.cpp \ +CCTextureAtlas.cpp \ +CCTextureCache.cpp \ +CCTileMapAtlas.cpp \ +CCTMXLayer.cpp \ +CCTMXObjectGroup.cpp \ +CCTMXTiledMap.cpp \ +CCTMXXMLParser.cpp \ +CCTouch.cpp \ +CCTransition.cpp \ +CCTransitionPageTurn.cpp \ +CCTransitionProgress.cpp \ +ccTypes.cpp \ +CCUserDefault.cpp \ +CCUserDefaultAndroid.cpp \ +ccUTF8.cpp \ +ccUtils.cpp \ +CCVertex.cpp \ +cocos2d.cpp \ +TGAlib.cpp \ +TransformUtils.cpp \ +ZipUtils.cpp \ +platform/CCEGLViewProtocol.cpp \ +platform/CCFileUtils.cpp \ +platform/CCSAXParser.cpp \ +platform/CCThread.cpp \ +../base/atitc.cpp \ +../base/CCAffineTransform.cpp \ +../base/CCArray.cpp \ +../base/CCAutoreleasePool.cpp \ +../base/CCData.cpp \ +../base/CCDataVisitor.cpp \ +../base/CCDictionary.cpp \ +../base/CCGeometry.cpp \ +../base/CCNS.cpp \ +../base/CCObject.cpp \ +../base/CCSet.cpp \ +../base/CCString.cpp \ +../base/etc1.cpp \ +../base/s3tc.cpp \ +../math/kazmath/src/aabb.c \ +../math/kazmath/src/mat3.c \ +../math/kazmath/src/mat4.c \ +../math/kazmath/src/neon_matrix_impl.c \ +../math/kazmath/src/plane.c \ +../math/kazmath/src/quaternion.c \ +../math/kazmath/src/ray2.c \ +../math/kazmath/src/utility.c \ +../math/kazmath/src/vec2.c \ +../math/kazmath/src/vec3.c \ +../math/kazmath/src/vec4.c \ +../math/kazmath/src/GL/mat4stack.c \ +../math/kazmath/src/GL/matrix.c \ +../physics/CCPhysicsBody.cpp \ +../physics/CCPhysicsContact.cpp \ +../physics/CCPhysicsJoint.cpp \ +../physics/CCPhysicsShape.cpp \ +../physics/CCPhysicsWorld.cpp \ +../physics/box2d/CCPhysicsBodyInfo.cpp \ +../physics/box2d/CCPhysicsContactInfo.cpp \ +../physics/box2d/CCPhysicsJointInfo.cpp \ +../physics/box2d/CCPhysicsShapeInfo.cpp \ +../physics/box2d/CCPhysicsWorldInfo.cpp \ +../physics/chipmunk/CCPhysicsBodyInfo.cpp \ +../physics/chipmunk/CCPhysicsContactInfo.cpp \ +../physics/chipmunk/CCPhysicsJointInfo.cpp \ +../physics/chipmunk/CCPhysicsShapeInfo.cpp \ +../physics/chipmunk/CCPhysicsWorldInfo.cpp \ +../../external/tinyxml2/tinyxml2.cpp \ +../../external/unzip/ioapi.cpp \ +../../external/unzip/unzip.cpp LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../math/kazmath/include \ - $(LOCAL_PATH)/platform/android \ + platform/android \ $(LOCAL_PATH)/../physics \ $(LOCAL_PATH)/../base \ $(LOCAL_PATH)/../../external/tinyxml2 \ @@ -173,7 +172,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/../../external/chipmunk/include/chipmunk LOCAL_C_INCLUDES := $(LOCAL_PATH) \ - $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../math/kazmath/include \ $(LOCAL_PATH)/platform/android \ $(LOCAL_PATH)/../physics \ diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h index 83d962ffef..e9755bbfb1 100644 --- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h +++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h @@ -2,7 +2,7 @@ #define __CCB_CCBANIMATION_MANAGER_H__ #include "cocos2d.h" -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" #include "CCBSequence.h" #include "CCBValue.h" #include "CCBSequenceProperty.h" diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index 15b18c83d7..b7dfa3838c 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -5,50 +5,50 @@ LOCAL_MODULE := cocostudio_static LOCAL_MODULE_FILENAME := libcocostudio -LOCAL_SRC_FILES := action/CCActionFrame.cpp \ -action/CCActionFrameEasing.cpp \ -action/CCActionManagerEx.cpp \ -action/CCActionNode.cpp \ -action/CCActionObject.cpp \ -armature/CCArmature.cpp \ -armature/CCBone.cpp \ -armature/animation/CCArmatureAnimation.cpp \ -armature/animation/CCProcessBase.cpp \ -armature/animation/CCTween.cpp \ -armature/datas/CCDatas.cpp \ -armature/display/CCBatchNode.cpp \ -armature/display/CCDecorativeDisplay.cpp \ -armature/display/CCDisplayFactory.cpp \ -armature/display/CCDisplayManager.cpp \ -armature/display/CCSkin.cpp \ -armature/physics/CCColliderDetector.cpp \ -armature/utils/CCArmatureDataManager.cpp \ -armature/utils/CCArmatureDefine.cpp \ -armature/utils/CCDataReaderHelper.cpp \ -armature/utils/CCSpriteFrameCacheHelper.cpp \ -armature/utils/CCTransformHelp.cpp \ -armature/utils/CCTweenFunction.cpp \ -armature/utils/CCUtilMath.cpp \ -components/CCComAttribute.cpp \ -components/CCComAudio.cpp \ -components/CCComController.cpp \ -components/CCComRender.cpp \ -components/CCInputDelegate.cpp \ -json/CSContentJsonDictionary.cpp \ -json/DictionaryHelper.cpp \ -reader/CCSGUIReader.cpp \ -reader/CCSSceneReader.cpp \ +LOCAL_SRC_FILES := CCActionFrame.cpp \ +CCActionFrameEasing.cpp \ +CCActionManagerEx.cpp \ +CCActionNode.cpp \ +CCActionObject.cpp \ +CCArmature.cpp \ +CCBone.cpp \ +CCArmatureAnimation.cpp \ +CCProcessBase.cpp \ +CCTween.cpp \ +CCDatas.cpp \ +CCBatchNode.cpp \ +CCDecorativeDisplay.cpp \ +CCDisplayFactory.cpp \ +CCDisplayManager.cpp \ +CCSkin.cpp \ +CCColliderDetector.cpp \ +CCArmatureDataManager.cpp \ +CCArmatureDefine.cpp \ +CCDataReaderHelper.cpp \ +CCSpriteFrameCacheHelper.cpp \ +CCTransformHelp.cpp \ +CCTweenFunction.cpp \ +CCUtilMath.cpp \ +CCComAttribute.cpp \ +CCComAudio.cpp \ +CCComController.cpp \ +CCComRender.cpp \ +CCInputDelegate.cpp \ +CSContentJsonDictionary.cpp \ +DictionaryHelper.cpp \ +CCSGUIReader.cpp \ +CCSSceneReader.cpp \ ../../../external/json/json_reader.cpp \ ../../../external/json/json_value.cpp \ ../../../external/json/json_writer.cpp -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../../../external/json LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \ $(LOCAL_PATH)/../../../external/json \ -$(LOCAL_PATH) \ -$(LOCAL_PATH)/../../gui \ +$(LOCAL_PATH)/.. \ +$(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../../../external LOCAL_CFLAGS += -Wno-psabi -fexceptions diff --git a/cocos/editor-support/cocostudio/action/CCActionFrame.cpp b/cocos/editor-support/cocostudio/CCActionFrame.cpp similarity index 100% rename from cocos/editor-support/cocostudio/action/CCActionFrame.cpp rename to cocos/editor-support/cocostudio/CCActionFrame.cpp diff --git a/cocos/editor-support/cocostudio/action/CCActionFrame.h b/cocos/editor-support/cocostudio/CCActionFrame.h similarity index 100% rename from cocos/editor-support/cocostudio/action/CCActionFrame.h rename to cocos/editor-support/cocostudio/CCActionFrame.h diff --git a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp b/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp similarity index 98% rename from cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp rename to cocos/editor-support/cocostudio/CCActionFrameEasing.cpp index 74c7467c71..7694b6e53c 100644 --- a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.cpp +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.cpp @@ -23,8 +23,8 @@ ****************************************************************************/ #include -#include "CCActionFrameEasing.h" -#include "cocostudio/json/DictionaryHelper.h" +#include "cocostudio/CCActionFrameEasing.h" +#include "cocostudio/DictionaryHelper.h" namespace cocostudio { #ifndef M_PI_X_2 diff --git a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.h b/cocos/editor-support/cocostudio/CCActionFrameEasing.h similarity index 97% rename from cocos/editor-support/cocostudio/action/CCActionFrameEasing.h rename to cocos/editor-support/cocostudio/CCActionFrameEasing.h index 74ba932d4c..8e3fa2c1f4 100644 --- a/cocos/editor-support/cocostudio/action/CCActionFrameEasing.h +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.h @@ -26,7 +26,7 @@ #define __ActionFrameEasing_H__ #include "cocos2d.h" -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp similarity index 97% rename from cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp rename to cocos/editor-support/cocostudio/CCActionManagerEx.cpp index b863c1f9a2..68c02fed95 100644 --- a/cocos/editor-support/cocostudio/action/CCActionManagerEx.cpp +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCActionManagerEx.h" -#include "cocostudio/json/DictionaryHelper.h" +#include "cocostudio/CCActionManagerEx.h" +#include "cocostudio/DictionaryHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/action/CCActionManagerEx.h b/cocos/editor-support/cocostudio/CCActionManagerEx.h similarity index 96% rename from cocos/editor-support/cocostudio/action/CCActionManagerEx.h rename to cocos/editor-support/cocostudio/CCActionManagerEx.h index 8776fce030..09d62b10b6 100644 --- a/cocos/editor-support/cocostudio/action/CCActionManagerEx.h +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.h @@ -26,8 +26,8 @@ #define __ActionMANAGER_H__ #include "cocos2d.h" -#include "CCActionObject.h" -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "cocostudio/CCActionObject.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/action/CCActionNode.cpp b/cocos/editor-support/cocostudio/CCActionNode.cpp similarity index 98% rename from cocos/editor-support/cocostudio/action/CCActionNode.cpp rename to cocos/editor-support/cocostudio/CCActionNode.cpp index 1390d64ed6..fceca8816c 100644 --- a/cocos/editor-support/cocostudio/action/CCActionNode.cpp +++ b/cocos/editor-support/cocostudio/CCActionNode.cpp @@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCActionNode.h" -#include "CCActionFrameEasing.h" -#include "base-classes/UIWidget.h" -#include "system/UIHelper.h" -#include "cocostudio/json/DictionaryHelper.h" +#include "cocostudio/CCActionNode.h" +#include "cocostudio/CCActionFrameEasing.h" +#include "cocostudio/DictionaryHelper.h" +#include "gui/UIWidget.h" +#include "gui/UIHelper.h" using namespace cocos2d; using namespace gui; diff --git a/cocos/editor-support/cocostudio/action/CCActionNode.h b/cocos/editor-support/cocostudio/CCActionNode.h similarity index 98% rename from cocos/editor-support/cocostudio/action/CCActionNode.h rename to cocos/editor-support/cocostudio/CCActionNode.h index 67a424bda8..6f38a1a647 100644 --- a/cocos/editor-support/cocostudio/action/CCActionNode.h +++ b/cocos/editor-support/cocostudio/CCActionNode.h @@ -26,8 +26,8 @@ #define __ActionNODE_H__ #include "cocos2d.h" -#include "CCActionFrame.h" -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "cocostudio/CCActionFrame.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/action/CCActionObject.cpp b/cocos/editor-support/cocostudio/CCActionObject.cpp similarity index 98% rename from cocos/editor-support/cocostudio/action/CCActionObject.cpp rename to cocos/editor-support/cocostudio/CCActionObject.cpp index e218dca888..2dd60c66f2 100644 --- a/cocos/editor-support/cocostudio/action/CCActionObject.cpp +++ b/cocos/editor-support/cocostudio/CCActionObject.cpp @@ -22,8 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCActionObject.h" -#include "cocostudio/json/DictionaryHelper.h" +#include "cocostudio/CCActionObject.h" +#include "cocostudio/DictionaryHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/action/CCActionObject.h b/cocos/editor-support/cocostudio/CCActionObject.h similarity index 98% rename from cocos/editor-support/cocostudio/action/CCActionObject.h rename to cocos/editor-support/cocostudio/CCActionObject.h index 7137f57355..cc748eaaa8 100644 --- a/cocos/editor-support/cocostudio/action/CCActionObject.h +++ b/cocos/editor-support/cocostudio/CCActionObject.h @@ -27,7 +27,7 @@ #include "cocos2d.h" #include "CCActionNode.h" -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/CCArmature.cpp b/cocos/editor-support/cocostudio/CCArmature.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/CCArmature.cpp rename to cocos/editor-support/cocostudio/CCArmature.cpp index 7d4777d3f3..5885cbbd25 100644 --- a/cocos/editor-support/cocostudio/armature/CCArmature.cpp +++ b/cocos/editor-support/cocostudio/CCArmature.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCArmature.h" -#include "utils/CCArmatureDataManager.h" -#include "utils/CCArmatureDefine.h" -#include "utils/CCDataReaderHelper.h" -#include "datas/CCDatas.h" -#include "display/CCSkin.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDataReaderHelper.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCSkin.h" #if ENABLE_PHYSICS_BOX2D_DETECT #include "Box2D/Box2D.h" diff --git a/cocos/editor-support/cocostudio/armature/CCArmature.h b/cocos/editor-support/cocostudio/CCArmature.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/CCArmature.h rename to cocos/editor-support/cocostudio/CCArmature.h index bc0843c540..3e8c521011 100644 --- a/cocos/editor-support/cocostudio/armature/CCArmature.h +++ b/cocos/editor-support/cocostudio/CCArmature.h @@ -25,12 +25,12 @@ THE SOFTWARE. #ifndef __CCARMATURE_H__ #define __CCARMATURE_H__ -#include "utils/CCArmatureDefine.h" -#include "CCBone.h" -#include "display/CCBatchNode.h" -#include "animation/CCArmatureAnimation.h" -#include "utils/CCSpriteFrameCacheHelper.h" -#include "utils/CCArmatureDataManager.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCBatchNode.h" +#include "cocostudio/CCArmatureAnimation.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" +#include "cocostudio/CCArmatureDataManager.h" class b2Body; struct cpBody; diff --git a/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp b/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp similarity index 97% rename from cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp rename to cocos/editor-support/cocostudio/CCArmatureAnimation.cpp index 5490b4f4ee..a026fc33c9 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCArmatureAnimation.h" -#include "cocostudio/armature/CCArmature.h" -#include "cocostudio/armature/CCBone.h" -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/utils/CCUtilMath.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureAnimation.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCDatas.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.h b/cocos/editor-support/cocostudio/CCArmatureAnimation.h similarity index 99% rename from cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.h rename to cocos/editor-support/cocostudio/CCArmatureAnimation.h index b9ac3d4200..5fa819f285 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCArmatureAnimation.h +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCANIMATION_H__ #define __CCANIMATION_H__ -#include "CCProcessBase.h" +#include "cocostudio/CCProcessBase.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.cpp b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp similarity index 97% rename from cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.cpp rename to cocos/editor-support/cocostudio/CCArmatureDataManager.cpp index 2d507f6b69..113ff33202 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp @@ -23,10 +23,10 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCArmatureDataManager.h" -#include "CCTransformHelp.h" -#include "CCDataReaderHelper.h" -#include "CCSpriteFrameCacheHelper.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCDataReaderHelper.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h b/cocos/editor-support/cocostudio/CCArmatureDataManager.h similarity index 98% rename from cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h rename to cocos/editor-support/cocostudio/CCArmatureDataManager.h index 016156bec0..1bd426784d 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDataManager.h +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCARMATUREDATAMANAGER_H__ #define __CCARMATUREDATAMANAGER_H__ -#include "CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDefine.cpp b/cocos/editor-support/cocostudio/CCArmatureDefine.cpp similarity index 96% rename from cocos/editor-support/cocostudio/armature/utils/CCArmatureDefine.cpp rename to cocos/editor-support/cocostudio/CCArmatureDefine.cpp index 7ed21c9a3c..3672943778 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDefine.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureDefine.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCArmatureDefine.h b/cocos/editor-support/cocostudio/CCArmatureDefine.h similarity index 100% rename from cocos/editor-support/cocostudio/armature/utils/CCArmatureDefine.h rename to cocos/editor-support/cocostudio/CCArmatureDefine.h diff --git a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp b/cocos/editor-support/cocostudio/CCBatchNode.cpp similarity index 95% rename from cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp rename to cocos/editor-support/cocostudio/CCBatchNode.cpp index ba273731b1..0c6f7598ae 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.cpp +++ b/cocos/editor-support/cocostudio/CCBatchNode.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCBatchNode.h" -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/CCBatchNode.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCArmature.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.h b/cocos/editor-support/cocostudio/CCBatchNode.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/display/CCBatchNode.h rename to cocos/editor-support/cocostudio/CCBatchNode.h index 7e0c52bc29..df33e44e0b 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCBatchNode.h +++ b/cocos/editor-support/cocostudio/CCBatchNode.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCBATCHNODE_H__ #define __CCBATCHNODE_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/CCBone.cpp b/cocos/editor-support/cocostudio/CCBone.cpp similarity index 97% rename from cocos/editor-support/cocostudio/armature/CCBone.cpp rename to cocos/editor-support/cocostudio/CCBone.cpp index 52dea85860..abd0cb85a5 100644 --- a/cocos/editor-support/cocostudio/armature/CCBone.cpp +++ b/cocos/editor-support/cocostudio/CCBone.cpp @@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCBone.h" -#include "CCArmature.h" -#include "utils/CCUtilMath.h" -#include "utils/CCArmatureDataManager.h" -#include "utils/CCTransformHelp.h" -#include "display/CCDisplayManager.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCDisplayManager.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/CCBone.h b/cocos/editor-support/cocostudio/CCBone.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/CCBone.h rename to cocos/editor-support/cocostudio/CCBone.h index 85edc0f5b1..1163738515 100644 --- a/cocos/editor-support/cocostudio/armature/CCBone.h +++ b/cocos/editor-support/cocostudio/CCBone.h @@ -25,11 +25,11 @@ THE SOFTWARE. #ifndef __CCBONE_H__ #define __CCBONE_H__ -#include "utils/CCArmatureDefine.h" -#include "datas/CCDatas.h" -#include "animation/CCTween.h" -#include "display/CCDecorativeDisplay.h" -#include "display/CCDisplayManager.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCTween.h" +#include "cocostudio/CCDecorativeDisplay.h" +#include "cocostudio/CCDisplayManager.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp b/cocos/editor-support/cocostudio/CCColliderDetector.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp rename to cocos/editor-support/cocostudio/CCColliderDetector.cpp index f7e0c1c500..0839a30d7a 100644 --- a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.cpp +++ b/cocos/editor-support/cocostudio/CCColliderDetector.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCColliderDetector.h" -#include "cocostudio/armature/CCBone.h" -#include "cocostudio/armature/utils/CCTransformHelp.h" +#include "cocostudio/CCColliderDetector.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCTransformHelp.h" #if ENABLE_PHYSICS_BOX2D_DETECT #include "Box2D/Box2D.h" diff --git a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h b/cocos/editor-support/cocostudio/CCColliderDetector.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h rename to cocos/editor-support/cocostudio/CCColliderDetector.h index 5febb92aef..4f6fbeebfe 100644 --- a/cocos/editor-support/cocostudio/armature/physics/CCColliderDetector.h +++ b/cocos/editor-support/cocostudio/CCColliderDetector.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCCOLLIDERDETECTOR_H__ #define __CCCOLLIDERDETECTOR_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" #ifndef PT_RATIO #define PT_RATIO 32 diff --git a/cocos/editor-support/cocostudio/components/CCComAttribute.cpp b/cocos/editor-support/cocostudio/CCComAttribute.cpp similarity index 99% rename from cocos/editor-support/cocostudio/components/CCComAttribute.cpp rename to cocos/editor-support/cocostudio/CCComAttribute.cpp index 5f73dfeacc..f3e57eddbc 100644 --- a/cocos/editor-support/cocostudio/components/CCComAttribute.cpp +++ b/cocos/editor-support/cocostudio/CCComAttribute.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCComAttribute.h" +#include "cocostudio/CCComAttribute.h" using namespace cocos2d; namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComAttribute.h b/cocos/editor-support/cocostudio/CCComAttribute.h similarity index 97% rename from cocos/editor-support/cocostudio/components/CCComAttribute.h rename to cocos/editor-support/cocostudio/CCComAttribute.h index 959e8ac1b8..53c7c2c885 100644 --- a/cocos/editor-support/cocostudio/components/CCComAttribute.h +++ b/cocos/editor-support/cocostudio/CCComAttribute.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "cocos2d.h" #include -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComAudio.cpp b/cocos/editor-support/cocostudio/CCComAudio.cpp similarity index 99% rename from cocos/editor-support/cocostudio/components/CCComAudio.cpp rename to cocos/editor-support/cocostudio/CCComAudio.cpp index 29fcc308f4..76ac167ba7 100644 --- a/cocos/editor-support/cocostudio/components/CCComAudio.cpp +++ b/cocos/editor-support/cocostudio/CCComAudio.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCComAudio.h" +#include "cocostudio/CCComAudio.h" #include "SimpleAudioEngine.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComAudio.h b/cocos/editor-support/cocostudio/CCComAudio.h similarity index 100% rename from cocos/editor-support/cocostudio/components/CCComAudio.h rename to cocos/editor-support/cocostudio/CCComAudio.h diff --git a/cocos/editor-support/cocostudio/components/CCComController.cpp b/cocos/editor-support/cocostudio/CCComController.cpp similarity index 97% rename from cocos/editor-support/cocostudio/components/CCComController.cpp rename to cocos/editor-support/cocostudio/CCComController.cpp index 8bc321a1de..bf57a8724a 100644 --- a/cocos/editor-support/cocostudio/components/CCComController.cpp +++ b/cocos/editor-support/cocostudio/CCComController.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCComController.h" +#include "cocostudio/CCComController.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComController.h b/cocos/editor-support/cocostudio/CCComController.h similarity index 97% rename from cocos/editor-support/cocostudio/components/CCComController.h rename to cocos/editor-support/cocostudio/CCComController.h index 8fcb1c8879..00da3fa74f 100644 --- a/cocos/editor-support/cocostudio/components/CCComController.h +++ b/cocos/editor-support/cocostudio/CCComController.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CC_EXTENTIONS_CCCOMCONTROLLER_H__ #include "cocos2d.h" -#include "CCInputDelegate.h" +#include "cocostudio/CCInputDelegate.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComRender.cpp b/cocos/editor-support/cocostudio/CCComRender.cpp similarity index 98% rename from cocos/editor-support/cocostudio/components/CCComRender.cpp rename to cocos/editor-support/cocostudio/CCComRender.cpp index bfd19a48ab..95465444ea 100644 --- a/cocos/editor-support/cocostudio/components/CCComRender.cpp +++ b/cocos/editor-support/cocostudio/CCComRender.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCComRender.h" +#include "cocostudio/CCComRender.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCComRender.h b/cocos/editor-support/cocostudio/CCComRender.h similarity index 100% rename from cocos/editor-support/cocostudio/components/CCComRender.h rename to cocos/editor-support/cocostudio/CCComRender.h diff --git a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp similarity index 99% rename from cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp rename to cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index d1dc3e0655..4749f5eaf9 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -23,12 +23,12 @@ THE SOFTWARE. ****************************************************************************/ #include "tinyxml2.h" -#include "CCDataReaderHelper.h" -#include "CCArmatureDataManager.h" -#include "CCTransformHelp.h" -#include "CCUtilMath.h" -#include "CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCDataReaderHelper.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h b/cocos/editor-support/cocostudio/CCDataReaderHelper.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h rename to cocos/editor-support/cocostudio/CCDataReaderHelper.h index be8b4c9297..d5c8a0d6f5 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCDataReaderHelper.h +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.h @@ -25,10 +25,10 @@ THE SOFTWARE. #ifndef __CCDATAREADERHELPER_H__ #define __CCDATAREADERHELPER_H__ -#include "CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" -#include "cocostudio/armature/CCArmature.h" -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CSContentJsonDictionary.h" #include #include diff --git a/cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp rename to cocos/editor-support/cocostudio/CCDatas.cpp index 6d2468cb58..35d6461efc 100644 --- a/cocos/editor-support/cocostudio/armature/datas/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -22,9 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCDatas.h" -#include "cocostudio/armature/utils/CCUtilMath.h" -#include "cocostudio/armature/utils/CCTransformHelp.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCTransformHelp.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/datas/CCDatas.h b/cocos/editor-support/cocostudio/CCDatas.h similarity index 99% rename from cocos/editor-support/cocostudio/armature/datas/CCDatas.h rename to cocos/editor-support/cocostudio/CCDatas.h index 2725750c84..26128020cf 100644 --- a/cocos/editor-support/cocostudio/armature/datas/CCDatas.h +++ b/cocos/editor-support/cocostudio/CCDatas.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCARMATURE_DATAS_H__ #define __CCARMATURE_DATAS_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/utils/CCTweenFunction.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCTweenFunction.h" #define CC_CREATE_NO_PARAM_NO_INIT(varType)\ diff --git a/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.cpp b/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp similarity index 97% rename from cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.cpp rename to cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp index 0213219ddb..e595ecbe0c 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.cpp +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCDecorativeDisplay.h" +#include "cocostudio/CCDecorativeDisplay.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h similarity index 91% rename from cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h rename to cocos/editor-support/cocostudio/CCDecorativeDisplay.h index f65f143163..7196d0e9ec 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDecorativeDisplay.h +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h @@ -25,13 +25,13 @@ THE SOFTWARE. #ifndef __CCDECORATIVEDISPLAY_H__ #define __CCDECORATIVEDISPLAY_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "CCDisplayFactory.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDisplayFactory.h" +#include "cocostudio/CCDatas.h" #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT -#include "../physics/CCColliderDetector.h" +#include "cocostudio/CCColliderDetector.h" #endif namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp b/cocos/editor-support/cocostudio/CCDisplayFactory.cpp similarity index 96% rename from cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp rename to cocos/editor-support/cocostudio/CCDisplayFactory.cpp index 56e5f8c427..034f115481 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.cpp +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.cpp @@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCDisplayFactory.h" -#include "cocostudio/armature/CCBone.h" -#include "cocostudio/armature/CCArmature.h" -#include "cocostudio/armature/display/CCSkin.h" -#include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h" -#include "cocostudio/armature/utils/CCArmatureDataManager.h" -#include "cocostudio/armature/utils/CCTransformHelp.h" +#include "cocostudio/CCDisplayFactory.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCSkin.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCTransformHelp.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h b/cocos/editor-support/cocostudio/CCDisplayFactory.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h rename to cocos/editor-support/cocostudio/CCDisplayFactory.h index f8f6009ffb..3ef0725ff0 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayFactory.h +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCDISPLAYFACTORY_H__ #define __CCDISPLAYFACTORY_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp b/cocos/editor-support/cocostudio/CCDisplayManager.cpp similarity index 97% rename from cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp rename to cocos/editor-support/cocostudio/CCDisplayManager.cpp index 29ae581cbb..b7d337e3a9 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.cpp +++ b/cocos/editor-support/cocostudio/CCDisplayManager.cpp @@ -22,11 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCDisplayManager.h" -#include "cocostudio/armature/CCBone.h" -#include "cocostudio/armature/CCArmature.h" -#include "cocostudio/armature/utils/CCUtilMath.h" -#include "cocostudio/armature/display/CCSkin.h" +#include "cocostudio/CCDisplayManager.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCSkin.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h b/cocos/editor-support/cocostudio/CCDisplayManager.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h rename to cocos/editor-support/cocostudio/CCDisplayManager.h index fd51ca759b..9953d77995 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCDisplayManager.h +++ b/cocos/editor-support/cocostudio/CCDisplayManager.h @@ -25,9 +25,9 @@ THE SOFTWARE. #ifndef __CCDISPLAYMANAGER_H__ #define __CCDISPLAYMANAGER_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/display/CCDecorativeDisplay.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDecorativeDisplay.h" +#include "cocostudio/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/components/CCInputDelegate.cpp b/cocos/editor-support/cocostudio/CCInputDelegate.cpp similarity index 99% rename from cocos/editor-support/cocostudio/components/CCInputDelegate.cpp rename to cocos/editor-support/cocostudio/CCInputDelegate.cpp index 65664400c7..9f4fd46a8d 100644 --- a/cocos/editor-support/cocostudio/components/CCInputDelegate.cpp +++ b/cocos/editor-support/cocostudio/CCInputDelegate.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCInputDelegate.h" +#include "cocostudio/CCInputDelegate.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/components/CCInputDelegate.h b/cocos/editor-support/cocostudio/CCInputDelegate.h similarity index 100% rename from cocos/editor-support/cocostudio/components/CCInputDelegate.h rename to cocos/editor-support/cocostudio/CCInputDelegate.h diff --git a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp b/cocos/editor-support/cocostudio/CCProcessBase.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp rename to cocos/editor-support/cocostudio/CCProcessBase.cpp index e235c1cb1e..c3e1bfbc20 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.cpp +++ b/cocos/editor-support/cocostudio/CCProcessBase.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCProcessBase.h" -#include "cocostudio/armature/utils/CCUtilMath.h" +#include "cocostudio/CCProcessBase.h" +#include "cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h b/cocos/editor-support/cocostudio/CCProcessBase.h similarity index 98% rename from cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h rename to cocos/editor-support/cocostudio/CCProcessBase.h index 3d247e51a4..9f80fb2ea7 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCProcessBase.h +++ b/cocos/editor-support/cocostudio/CCProcessBase.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCPROCESSBASE_H__ #define __CCPROCESSBASE_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp b/cocos/editor-support/cocostudio/CCSGUIReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp rename to cocos/editor-support/cocostudio/CCSGUIReader.cpp index ad0eb9ef8d..77cb5d56de 100755 --- a/cocos/editor-support/cocostudio/reader/CCSGUIReader.cpp +++ b/cocos/editor-support/cocostudio/CCSGUIReader.cpp @@ -21,10 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - -#include "system/CocosGUI.h" -#include "cocostudio/json/DictionaryHelper.h" -#include "cocostudio/action/CCActionManagerEx.h" +#include "cocostudio/CCSGUIReader.h" +#include "gui/CocosGUI.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CCActionManagerEx.h" #include #include diff --git a/cocos/editor-support/cocostudio/reader/CCSGUIReader.h b/cocos/editor-support/cocostudio/CCSGUIReader.h similarity index 97% rename from cocos/editor-support/cocostudio/reader/CCSGUIReader.h rename to cocos/editor-support/cocostudio/CCSGUIReader.h index 0041997bcd..d39c349ee0 100755 --- a/cocos/editor-support/cocostudio/reader/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/CCSGUIReader.h @@ -25,8 +25,8 @@ #ifndef __CCSGUIREADER_H__ #define __CCSGUIREADER_H__ -#include "base-classes/UIWidget.h" -#include "cocostudio/json/CSContentJsonDictionary.h" +#include "gui/UIWidget.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/reader/CCSSceneReader.cpp b/cocos/editor-support/cocostudio/CCSSceneReader.cpp similarity index 99% rename from cocos/editor-support/cocostudio/reader/CCSSceneReader.cpp rename to cocos/editor-support/cocostudio/CCSSceneReader.cpp index a32572d791..3d8bc7fd8c 100644 --- a/cocos/editor-support/cocostudio/reader/CCSSceneReader.cpp +++ b/cocos/editor-support/cocostudio/CCSSceneReader.cpp @@ -22,9 +22,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCSSceneReader.h" -#include "CocoStudio.h" -#include "system/CocosGUI.h" +#include "cocostudio/CocoStudio.h" +#include "gui/CocosGUI.h" using namespace cocos2d; using namespace gui; diff --git a/cocos/editor-support/cocostudio/reader/CCSSceneReader.h b/cocos/editor-support/cocostudio/CCSSceneReader.h similarity index 97% rename from cocos/editor-support/cocostudio/reader/CCSSceneReader.h rename to cocos/editor-support/cocostudio/CCSSceneReader.h index a042edfbf2..f548a2573f 100644 --- a/cocos/editor-support/cocostudio/reader/CCSSceneReader.h +++ b/cocos/editor-support/cocostudio/CCSSceneReader.h @@ -26,7 +26,7 @@ #define __CCSSCENEREADER_H__ #include "cocos2d.h" - #include "cocostudio/json/CSContentJsonDictionary.h" + #include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/display/CCSkin.cpp b/cocos/editor-support/cocostudio/CCSkin.cpp similarity index 96% rename from cocos/editor-support/cocostudio/armature/display/CCSkin.cpp rename to cocos/editor-support/cocostudio/CCSkin.cpp index ecc83c7ff6..afd6f5fc51 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCSkin.cpp +++ b/cocos/editor-support/cocostudio/CCSkin.cpp @@ -22,10 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSkin.h" -#include "cocostudio/armature/utils/CCTransformHelp.h" -#include "cocostudio/armature/utils/CCSpriteFrameCacheHelper.h" -#include "cocostudio/armature/CCArmature.h" +#include "cocostudio/CCSkin.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" +#include "cocostudio/CCArmature.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/display/CCSkin.h b/cocos/editor-support/cocostudio/CCSkin.h similarity index 95% rename from cocos/editor-support/cocostudio/armature/display/CCSkin.h rename to cocos/editor-support/cocostudio/CCSkin.h index 1915ff550b..3494c48436 100644 --- a/cocos/editor-support/cocostudio/armature/display/CCSkin.h +++ b/cocos/editor-support/cocostudio/CCSkin.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCSKIN_H__ #define __CCSKIN_H__ -#include "cocostudio/armature/utils/CCArmatureDefine.h" -#include "cocostudio/armature/CCBone.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCBone.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCSpriteFrameCacheHelper.cpp b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/utils/CCSpriteFrameCacheHelper.cpp rename to cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp index d17dab4fa2..d783c4ba4e 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCSpriteFrameCacheHelper.cpp +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCSpriteFrameCacheHelper.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCSpriteFrameCacheHelper.h b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h similarity index 98% rename from cocos/editor-support/cocostudio/armature/utils/CCSpriteFrameCacheHelper.h rename to cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h index 6e1a4fe094..150fe96aaa 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCSpriteFrameCacheHelper.h +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h @@ -24,7 +24,7 @@ THE SOFTWARE. #ifndef __CCSPRITEFRAMECACHEHELPER_H__ #define __CCSPRITEFRAMECACHEHELPER_H__ -#include "CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" #include using namespace std; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.cpp b/cocos/editor-support/cocostudio/CCTransformHelp.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.cpp rename to cocos/editor-support/cocostudio/CCTransformHelp.cpp index 133dbba1d2..a836055c16 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.cpp +++ b/cocos/editor-support/cocostudio/CCTransformHelp.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCTransformHelp.h" -#include "CCUtilMath.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h b/cocos/editor-support/cocostudio/CCTransformHelp.h similarity index 96% rename from cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h rename to cocos/editor-support/cocostudio/CCTransformHelp.h index 195d5a1468..ae1bcbf813 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCTransformHelp.h +++ b/cocos/editor-support/cocostudio/CCTransformHelp.h @@ -25,8 +25,8 @@ THE SOFTWARE. #ifndef __CCTRANSFORMHELP_H__ #define __CCTRANSFORMHELP_H__ -#include "CCArmatureDefine.h" -#include "cocostudio/armature/datas/CCDatas.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDatas.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/animation/CCTween.cpp b/cocos/editor-support/cocostudio/CCTween.cpp similarity index 97% rename from cocos/editor-support/cocostudio/armature/animation/CCTween.cpp rename to cocos/editor-support/cocostudio/CCTween.cpp index c9ba8cbe6e..8fec95b2a0 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCTween.cpp +++ b/cocos/editor-support/cocostudio/CCTween.cpp @@ -23,13 +23,13 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCTween.h" -#include "CCArmatureAnimation.h" -#include "cocostudio/armature/CCBone.h" -#include "cocostudio/armature/CCArmature.h" -#include "cocostudio/armature/utils/CCUtilMath.h" -#include "cocostudio/armature/utils/CCTweenFunction.h" -#include "cocostudio/armature/utils/CCTransformHelp.h" +#include "cocostudio/CCTween.h" +#include "cocostudio/CCArmatureAnimation.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCTweenFunction.h" +#include "cocostudio/CCTransformHelp.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/animation/CCTween.h b/cocos/editor-support/cocostudio/CCTween.h similarity index 98% rename from cocos/editor-support/cocostudio/armature/animation/CCTween.h rename to cocos/editor-support/cocostudio/CCTween.h index f78e7ef927..80b6c6d7e9 100644 --- a/cocos/editor-support/cocostudio/armature/animation/CCTween.h +++ b/cocos/editor-support/cocostudio/CCTween.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCTWEEN_H__ #define __CCTWEEN_H__ -#include "CCProcessBase.h" -#include "cocostudio/armature/utils/CCTweenFunction.h" +#include "cocostudio/CCProcessBase.h" +#include "cocostudio/CCTweenFunction.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.cpp b/cocos/editor-support/cocostudio/CCTweenFunction.cpp similarity index 99% rename from cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.cpp rename to cocos/editor-support/cocostudio/CCTweenFunction.cpp index 21b20e6f1a..37b523fc79 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.cpp +++ b/cocos/editor-support/cocostudio/CCTweenFunction.cpp @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCTweenFunction.h" -#include "CCUtilMath.h" +#include "cocostudio/CCTweenFunction.h" +#include "cocostudio/CCUtilMath.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.h b/cocos/editor-support/cocostudio/CCTweenFunction.h similarity index 99% rename from cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.h rename to cocos/editor-support/cocostudio/CCTweenFunction.h index 0951bf1eea..255d19d58e 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCTweenFunction.h +++ b/cocos/editor-support/cocostudio/CCTweenFunction.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CCTWEENFUNCTION_H__ -#include "CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" #include namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/armature/utils/CCUtilMath.cpp b/cocos/editor-support/cocostudio/CCUtilMath.cpp similarity index 98% rename from cocos/editor-support/cocostudio/armature/utils/CCUtilMath.cpp rename to cocos/editor-support/cocostudio/CCUtilMath.cpp index c696e2a6fe..0714958857 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCUtilMath.cpp +++ b/cocos/editor-support/cocostudio/CCUtilMath.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCUtilMath.h" +#include "cocostudio/CCUtilMath.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/armature/utils/CCUtilMath.h b/cocos/editor-support/cocostudio/CCUtilMath.h similarity index 98% rename from cocos/editor-support/cocostudio/armature/utils/CCUtilMath.h rename to cocos/editor-support/cocostudio/CCUtilMath.h index b767cdcc58..20541a8c80 100644 --- a/cocos/editor-support/cocostudio/armature/utils/CCUtilMath.h +++ b/cocos/editor-support/cocostudio/CCUtilMath.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CCUTILMATH_H__ #define __CCUTILMATH_H__ -#include "CCArmatureDefine.h" +#include "cocostudio/CCArmatureDefine.h" #include namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.cpp b/cocos/editor-support/cocostudio/CSContentJsonDictionary.cpp similarity index 99% rename from cocos/editor-support/cocostudio/json/CSContentJsonDictionary.cpp rename to cocos/editor-support/cocostudio/CSContentJsonDictionary.cpp index 287d742a1c..2f88410582 100644 --- a/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.cpp +++ b/cocos/editor-support/cocostudio/CSContentJsonDictionary.cpp @@ -25,7 +25,7 @@ */ #include -#include "CSContentJsonDictionary.h" +#include "cocostudio/CSContentJsonDictionary.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h b/cocos/editor-support/cocostudio/CSContentJsonDictionary.h similarity index 100% rename from cocos/editor-support/cocostudio/json/CSContentJsonDictionary.h rename to cocos/editor-support/cocostudio/CSContentJsonDictionary.h diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h index be6d9d807b..03c06775a6 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ b/cocos/editor-support/cocostudio/CocoStudio.h @@ -25,38 +25,38 @@ #ifndef __EDITOR_SUPPORT_COCOSTUDIO_H__ #define __EDITOR_SUPPORT_COCOSTUDIO_H__ -#include "action/CCActionFrame.h" -#include "action/CCActionFrameEasing.h" -#include "action/CCActionManagerEx.h" -#include "action/CCActionNode.h" -#include "action/CCActionObject.h" -#include "armature/CCArmature.h" -#include "armature/CCBone.h" -#include "armature/animation/CCArmatureAnimation.h" -#include "armature/animation/CCProcessBase.h" -#include "armature/animation/CCTween.h" -#include "armature/datas/CCDatas.h" -#include "armature/display/CCBatchNode.h" -#include "armature/display/CCDecorativeDisplay.h" -#include "armature/display/CCDisplayFactory.h" -#include "armature/display/CCDisplayManager.h" -#include "armature/display/CCSkin.h" -#include "armature/physics/CCColliderDetector.h" -#include "armature/utils/CCArmatureDataManager.h" -#include "armature/utils/CCArmatureDefine.h" -#include "armature/utils/CCDataReaderHelper.h" -#include "armature/utils/CCSpriteFrameCacheHelper.h" -#include "armature/utils/CCTransformHelp.h" -#include "armature/utils/CCTweenFunction.h" -#include "armature/utils/CCUtilMath.h" -#include "components/CCComAttribute.h" -#include "components/CCComAudio.h" -#include "components/CCComController.h" -#include "components/CCComRender.h" -#include "components/CCInputDelegate.h" -#include "json/CSContentJsonDictionary.h" -#include "json/DictionaryHelper.h" -#include "reader/CCSGUIReader.h" -#include "reader/CCSSceneReader.h" +#include "cocostudio/CCActionFrame.h" +#include "cocostudio/CCActionFrameEasing.h" +#include "cocostudio/CCActionManagerEx.h" +#include "cocostudio/CCActionNode.h" +#include "cocostudio/CCActionObject.h" +#include "cocostudio/CCArmature.h" +#include "cocostudio/CCBone.h" +#include "cocostudio/CCArmatureAnimation.h" +#include "cocostudio/CCProcessBase.h" +#include "cocostudio/CCTween.h" +#include "cocostudio/CCDatas.h" +#include "cocostudio/CCBatchNode.h" +#include "cocostudio/CCDecorativeDisplay.h" +#include "cocostudio/CCDisplayFactory.h" +#include "cocostudio/CCDisplayManager.h" +#include "cocostudio/CCSkin.h" +#include "cocostudio/CCColliderDetector.h" +#include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CCDataReaderHelper.h" +#include "cocostudio/CCSpriteFrameCacheHelper.h" +#include "cocostudio/CCTransformHelp.h" +#include "cocostudio/CCTweenFunction.h" +#include "cocostudio/CCUtilMath.h" +#include "cocostudio/CCComAttribute.h" +#include "cocostudio/CCComAudio.h" +#include "cocostudio/CCComController.h" +#include "cocostudio/CCComRender.h" +#include "cocostudio/CCInputDelegate.h" +#include "cocostudio/CSContentJsonDictionary.h" +#include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CCSGUIReader.h" +#include "cocostudio/CCSSceneReader.h" #endif diff --git a/cocos/editor-support/cocostudio/json/DictionaryHelper.cpp b/cocos/editor-support/cocostudio/DictionaryHelper.cpp similarity index 99% rename from cocos/editor-support/cocostudio/json/DictionaryHelper.cpp rename to cocos/editor-support/cocostudio/DictionaryHelper.cpp index ab72de178e..48466eeb3e 100644 --- a/cocos/editor-support/cocostudio/json/DictionaryHelper.cpp +++ b/cocos/editor-support/cocostudio/DictionaryHelper.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "DictionaryHelper.h" +#include "cocostudio/DictionaryHelper.h" namespace cocostudio { diff --git a/cocos/editor-support/cocostudio/json/DictionaryHelper.h b/cocos/editor-support/cocostudio/DictionaryHelper.h similarity index 98% rename from cocos/editor-support/cocostudio/json/DictionaryHelper.h rename to cocos/editor-support/cocostudio/DictionaryHelper.h index e3f34e54ed..33aa5802ed 100644 --- a/cocos/editor-support/cocostudio/json/DictionaryHelper.h +++ b/cocos/editor-support/cocostudio/DictionaryHelper.h @@ -26,7 +26,7 @@ #define __DICTIONARYHELPER_H__ #include "cocos2d.h" -#include "CSContentJsonDictionary.h" +#include "cocostudio/CSContentJsonDictionary.h" #define DICTOOL DictionaryHelper::shareHelper() diff --git a/cocos/editor-support/cocostudio/json/.DS_Store b/cocos/editor-support/cocostudio/json/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h index 069aa13273..481472dba3 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h @@ -33,7 +33,7 @@ #import #import -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" #include "CCEditBoxImpl.h" @interface CCCustomNSTextField : NSTextField diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h b/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h index 84e1ae11f1..8395ecce71 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h @@ -31,7 +31,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_TIZEN) -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" #include "CCEditBoxImpl.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWin.h b/extensions/GUI/CCEditBox/CCEditBoxImplWin.h index 75d29c342e..2b379efe83 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWin.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWin.h @@ -30,7 +30,7 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" #include "CCEditBoxImpl.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index cb03d57c08..5b002887ee 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -27,7 +27,7 @@ #define __CCSCROLLVIEW_H__ #include "cocos2d.h" -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCScrollView/CCSorting.h b/extensions/GUI/CCScrollView/CCSorting.h index eca6fafc4a..7c182b193c 100644 --- a/extensions/GUI/CCScrollView/CCSorting.h +++ b/extensions/GUI/CCScrollView/CCSorting.h @@ -27,7 +27,7 @@ #define __CCSORTING_H__ #include "CCArray.h" -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" NS_CC_EXT_BEGIN diff --git a/extensions/assets-manager/AssetsManager.h b/extensions/assets-manager/AssetsManager.h index 7c1781b9b9..23e1a27774 100644 --- a/extensions/assets-manager/AssetsManager.h +++ b/extensions/assets-manager/AssetsManager.h @@ -30,7 +30,7 @@ #include #include "cocos2d.h" -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" NS_CC_EXT_BEGIN diff --git a/extensions/physics-nodes/CCPhysicsDebugNode.h b/extensions/physics-nodes/CCPhysicsDebugNode.h index 9f793c0a4f..fe4d167bff 100644 --- a/extensions/physics-nodes/CCPhysicsDebugNode.h +++ b/extensions/physics-nodes/CCPhysicsDebugNode.h @@ -24,7 +24,7 @@ #define __PHYSICSNODES_DEBUGNODE_H__ #include "cocos2d.h" -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" #if CC_ENABLE_CHIPMUNK_INTEGRATION diff --git a/extensions/physics-nodes/CCPhysicsSprite.h b/extensions/physics-nodes/CCPhysicsSprite.h index c21dd185da..1252af5919 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.h +++ b/extensions/physics-nodes/CCPhysicsSprite.h @@ -23,7 +23,7 @@ #define __PHYSICSNODES_CCPHYSICSSPRITE_H__ #include "cocos2d.h" -#include "ExtensionMacros.h" +#include "extensions/ExtensionMacros.h" struct cpBody; class b2Body; diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk index 9ed6038242..bd0a8e37e6 100644 --- a/samples/Cpp/TestCpp/Android.mk +++ b/samples/Cpp/TestCpp/Android.mk @@ -7,137 +7,137 @@ LOCAL_MODULE := cocos_testcpp_common LOCAL_MODULE_FILENAME := libtestcppcommon LOCAL_SRC_FILES := \ -$(LOCAL_PATH)/Classes/AppDelegate.cpp \ -$(LOCAL_PATH)/Classes/BaseTest.cpp \ -$(LOCAL_PATH)/Classes/controller.cpp \ -$(LOCAL_PATH)/Classes/testBasic.cpp \ -$(LOCAL_PATH)/Classes/VisibleRect.cpp \ -$(LOCAL_PATH)/Classes/AccelerometerTest/AccelerometerTest.cpp \ -$(LOCAL_PATH)/Classes/ActionManagerTest/ActionManagerTest.cpp \ -$(LOCAL_PATH)/Classes/ActionsEaseTest/ActionsEaseTest.cpp \ -$(LOCAL_PATH)/Classes/ActionsProgressTest/ActionsProgressTest.cpp \ -$(LOCAL_PATH)/Classes/ActionsTest/ActionsTest.cpp \ -$(LOCAL_PATH)/Classes/Box2DTest/Box2dTest.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/Box2dView.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/GLES-Render.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/Test.cpp \ -$(LOCAL_PATH)/Classes/Box2DTestBed/TestEntries.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-1159.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-1174.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-350.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-422.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-624.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-886.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-899.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-914.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/BugsTest.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-458/Bug-458.cpp \ -$(LOCAL_PATH)/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ -$(LOCAL_PATH)/Classes/ChipmunkTest/ChipmunkTest.cpp \ -$(LOCAL_PATH)/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ -$(LOCAL_PATH)/Classes/ClippingNodeTest/ClippingNodeTest.cpp \ -$(LOCAL_PATH)/Classes/CocosDenshionTest/CocosDenshionTest.cpp \ -$(LOCAL_PATH)/Classes/ConfigurationTest/ConfigurationTest.cpp \ -$(LOCAL_PATH)/Classes/CurlTest/CurlTest.cpp \ -$(LOCAL_PATH)/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \ -$(LOCAL_PATH)/Classes/DataVisitorTest/DataVisitorTest.cpp \ -$(LOCAL_PATH)/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ -$(LOCAL_PATH)/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ -$(LOCAL_PATH)/Classes/EffectsTest/EffectsTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ExtensionsTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \ -$(LOCAL_PATH)/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \ -$(LOCAL_PATH)/Classes/FileUtilsTest/FileUtilsTest.cpp \ -$(LOCAL_PATH)/Classes/FontTest/FontTest.cpp \ -$(LOCAL_PATH)/Classes/IntervalTest/IntervalTest.cpp \ -$(LOCAL_PATH)/Classes/KeyboardTest/KeyboardTest.cpp \ -$(LOCAL_PATH)/Classes/KeypadTest/KeypadTest.cpp \ -$(LOCAL_PATH)/Classes/LabelTest/LabelTest.cpp \ -$(LOCAL_PATH)/Classes/LabelTest/LabelTestNew.cpp \ -$(LOCAL_PATH)/Classes/LayerTest/LayerTest.cpp \ -$(LOCAL_PATH)/Classes/MenuTest/MenuTest.cpp \ -$(LOCAL_PATH)/Classes/MotionStreakTest/MotionStreakTest.cpp \ -$(LOCAL_PATH)/Classes/MutiTouchTest/MutiTouchTest.cpp \ -$(LOCAL_PATH)/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \ -$(LOCAL_PATH)/Classes/NodeTest/NodeTest.cpp \ -$(LOCAL_PATH)/Classes/ParallaxTest/ParallaxTest.cpp \ -$(LOCAL_PATH)/Classes/ParticleTest/ParticleTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceAllocTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceParticleTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceSpriteTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTextureTest.cpp \ -$(LOCAL_PATH)/Classes/PerformanceTest/PerformanceTouchesTest.cpp \ -$(LOCAL_PATH)/Classes/PhysicsTest/PhysicsTest.cpp \ -$(LOCAL_PATH)/Classes/RenderTextureTest/RenderTextureTest.cpp \ -$(LOCAL_PATH)/Classes/RotateWorldTest/RotateWorldTest.cpp \ -$(LOCAL_PATH)/Classes/SceneTest/SceneTest.cpp \ -$(LOCAL_PATH)/Classes/SchedulerTest/SchedulerTest.cpp \ -$(LOCAL_PATH)/Classes/ShaderTest/ShaderTest.cpp \ -$(LOCAL_PATH)/Classes/ShaderTest/ShaderTest2.cpp \ -$(LOCAL_PATH)/Classes/SpineTest/SpineTest.cpp \ -$(LOCAL_PATH)/Classes/SpriteTest/SpriteTest.cpp \ -$(LOCAL_PATH)/Classes/TextInputTest/TextInputTest.cpp \ -$(LOCAL_PATH)/Classes/Texture2dTest/Texture2dTest.cpp \ -$(LOCAL_PATH)/Classes/TextureCacheTest/TextureCacheTest.cpp \ -$(LOCAL_PATH)/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \ -$(LOCAL_PATH)/Classes/TileMapTest/TileMapTest.cpp \ -$(LOCAL_PATH)/Classes/TouchesTest/Ball.cpp \ -$(LOCAL_PATH)/Classes/TouchesTest/Paddle.cpp \ -$(LOCAL_PATH)/Classes/TouchesTest/TouchesTest.cpp \ -$(LOCAL_PATH)/Classes/TransitionsTest/TransitionsTest.cpp \ -$(LOCAL_PATH)/Classes/UserDefaultTest/UserDefaultTest.cpp \ -$(LOCAL_PATH)/Classes/ZwoptexTest/ZwoptexTest.cpp +Classes/AppDelegate.cpp \ +Classes/BaseTest.cpp \ +Classes/controller.cpp \ +Classes/testBasic.cpp \ +Classes/VisibleRect.cpp \ +Classes/AccelerometerTest/AccelerometerTest.cpp \ +Classes/ActionManagerTest/ActionManagerTest.cpp \ +Classes/ActionsEaseTest/ActionsEaseTest.cpp \ +Classes/ActionsProgressTest/ActionsProgressTest.cpp \ +Classes/ActionsTest/ActionsTest.cpp \ +Classes/Box2DTest/Box2dTest.cpp \ +Classes/Box2DTestBed/Box2dView.cpp \ +Classes/Box2DTestBed/GLES-Render.cpp \ +Classes/Box2DTestBed/Test.cpp \ +Classes/Box2DTestBed/TestEntries.cpp \ +Classes/BugsTest/Bug-1159.cpp \ +Classes/BugsTest/Bug-1174.cpp \ +Classes/BugsTest/Bug-350.cpp \ +Classes/BugsTest/Bug-422.cpp \ +Classes/BugsTest/Bug-624.cpp \ +Classes/BugsTest/Bug-886.cpp \ +Classes/BugsTest/Bug-899.cpp \ +Classes/BugsTest/Bug-914.cpp \ +Classes/BugsTest/BugsTest.cpp \ +Classes/BugsTest/Bug-458/Bug-458.cpp \ +Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ +Classes/ChipmunkTest/ChipmunkTest.cpp \ +Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ +Classes/ClippingNodeTest/ClippingNodeTest.cpp \ +Classes/CocosDenshionTest/CocosDenshionTest.cpp \ +Classes/ConfigurationTest/ConfigurationTest.cpp \ +Classes/CurlTest/CurlTest.cpp \ +Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \ +Classes/DataVisitorTest/DataVisitorTest.cpp \ +Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ +Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ +Classes/EffectsTest/EffectsTest.cpp \ +Classes/ExtensionsTest/ExtensionsTest.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp \ +Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ +Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp \ +Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp \ +Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp \ +Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \ +Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \ +Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \ +Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \ +Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \ +Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp \ +Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp \ +Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \ +Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \ +Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp \ +Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \ +Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ +Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \ +Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \ +Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \ +Classes/FileUtilsTest/FileUtilsTest.cpp \ +Classes/FontTest/FontTest.cpp \ +Classes/IntervalTest/IntervalTest.cpp \ +Classes/KeyboardTest/KeyboardTest.cpp \ +Classes/KeypadTest/KeypadTest.cpp \ +Classes/LabelTest/LabelTest.cpp \ +Classes/LabelTest/LabelTestNew.cpp \ +Classes/LayerTest/LayerTest.cpp \ +Classes/MenuTest/MenuTest.cpp \ +Classes/MotionStreakTest/MotionStreakTest.cpp \ +Classes/MutiTouchTest/MutiTouchTest.cpp \ +Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \ +Classes/NodeTest/NodeTest.cpp \ +Classes/ParallaxTest/ParallaxTest.cpp \ +Classes/ParticleTest/ParticleTest.cpp \ +Classes/PerformanceTest/PerformanceAllocTest.cpp \ +Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ +Classes/PerformanceTest/PerformanceParticleTest.cpp \ +Classes/PerformanceTest/PerformanceSpriteTest.cpp \ +Classes/PerformanceTest/PerformanceTest.cpp \ +Classes/PerformanceTest/PerformanceTextureTest.cpp \ +Classes/PerformanceTest/PerformanceTouchesTest.cpp \ +Classes/PhysicsTest/PhysicsTest.cpp \ +Classes/RenderTextureTest/RenderTextureTest.cpp \ +Classes/RotateWorldTest/RotateWorldTest.cpp \ +Classes/SceneTest/SceneTest.cpp \ +Classes/SchedulerTest/SchedulerTest.cpp \ +Classes/ShaderTest/ShaderTest.cpp \ +Classes/ShaderTest/ShaderTest2.cpp \ +Classes/SpineTest/SpineTest.cpp \ +Classes/SpriteTest/SpriteTest.cpp \ +Classes/TextInputTest/TextInputTest.cpp \ +Classes/Texture2dTest/Texture2dTest.cpp \ +Classes/TextureCacheTest/TextureCacheTest.cpp \ +Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp \ +Classes/TileMapTest/TileMapTest.cpp \ +Classes/TouchesTest/Ball.cpp \ +Classes/TouchesTest/Paddle.cpp \ +Classes/TouchesTest/TouchesTest.cpp \ +Classes/TransitionsTest/TransitionsTest.cpp \ +Classes/UserDefaultTest/UserDefaultTest.cpp \ +Classes/ZwoptexTest/ZwoptexTest.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes @@ -153,7 +153,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static LOCAL_WHOLE_STATIC_LIBRARIES += network_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes include $(BUILD_STATIC_LIBRARY) diff --git a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp b/samples/Cpp/TestCpp/Classes/AppDelegate.cpp index 515a63c9be..ddd7936152 100644 --- a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp +++ b/samples/Cpp/TestCpp/Classes/AppDelegate.cpp @@ -4,7 +4,7 @@ #include "controller.h" #include "SimpleAudioEngine.h" #include "cocostudio/CocoStudio.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC; using namespace CocosDenshion; diff --git a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp b/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp index 8061e522f9..ca75a9efe3 100644 --- a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp +++ b/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp @@ -1,6 +1,6 @@ #include "Box2dTest.h" #include "../testResource.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC_EXT; #define PTM_RATIO 32 diff --git a/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h b/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h index 06fa3eb55a..33ae31cee7 100644 --- a/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h +++ b/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h @@ -7,7 +7,7 @@ #include "cocos2d.h" #include "chipmunk.h" #include "../testBasic.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC_EXT; diff --git a/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp b/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp index f4ff8718a3..207a26a2ab 100644 --- a/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp +++ b/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp @@ -1,7 +1,7 @@ #include "CocosDenshionTest.h" #include "cocos2d.h" #include "SimpleAudioEngine.h" -#include "GUI/CCControlExtension/CCControlSlider.h" +#include "extensions/GUI/CCControlExtension/CCControlSlider.h" // android effect only support ogg #if (CC_TARGET_PLATFORM == CC_PLATFOR_ANDROID) diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h index f6001395c3..625fdddf88 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h @@ -2,7 +2,7 @@ #define __HELLOWORLD_SCENE_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "../../VisibleRect.h" #include "../../testBasic.h" #include "cocostudio/CocoStudio.h" diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h index edb704b8b1..152764c4bc 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h @@ -2,7 +2,7 @@ #define __COMPONENTSTESTSCENE_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" void runComponentsTestLayerTest(); diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h index 31e3fc5f2d..0025fd6309 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h @@ -2,7 +2,7 @@ #define __CC_ENEMYCONTROLLER_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocostudio/CocoStudio.h" diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h index 9ce5b3b424..671bdf7833 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h @@ -2,7 +2,7 @@ #define __CC_PLAYERCONTROLLER_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocostudio/CocoStudio.h" diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h index de3c855c86..7ae6b71ab1 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h @@ -2,7 +2,7 @@ #define __CC_PROJECTILECONTROLLER_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocostudio/CocoStudio.h" class ProjectileController : public cocostudio::ComController diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h index f35b663126..4d6efe0c89 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h @@ -2,7 +2,7 @@ #define __CC_SceneController_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocostudio/CocoStudio.h" class SceneController : public cocostudio::ComController diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h index 7e2ab4fd00..5bf2c93be1 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h @@ -26,9 +26,9 @@ #define __TestCpp__CocosGUIScene__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "../../testBasic.h" -#include "system/CocosGUI.h" +#include "gui/CocosGUI.h" using namespace cocos2d; using namespace cocos2d::extension; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp index e4bd80560f..4ac36f958d 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp @@ -1,7 +1,7 @@ #include "UINodeContainerTest.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" const char* font_UINodeContainerTest = #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp index 3f3cf16873..a57787dfb1 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp @@ -1,5 +1,5 @@ -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "UIScene.h" #include "UISceneManager.h" #include "../ExtensionsTest.h" diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h index 582964d66a..bf10ffa76b 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h @@ -26,8 +26,8 @@ #define __TestCpp__UIScene__ #include "cocos2d.h" -#include "cocos-ext.h" -#include "system/CocosGUI.h" +#include "extensions/cocos-ext.h" +#include "gui/CocosGUI.h" USING_NS_CC; USING_NS_CC_EXT; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp index dbc04df6ef..0ce946c5a6 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp @@ -1,9 +1,9 @@ -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "../ExtensionsTest.h" #include "SceneEditorTest.h" #include "cocostudio/CocoStudio.h" -#include "system/CocosGUI.h" +#include "gui/CocosGUI.h" using namespace cocos2d; using namespace cocostudio; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h index 186ce364f3..58494ee696 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h @@ -2,7 +2,7 @@ #define __SCENEEDITORTESTSCENE_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" void runSceneEditorTestLayer(); diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h index 2fbbd0f427..2ad6658306 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h @@ -2,7 +2,7 @@ #define _ANIMATIONSTESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" class AnimationsTestLayer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h index 706ec6b2f7..1fa38a7e0c 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h @@ -2,7 +2,7 @@ #define _BUTTONTESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" class ButtonTestLayer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h index d6ab2071c4..15a19b5519 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h @@ -2,7 +2,7 @@ #define _HELLOCOCOSBUILDERLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" /* diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h index e92245029f..3cee0e0d46 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h @@ -2,7 +2,7 @@ #define _LABELTESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" class LabelTestLayer : public cocos2d::Layer { public: diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h index 11c12da610..36c256cf94 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h @@ -2,7 +2,7 @@ #define _MENUTESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" class MenuTestLayer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h index 1f41f6e3fd..cf06eb3e87 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h @@ -2,7 +2,7 @@ #define _PARTICLESYSTEMTESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" class ParticleSystemTestLayer : public cocos2d::Layer { public: diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h index d2d5433fd4..e16039b3ca 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h @@ -2,7 +2,7 @@ #define _SCROLLVIEWTESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" class ScrollViewTestLayer : public cocos2d::Layer { public: diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h index ef053be4d9..488a5c4da9 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h @@ -2,7 +2,7 @@ #define _SPRITETESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" class SpriteTestLayer : public cocos2d::Layer { public: diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h index f36dea647e..6adde2aeda 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h @@ -2,7 +2,7 @@ #define _TESTHEADERLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" class TestHeaderLayer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h index 87cf80d7b6..f3d47ca84c 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h @@ -2,7 +2,7 @@ #define _TIMELINE_TESTLAYER_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" class TimelineCallbackTestLayer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h index 1419606d23..7c5c6839a4 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h @@ -24,7 +24,7 @@ */ #include "../CCControlScene.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC_EXT; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h index 0d90639cfa..3ca532d095 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h @@ -27,7 +27,7 @@ #define __CCCONTROLSCENE_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h index b144555e3f..3eb912624a 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h @@ -26,7 +26,7 @@ #define __CCCONTROLSCENEMANAGER_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h index 7d9e383bd7..640e359775 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h @@ -10,7 +10,7 @@ #define __TestCpp__CCEditBoxTest__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" class EditBoxTest : public cocos2d::Layer, public cocos2d::extension::EditBoxDelegate { diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h index ab432491dc..9f7d1d3fa3 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h @@ -2,8 +2,8 @@ #define __HTTP_CLIENT_H__ #include "cocos2d.h" -#include "cocos-ext.h" -#include "HttpClient.h" +#include "extensions/cocos-ext.h" +#include "network/HttpClient.h" class HttpClientTest : public cocos2d::Layer { diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h index 596738749c..56695bb6a4 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h @@ -9,8 +9,8 @@ #define __TestCpp__SocketIOTest__ #include "cocos2d.h" -#include "cocos-ext.h" -#include "SocketIO.h" +#include "extensions/cocos-ext.h" +#include "network/SocketIO.h" class SocketIOTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h index 7ca1080e40..fcec4ec724 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h @@ -10,8 +10,8 @@ #define __TestCpp__WebSocketTest__ #include "cocos2d.h" -#include "cocos-ext.h" -#include "WebSocket.h" +#include "extensions/cocos-ext.h" +#include "network/WebSocket.h" class WebSocketTestLayer : public cocos2d::Layer diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp index c5674a1443..ee0bfe043b 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp @@ -28,7 +28,7 @@ #include "Scale9SpriteTest.h" #include "testResource.h" #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" USING_NS_CC_EXT; diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h index 16a8c74f25..2ee951ca73 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h @@ -2,7 +2,7 @@ #define __CUSTOMTABELVIEWCELL_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" class CustomTableViewCell : public cocos2d::extension::TableViewCell { diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h index 7becc72781..a505195359 100644 --- a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h +++ b/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h @@ -2,7 +2,7 @@ #define __TABLEVIEWTESTSCENE_H__ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" void runTableViewTest(); diff --git a/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h b/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h index 383c3ee1ac..3e5ba3c9ac 100644 --- a/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h +++ b/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h @@ -2,7 +2,7 @@ #define _SCHEDULER_TEST_H_ #include "cocos2d.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "../testBasic.h" #include "../BaseTest.h" diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h b/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h index 707793a1c5..33876c724a 100644 --- a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h +++ b/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h @@ -2,7 +2,7 @@ #define _SHADER_TEST_H_ #include "../testBasic.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "../BaseTest.h" USING_NS_CC_EXT; diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h b/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h index 797b7a13ca..95ddbc592d 100644 --- a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h +++ b/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h @@ -1,7 +1,7 @@ #ifndef _SHADER_TEST2_H_ #define _SHADER_TEST2_H_ #include "../testBasic.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "../BaseTest.h" USING_NS_CC_EXT; diff --git a/samples/Cpp/TestCpp/Classes/testBasic.cpp b/samples/Cpp/TestCpp/Classes/testBasic.cpp index b35170021f..4f7614f701 100644 --- a/samples/Cpp/TestCpp/Classes/testBasic.cpp +++ b/samples/Cpp/TestCpp/Classes/testBasic.cpp @@ -1,6 +1,6 @@ #include "testBasic.h" #include "controller.h" -#include "cocos-ext.h" +#include "extensions/cocos-ext.h" #include "cocostudio/CocoStudio.h" TestScene::TestScene(bool bPortrait) diff --git a/samples/Cpp/TestCpp/proj.android/jni/Android.mk b/samples/Cpp/TestCpp/proj.android/jni/Android.mk index c3190eef74..7867f3f1fb 100644 --- a/samples/Cpp/TestCpp/proj.android/jni/Android.mk +++ b/samples/Cpp/TestCpp/proj.android/jni/Android.mk @@ -8,7 +8,7 @@ LOCAL_MODULE_FILENAME := libtestcpp LOCAL_SRC_FILES := testcpp/main.cpp -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes +LOCAL_C_INCLUDES := ../../Classes LOCAL_WHOLE_STATIC_LIBRARIES := cocos_testcpp_common diff --git a/samples/Lua/HelloLua/Classes/AppDelegate.cpp b/samples/Lua/HelloLua/Classes/AppDelegate.cpp index 1e2cef387a..d693936216 100644 --- a/samples/Lua/HelloLua/Classes/AppDelegate.cpp +++ b/samples/Lua/HelloLua/Classes/AppDelegate.cpp @@ -1,7 +1,7 @@ #include "cocos2d.h" #include "AppDelegate.h" #include "SimpleAudioEngine.h" -#include "script_support/CCScriptSupport.h" +#include "CCScriptSupport.h" #include "CCLuaEngine.h" USING_NS_CC; diff --git a/samples/Lua/HelloLua/proj.android/build_native.sh b/samples/Lua/HelloLua/proj.android/build_native.sh index 7a7144497f..47bf4396ad 100755 --- a/samples/Lua/HelloLua/proj.android/build_native.sh +++ b/samples/Lua/HelloLua/proj.android/build_native.sh @@ -108,9 +108,9 @@ done if [[ "$buildexternalsfromsource" ]]; then echo "Building external dependencies from source" "$NDK_ROOT"/ndk-build -C "$APP_ANDROID_ROOT" $* \ - "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/source" + "NDK_MODULE_PATH=${COCOS2DX_ROOT}/external:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}" else echo "Using prebuilt externals" "$NDK_ROOT"/ndk-build -C "$APP_ANDROID_ROOT" $* \ - "NDK_MODULE_PATH=${COCOS2DX_ROOT}:${COCOS2DX_ROOT}/cocos2dx/platform/third_party/android/prebuilt" + "NDK_MODULE_PATH=${COCOS2DX_ROOT}/external:${COCOS2DX_ROOT}/cocos:${COCOS2DX_ROOT}" fi diff --git a/samples/Lua/HelloLua/proj.android/jni/Android.mk b/samples/Lua/HelloLua/proj.android/jni/Android.mk index e4aa117413..09d83731fb 100644 --- a/samples/Lua/HelloLua/proj.android/jni/Android.mk +++ b/samples/Lua/HelloLua/proj.android/jni/Android.mk @@ -11,16 +11,9 @@ LOCAL_SRC_FILES := hellolua/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_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static + include $(BUILD_SHARED_LIBRARY) -$(call import-module,cocos2dx) -$(call import-module,audio/android) $(call import-module,scripting/lua/proj.android) -$(call import-module,extensions) -$(call import-module,cocos2dx/platform/android) From 225738ecc5c43b6dca7552f3030f21313b59ea73 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2013 17:19:02 +0800 Subject: [PATCH 5/5] issue #2905: [iOS Mac] HelloLua and TestLua work now. --- .../project.pbxproj.REMOVED.git-id | 2 +- .../project.pbxproj.REMOVED.git-id | 2 +- cocos/scripting/lua/bindings/CCBProxy.h | 3 +++ cocos/scripting/lua/bindings/CCLuaEngine.cpp | 4 ++-- cocos/scripting/lua/bindings/CCLuaEngine.h | 10 +++++----- cocos/scripting/lua/bindings/CCLuaStack.h | 2 +- cocos/scripting/lua/bindings/CCLuaValue.h | 2 +- cocos/scripting/lua/bindings/LuaOpengl.h | 3 ++- cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h | 4 ++-- cocos/scripting/lua/bindings/Lua_web_socket.cpp | 1 - cocos/scripting/lua/bindings/Lua_web_socket.h | 2 +- .../lua/bindings/lua_cocos2dx_extension_manual.cpp | 10 ++++++---- samples/Lua/HelloLua/Classes/AppDelegate.cpp | 2 +- 13 files changed, 26 insertions(+), 21 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id index 0e61b0c9e8..53dda14b9b 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -c574341d56f31ced16553735ba34a697d1bbac02 \ No newline at end of file +97bf8ff69bab6a8a85dc80aca3938ca96cbfe2e5 \ No newline at end of file diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id index cc5cbe86bf..ffe5f7bf0a 100644 --- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -a4c6fec549057de458346127f489e6e6bea2f0d1 \ No newline at end of file +d25068403b84374432b0ddaec0ab9c1e3a38c4ec \ No newline at end of file diff --git a/cocos/scripting/lua/bindings/CCBProxy.h b/cocos/scripting/lua/bindings/CCBProxy.h index 9759e87f1f..082bf09db1 100644 --- a/cocos/scripting/lua/bindings/CCBProxy.h +++ b/cocos/scripting/lua/bindings/CCBProxy.h @@ -5,9 +5,12 @@ #include "CCLuaEngine.h" #include "SimpleAudioEngine.h" #include "cocos-ext.h" +#include "cocosbuilder/CocosBuilder.h" USING_NS_CC; USING_NS_CC_EXT; +using namespace cocosbuilder; + class CCBProxy : public Layer{ public: diff --git a/cocos/scripting/lua/bindings/CCLuaEngine.cpp b/cocos/scripting/lua/bindings/CCLuaEngine.cpp index 21ded3f9b9..558b68acb1 100644 --- a/cocos/scripting/lua/bindings/CCLuaEngine.cpp +++ b/cocos/scripting/lua/bindings/CCLuaEngine.cpp @@ -24,10 +24,10 @@ #include "CCLuaEngine.h" #include "cocos2d.h" -#include "cocoa/CCArray.h" +#include "CCArray.h" #include "CCScheduler.h" #include "LuaScriptHandlerMgr.h" -#include "GUI/CCControlExtension/CCControl.h" +#include "extensions/GUI/CCControlExtension/CCControl.h" #include "LuaOpengl.h" #include "lua_cocos2dx_extension_manual.h" diff --git a/cocos/scripting/lua/bindings/CCLuaEngine.h b/cocos/scripting/lua/bindings/CCLuaEngine.h index 7df7f1fe02..0a1442aaaa 100644 --- a/cocos/scripting/lua/bindings/CCLuaEngine.h +++ b/cocos/scripting/lua/bindings/CCLuaEngine.h @@ -30,11 +30,11 @@ extern "C" { } #include "ccTypes.h" -#include "cocoa/CCObject.h" -#include "event_dispatcher/CCTouch.h" -#include "cocoa/CCSet.h" -#include "base_nodes/CCNode.h" -#include "script_support/CCScriptSupport.h" +#include "CCObject.h" +#include "CCTouch.h" +#include "CCSet.h" +#include "CCNode.h" +#include "CCScriptSupport.h" #include "CCLuaStack.h" #include "CCLuaValue.h" diff --git a/cocos/scripting/lua/bindings/CCLuaStack.h b/cocos/scripting/lua/bindings/CCLuaStack.h index e6bb7077c9..dc066ac745 100644 --- a/cocos/scripting/lua/bindings/CCLuaStack.h +++ b/cocos/scripting/lua/bindings/CCLuaStack.h @@ -30,7 +30,7 @@ extern "C" { } #include "ccTypes.h" -#include "cocoa/CCObject.h" +#include "CCObject.h" #include "CCLuaValue.h" NS_CC_BEGIN diff --git a/cocos/scripting/lua/bindings/CCLuaValue.h b/cocos/scripting/lua/bindings/CCLuaValue.h index b25a498519..08cdc2544f 100644 --- a/cocos/scripting/lua/bindings/CCLuaValue.h +++ b/cocos/scripting/lua/bindings/CCLuaValue.h @@ -34,7 +34,7 @@ extern "C" { } #include "ccTypes.h" -#include "cocoa/CCObject.h" +#include "CCObject.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY using std::memset; diff --git a/cocos/scripting/lua/bindings/LuaOpengl.h b/cocos/scripting/lua/bindings/LuaOpengl.h index c72e000e83..d0e755a3a8 100644 --- a/cocos/scripting/lua/bindings/LuaOpengl.h +++ b/cocos/scripting/lua/bindings/LuaOpengl.h @@ -9,7 +9,8 @@ extern "C" { } #endif -#include "base_nodes/CCNode.h" +#include "CCNode.h" + class GLNode:public cocos2d::Node { virtual void draw(); diff --git a/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h index efc1110c45..44ea6fa103 100644 --- a/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h +++ b/cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h @@ -7,9 +7,9 @@ extern "C" { } -#include "cocoa/CCObject.h" +#include "CCObject.h" #include "ccMacros.h" -#include "actions/CCActionInstant.h" +#include "CCActionInstant.h" #include #include diff --git a/cocos/scripting/lua/bindings/Lua_web_socket.cpp b/cocos/scripting/lua/bindings/Lua_web_socket.cpp index 27cb3ede7b..736c081344 100644 --- a/cocos/scripting/lua/bindings/Lua_web_socket.cpp +++ b/cocos/scripting/lua/bindings/Lua_web_socket.cpp @@ -19,7 +19,6 @@ extern "C" { #include "LuaScriptHandlerMgr.h" using namespace cocos2d; -using namespace cocos2d::extension; static int SendBinaryMessageToLua(int nHandler,const unsigned char* pTable,int nLength) diff --git a/cocos/scripting/lua/bindings/Lua_web_socket.h b/cocos/scripting/lua/bindings/Lua_web_socket.h index b51b84b1da..3754262deb 100644 --- a/cocos/scripting/lua/bindings/Lua_web_socket.h +++ b/cocos/scripting/lua/bindings/Lua_web_socket.h @@ -12,7 +12,7 @@ extern "C" { #endif #include "network/WebSocket.h" -class LuaWebSocket: public cocos2d::extension::WebSocket,public cocos2d::extension::WebSocket::Delegate +class LuaWebSocket: public network::WebSocket,public network::WebSocket::Delegate { public: virtual ~LuaWebSocket(); diff --git a/cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp index 0df1b74a13..0e4582b126 100644 --- a/cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp @@ -13,9 +13,11 @@ extern "C" { #include "CCLuaValue.h" #include "cocos-ext.h" #include "CCBProxy.h" +#include "cocostudio/CocoStudio.h" USING_NS_CC; USING_NS_CC_EXT; +using namespace cocostudio; class LuaScrollViewDelegate:public Object, public ScrollViewDelegate { @@ -1334,14 +1336,14 @@ static int lua_cocos2dx_extension_Bone_setIgnoreMovementBoneData(lua_State* L) return 0; int argc = 0; - armature::Bone* self = nullptr; + cocostudio::Bone* self = nullptr; #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; if (!tolua_isusertype(L,1,"Bone",0,&tolua_err)) goto tolua_lerror; #endif - self = static_cast(tolua_tousertype(L,1,0)); + self = static_cast(tolua_tousertype(L,1,0)); #if COCOS2D_DEBUG >= 1 if (nullptr == self) { @@ -1379,14 +1381,14 @@ static int lua_cocos2dx_extension_Bone_getIgnoreMovementBoneData(lua_State* L) return 0; int argc = 0; - armature::Bone* self = nullptr; + cocostudio::Bone* self = nullptr; #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; if (!tolua_isusertype(L,1,"Bone",0,&tolua_err)) goto tolua_lerror; #endif - self = static_cast(tolua_tousertype(L,1,0)); + self = static_cast(tolua_tousertype(L,1,0)); #if COCOS2D_DEBUG >= 1 if (nullptr == self) { diff --git a/samples/Lua/HelloLua/Classes/AppDelegate.cpp b/samples/Lua/HelloLua/Classes/AppDelegate.cpp index 1e2cef387a..d693936216 100644 --- a/samples/Lua/HelloLua/Classes/AppDelegate.cpp +++ b/samples/Lua/HelloLua/Classes/AppDelegate.cpp @@ -1,7 +1,7 @@ #include "cocos2d.h" #include "AppDelegate.h" #include "SimpleAudioEngine.h" -#include "script_support/CCScriptSupport.h" +#include "CCScriptSupport.h" #include "CCLuaEngine.h" USING_NS_CC;