diff --git a/cocos/scripting/lua-bindings/CMakeLists.txt b/cocos/scripting/lua-bindings/CMakeLists.txt index 7cacf0283a..971f06b140 100644 --- a/cocos/scripting/lua-bindings/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/CMakeLists.txt @@ -93,7 +93,7 @@ set(lua_bindings_manual_files manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp manual/cocostudio/CustomGUIReader.cpp manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp - manual/cocostudio/lua-coco-studio-conversions.cpp + manual/cocostudio/lua-cocos-studio-conversions.cpp manual/cocostudio/lua_cocos2dx_csloader_manual.cpp manual/controller/lua_cocos2dx_controller_manual.cpp manual/extension/lua_cocos2dx_extension_manual.cpp diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua-coco-studio-conversions.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp similarity index 98% rename from cocos/scripting/lua-bindings/manual/cocostudio/lua-coco-studio-conversions.cpp rename to cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp index 9198e13447..b0044442be 100644 --- a/cocos/scripting/lua-bindings/manual/cocostudio/lua-coco-studio-conversions.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "lua-coco-studio-conversions.h" +#include "lua-cocos-studio-conversions.h" #include "ActionTimeline/CCActionTimeline.h" #if COCOS2D_DEBUG >=1 diff --git a/cocos/scripting/lua-bindings/manual/cocostudio/lua-coco-studio-conversions.h b/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/cocostudio/lua-coco-studio-conversions.h rename to cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.h diff --git a/cocos/scripting/lua-bindings/proj.android/Android.mk b/cocos/scripting/lua-bindings/proj.android/Android.mk index 1d73fea671..4b34226adc 100644 --- a/cocos/scripting/lua-bindings/proj.android/Android.mk +++ b/cocos/scripting/lua-bindings/proj.android/Android.mk @@ -98,7 +98,7 @@ LOCAL_SRC_FILES += ../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp \ ../manual/cocostudio/lua_cocos2dx_csloader_manual.cpp \ ../auto/lua_cocos2dx_csloader_auto.cpp \ ../auto/lua_cocos2dx_studio_auto.cpp \ - ../manual/cocostudio/lua-coco-studio-conversions.cpp + ../manual/cocostudio/lua-cocos-studio-conversions.cpp #spine LOCAL_SRC_FILES += ../manual/spine/lua_cocos2dx_spine_manual.cpp \ diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index d09b1aee91..959abc3bc2 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -165,10 +165,10 @@ 15AC69E21987712500D17520 /* tolua_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FA18CD8F6E0087CE3A /* tolua_event.h */; }; 15AC69E31987712500D17520 /* tolua++.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FF18CD8F6E0087CE3A /* tolua++.h */; }; 15AC69E4198771FF00D17520 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F618CD8F5F0087CE3A /* libluajit.a */; }; - 15B575491A6E9AF300041C20 /* lua-coco-studio-conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B575471A6E9AF300041C20 /* lua-coco-studio-conversions.cpp */; }; - 15B5754A1A6E9AF300041C20 /* lua-coco-studio-conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B575471A6E9AF300041C20 /* lua-coco-studio-conversions.cpp */; }; - 15B5754B1A6E9AF300041C20 /* lua-coco-studio-conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B575481A6E9AF300041C20 /* lua-coco-studio-conversions.h */; }; - 15B5754C1A6E9AF300041C20 /* lua-coco-studio-conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B575481A6E9AF300041C20 /* lua-coco-studio-conversions.h */; }; + 15B5754F1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B5754D1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp */; }; + 15B575501A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B5754D1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp */; }; + 15B575511A6F4D1500041C20 /* lua-cocos-studio-conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B5754E1A6F4D1500041C20 /* lua-cocos-studio-conversions.h */; }; + 15B575521A6F4D1500041C20 /* lua-cocos-studio-conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 15B5754E1A6F4D1500041C20 /* lua-cocos-studio-conversions.h */; }; 15C1C2CD1987495500A46ACC /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; 15C1C2CE1987498B00A46ACC /* LuaOpengl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1C24F198747E400A46ACC /* LuaOpengl.cpp */; }; 15C1C2CF1987498B00A46ACC /* lua_cocos2dx_deprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD31986525900A46ACC /* lua_cocos2dx_deprecated.cpp */; }; @@ -333,8 +333,8 @@ 159552391A25E1C5001E9FC9 /* lua_cocos2dx_csloader_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_csloader_auto.hpp; sourceTree = ""; }; 1595523E1A25E4B8001E9FC9 /* lua_cocos2dx_csloader_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_csloader_manual.cpp; sourceTree = ""; }; 1595523F1A25E4B8001E9FC9 /* lua_cocos2dx_csloader_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_csloader_manual.hpp; sourceTree = ""; }; - 15B575471A6E9AF300041C20 /* lua-coco-studio-conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "lua-coco-studio-conversions.cpp"; sourceTree = ""; }; - 15B575481A6E9AF300041C20 /* lua-coco-studio-conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lua-coco-studio-conversions.h"; sourceTree = ""; }; + 15B5754D1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "lua-cocos-studio-conversions.cpp"; sourceTree = ""; }; + 15B5754E1A6F4D1500041C20 /* lua-cocos-studio-conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lua-cocos-studio-conversions.h"; sourceTree = ""; }; 15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosbuilder_auto.cpp; sourceTree = ""; }; 15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_cocosbuilder_auto.hpp; sourceTree = ""; }; 15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosdenshion_auto.cpp; sourceTree = ""; }; @@ -579,8 +579,8 @@ 15EFA400198B2AB2000C57D3 /* cocostudio */ = { isa = PBXGroup; children = ( - 15B575471A6E9AF300041C20 /* lua-coco-studio-conversions.cpp */, - 15B575481A6E9AF300041C20 /* lua-coco-studio-conversions.h */, + 15B5754D1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp */, + 15B5754E1A6F4D1500041C20 /* lua-cocos-studio-conversions.h */, 1595523E1A25E4B8001E9FC9 /* lua_cocos2dx_csloader_manual.cpp */, 1595523F1A25E4B8001E9FC9 /* lua_cocos2dx_csloader_manual.hpp */, 566F015D19B5EB0F00FCA620 /* CustomGUIReader.cpp */, @@ -845,6 +845,7 @@ 15C1C2E719874CBE00A46ACC /* CCLuaBridge.h in Headers */, 15C1C2E819874CBE00A46ACC /* CCLuaEngine.h in Headers */, 15C1C2E919874CBE00A46ACC /* CCLuaStack.h in Headers */, + 15B575511A6F4D1500041C20 /* lua-cocos-studio-conversions.h in Headers */, 15C1C2EA19874CBE00A46ACC /* CCLuaValue.h in Headers */, 155C7E0C19A71C9000F08B25 /* lua_cocos2dx_network_manual.h in Headers */, 15C1C2EB19874CBE00A46ACC /* Cocos2dxLuaLoader.h in Headers */, @@ -859,7 +860,6 @@ 15C1C2DC19874B4400A46ACC /* xxtea.h in Headers */, 15415AD319A71A53004F1E71 /* timeout.h in Headers */, 15C1C2D5198749BC00A46ACC /* LuaOpengl.h in Headers */, - 15B5754B1A6E9AF300041C20 /* lua-coco-studio-conversions.h in Headers */, 155C7E2819A71CE600F08B25 /* lua_cocos2dx_ui_manual.hpp in Headers */, 15C1C2D6198749BC00A46ACC /* lua_cocos2dx_deprecated.h in Headers */, F4FE0D6C19ECD02400B8B12B /* LuaEventNode.h in Headers */, @@ -917,6 +917,7 @@ 15EFA63B198B32BB000C57D3 /* CCLuaBridge.h in Headers */, 15EFA63C198B32BB000C57D3 /* CCLuaEngine.h in Headers */, 15EFA63D198B32BB000C57D3 /* CCLuaStack.h in Headers */, + 15B575521A6F4D1500041C20 /* lua-cocos-studio-conversions.h in Headers */, 15EFA63E198B32BB000C57D3 /* CCLuaValue.h in Headers */, 155C7E0D19A71C9300F08B25 /* lua_cocos2dx_network_manual.h in Headers */, 15EFA63F198B32BB000C57D3 /* Cocos2dxLuaLoader.h in Headers */, @@ -931,7 +932,6 @@ 15EFA62B198B3220000C57D3 /* LuaOpengl.h in Headers */, 15415AD419A71A53004F1E71 /* timeout.h in Headers */, 15EFA62C198B3220000C57D3 /* lua_cocos2dx_deprecated.h in Headers */, - 15B5754C1A6E9AF300041C20 /* lua-coco-studio-conversions.h in Headers */, 155C7E2919A71CE800F08B25 /* lua_cocos2dx_ui_manual.hpp in Headers */, 15EFA62D198B3220000C57D3 /* lua_cocos2dx_experimental_manual.hpp in Headers */, F4FE0D6D19ECD02400B8B12B /* LuaEventNode.h in Headers */, @@ -1028,6 +1028,7 @@ 15415A7319A718FB004F1E71 /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */, 150906F219D556CE002C4D97 /* lua_cocos2dx_audioengine_manual.cpp in Sources */, 15415A7519A718FB004F1E71 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */, + 15B5754F1A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp in Sources */, 15415A7619A718FB004F1E71 /* lua_cocos2dx_ui_auto.cpp in Sources */, 15415A7719A718FB004F1E71 /* lua_cocos2dx_spine_auto.cpp in Sources */, 15415A7819A718FB004F1E71 /* lua_cocos2dx_studio_auto.cpp in Sources */, @@ -1070,7 +1071,6 @@ 155C7E1E19A71CC700F08B25 /* LuaSkeletonAnimation.cpp in Sources */, 15415AB519A71A53004F1E71 /* io.c in Sources */, 15C1C2CE1987498B00A46ACC /* LuaOpengl.cpp in Sources */, - 15B575491A6E9AF300041C20 /* lua-coco-studio-conversions.cpp in Sources */, 566F015F19B5EB0F00FCA620 /* CustomGUIReader.cpp in Sources */, 15415AC119A71A53004F1E71 /* options.c in Sources */, 150906F019D556C5002C4D97 /* lua_cocos2dx_audioengine_auto.cpp in Sources */, @@ -1107,6 +1107,7 @@ 15EFA646198B3311000C57D3 /* tolua_event.c in Sources */, 3E2BDB0A19C5E6100055CDCD /* lua_cocos2dx_audioengine_manual.cpp in Sources */, 15415AA619A71A53004F1E71 /* auxiliar.c in Sources */, + 15B575501A6F4D1500041C20 /* lua-cocos-studio-conversions.cpp in Sources */, 15EFA647198B3311000C57D3 /* tolua_is.c in Sources */, 15EFA648198B3311000C57D3 /* tolua_map.c in Sources */, 15EFA649198B3311000C57D3 /* tolua_push.c in Sources */, @@ -1149,7 +1150,6 @@ 155C7E1F19A71CC800F08B25 /* LuaSkeletonAnimation.cpp in Sources */, 15415ACA19A71A53004F1E71 /* serial.c in Sources */, 155C7DEA19A71BDA00F08B25 /* lua_cocos2dx_3d_auto.cpp in Sources */, - 15B5754A1A6E9AF300041C20 /* lua-coco-studio-conversions.cpp in Sources */, 566F016019B5EB0F00FCA620 /* CustomGUIReader.cpp in Sources */, 155C7DF119A71C2300F08B25 /* lua_cocos2dx_studio_auto.cpp in Sources */, 3E2BDB0519C5E5FE0055CDCD /* lua_cocos2dx_audioengine_auto.cpp in Sources */, diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj index b00ba62421..2ece90e2c5 100644 --- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj @@ -66,7 +66,7 @@ - + @@ -139,7 +139,7 @@ - + diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters index 7200db831d..2ec7ee30b6 100644 --- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters @@ -282,7 +282,7 @@ manual\cocostudio - + manual\cocostudio @@ -497,7 +497,7 @@ manual\cocostudio - + manual\cocostudio diff --git a/tools/tolua/cocos2dx_studio.ini b/tools/tolua/cocos2dx_studio.ini index df2338ca4b..6f1de96edf 100644 --- a/tools/tolua/cocos2dx_studio.ini +++ b/tools/tolua/cocos2dx_studio.ini @@ -26,7 +26,7 @@ cxxgenerator_headers = 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/cocos/editor-support/cocostudio/CocoStudio.h %(cocosdir)s/cocos/scripting/lua-bindings/manual/cocostudio/lua-coco-studio-conversions.h +headers = %(cocosdir)s/cocos/editor-support/cocostudio/CocoStudio.h %(cocosdir)s/cocos/scripting/lua-bindings/manual/cocostudio/lua-cocos-studio-conversions.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*$".