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

Merge pull request #8694 from samuele3hu/v3_CSLoader_bindings 

Update CSLoader lua-bindings config and adjust project config
This commit is contained in:
minggo 2014-10-15 01:29:06 +08:00
parent fe4c45061e e0c4ff060a
commit 99cd2e415f
8 changed files with 111 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
build/cocos2d_tests.xcodeproj/project.pbxproj
View File

@ -38,28 +38,48 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
1503FAB518DA8B6C00F6518C /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
1503FAB618DA8B6C00F6518C /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
1503FAB718DA8B6C00F6518C /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
1503FAB818DA8B6C00F6518C /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
1503FABC18DA8B6C00F6518C /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
1503FABD18DA8B6C00F6518C /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
1503FABE18DA8B6C00F6518C /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
1503FAC118DA8B6C00F6518C /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
1503FAC218DA8B6C00F6518C /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
1503FAC318DA8B6C00F6518C /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
1503FAC418DA8B6C00F6518C /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
1503FAC518DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
1503FAC618DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
150F918819DA409E00B89F57 /* lua_test_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */; };
150F918919DA409F00B89F57 /* lua_test_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 150F918619DA409E00B89F57 /* lua_test_bindings.cpp */; };
1529F04519ED88640064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; };
1529F04619ED88640064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; };
1529F04719ED88640064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; };
1529F04819ED88640064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; };
1529F04919ED88640064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; };
1529F04A19ED88640064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; };
1529F05219ED88830064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; };
1529F05319ED88830064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; };
1529F05419ED88830064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; };
1529F05519ED88830064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; };
1529F05619ED88830064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; };
1529F05719ED88830064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; };
1529F05819ED88830064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; };
1529F05919ED88830064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; };
1529F05A19ED88830064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; };
1529F05B19ED88830064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; };
1529F05C19ED88830064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; };
1529F05D19ED88830064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; };
1529F05E19ED88830064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; };
1529F05F19ED88830064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; };
1529F06019ED8A4E0064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; };
1529F06119ED8A4E0064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; };
1529F06219ED8A4E0064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; };
1529F06319ED8A4E0064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; };
1529F06419ED8A4E0064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; };
1529F06519ED8A4E0064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; };
1529F06619ED8A4E0064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; };
1529F06719ED8A4E0064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; };
1529F06819ED8A4E0064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; };
1529F06919ED8A4E0064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; };
1529F06A19ED8A510064B9B1 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04B19ED88830064B9B1 /* ftp.lua */; };
1529F06B19ED8A510064B9B1 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04C19ED88830064B9B1 /* headers.lua */; };
1529F06C19ED8A510064B9B1 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04D19ED88830064B9B1 /* http.lua */; };
1529F06D19ED8A510064B9B1 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04E19ED88830064B9B1 /* mbox.lua */; };
1529F06E19ED8A510064B9B1 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04F19ED88830064B9B1 /* smtp.lua */; };
1529F06F19ED8A510064B9B1 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05019ED88830064B9B1 /* tp.lua */; };
1529F07019ED8A510064B9B1 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F05119ED88830064B9B1 /* url.lua */; };
1529F07119ED8A510064B9B1 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04219ED88640064B9B1 /* ltn12.lua */; };
1529F07219ED8A510064B9B1 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04319ED88640064B9B1 /* mime.lua */; };
1529F07319ED8A510064B9B1 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1529F04419ED88640064B9B1 /* socket.lua */; };
15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; };
@ -77,26 +97,6 @@
15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
15C90B3718E66BE000D69802 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
15C90B3A18E66BE200D69802 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
15C90B3B18E66BEB00D69802 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
15C90B3C18E66BEC00D69802 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
15C90B3D18E66BF100D69802 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
15C90B3E18E66BF200D69802 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
15C90B3F18E66C0C00D69802 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
15C90B4118E66C1100D69802 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
15C90B4218E66C1200D69802 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
15C90B4318E66C1700D69802 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
15C90B4418E66C1800D69802 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
15C90B4518E66C1E00D69802 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
15C90B4618E66C1F00D69802 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
15C90B4718E66C2400D69802 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
15C90B4818E66C2500D69802 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
15C90B4918E66C2A00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
15C90B4A18E66C2B00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
15C90B4B18E66C2F00D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
15C90B4C18E66C3100D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
15CBA9AF196EE80B005877BB /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; };
15CBA9B0196EE80B005877BB /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; };
15CBA9B1196EE80B005877BB /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; };
@ -1160,18 +1160,18 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
1503FAA918DA8B6C00F6518C /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = ../external/lua/luasocket/ftp.lua; sourceTree = "<group>"; };
1503FAAA18DA8B6C00F6518C /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = ../external/lua/luasocket/headers.lua; sourceTree = "<group>"; };
1503FAAB18DA8B6C00F6518C /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = ../external/lua/luasocket/http.lua; sourceTree = "<group>"; };
1503FAAC18DA8B6C00F6518C /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = ../external/lua/luasocket/ltn12.lua; sourceTree = "<group>"; };
1503FAAD18DA8B6C00F6518C /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = ../external/lua/luasocket/mbox.lua; sourceTree = "<group>"; };
1503FAAE18DA8B6C00F6518C /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = ../external/lua/luasocket/mime.lua; sourceTree = "<group>"; };
1503FAAF18DA8B6C00F6518C /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = ../external/lua/luasocket/smtp.lua; sourceTree = "<group>"; };
1503FAB018DA8B6C00F6518C /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = ../external/lua/luasocket/socket.lua; sourceTree = "<group>"; };
1503FAB118DA8B6C00F6518C /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = ../external/lua/luasocket/tp.lua; sourceTree = "<group>"; };
1503FAB218DA8B6C00F6518C /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = ../external/lua/luasocket/url.lua; sourceTree = "<group>"; };
150F918619DA409E00B89F57 /* lua_test_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_test_bindings.cpp; sourceTree = "<group>"; };
150F918719DA409E00B89F57 /* lua_test_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_test_bindings.h; sourceTree = "<group>"; };
1529F04219ED88640064B9B1 /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = ../external/lua/luasocket/script/ltn12.lua; sourceTree = "<group>"; };
1529F04319ED88640064B9B1 /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = ../external/lua/luasocket/script/mime.lua; sourceTree = "<group>"; };
1529F04419ED88640064B9B1 /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = ../external/lua/luasocket/script/socket.lua; sourceTree = "<group>"; };
1529F04B19ED88830064B9B1 /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = ../external/lua/luasocket/script/socket/ftp.lua; sourceTree = "<group>"; };
1529F04C19ED88830064B9B1 /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = ../external/lua/luasocket/script/socket/headers.lua; sourceTree = "<group>"; };
1529F04D19ED88830064B9B1 /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = ../external/lua/luasocket/script/socket/http.lua; sourceTree = "<group>"; };
1529F04E19ED88830064B9B1 /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = ../external/lua/luasocket/script/socket/mbox.lua; sourceTree = "<group>"; };
1529F04F19ED88830064B9B1 /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = ../external/lua/luasocket/script/socket/smtp.lua; sourceTree = "<group>"; };
1529F05019ED88830064B9B1 /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = ../external/lua/luasocket/script/socket/tp.lua; sourceTree = "<group>"; };
1529F05119ED88830064B9B1 /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = ../external/lua/luasocket/script/socket/url.lua; sourceTree = "<group>"; };
15427B76198B750300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = "<group>"; };
15427B77198B843300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = "<group>"; };
15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_manual.cpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp"; sourceTree = "<group>"; };
@ -5320,6 +5320,16 @@
1ABCA36418CD9E060087CE3A /* Lua Common */ = {
isa = PBXGroup;
children = (
1529F04B19ED88830064B9B1 /* ftp.lua */,
1529F04C19ED88830064B9B1 /* headers.lua */,
1529F04D19ED88830064B9B1 /* http.lua */,
1529F04E19ED88830064B9B1 /* mbox.lua */,
1529F04F19ED88830064B9B1 /* smtp.lua */,
1529F05019ED88830064B9B1 /* tp.lua */,
1529F05119ED88830064B9B1 /* url.lua */,
1529F04219ED88640064B9B1 /* ltn12.lua */,
1529F04319ED88640064B9B1 /* mime.lua */,
1529F04419ED88640064B9B1 /* socket.lua */,
15D7637E19E8FC980069EAE8 /* CocosStudio.lua */,
15D7637F19E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua */,
15D7638019E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua */,
@ -5355,16 +5365,6 @@
15D1FCE91998637C00302043 /* luaoc.lua */,
15D1FCEA1998637C00302043 /* Opengl.lua */,
15D1FCEB1998637C00302043 /* OpenglConstants.lua */,
1503FAA918DA8B6C00F6518C /* ftp.lua */,
1503FAAA18DA8B6C00F6518C /* headers.lua */,
1503FAAB18DA8B6C00F6518C /* http.lua */,
1503FAAC18DA8B6C00F6518C /* ltn12.lua */,
1503FAAD18DA8B6C00F6518C /* mbox.lua */,
1503FAAE18DA8B6C00F6518C /* mime.lua */,
1503FAAF18DA8B6C00F6518C /* smtp.lua */,
1503FAB018DA8B6C00F6518C /* socket.lua */,
1503FAB118DA8B6C00F6518C /* tp.lua */,
1503FAB218DA8B6C00F6518C /* url.lua */,
);
name = "Lua Common";
sourceTree = "<group>";
@ -7527,39 +7527,39 @@
1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */,
1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */,
15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
1503FABD18DA8B6C00F6518C /* mime.lua in Resources */,
15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */,
1503FAC518DA8B6C00F6518C /* url.lua in Resources */,
15D1FD1F1998637C00302043 /* luaj.lua in Resources */,
15D1FCED1998637C00302043 /* bitExtend.lua in Resources */,
1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */,
1529F06319ED8A4E0064B9B1 /* mbox.lua in Resources */,
1529F06619ED8A4E0064B9B1 /* url.lua in Resources */,
15D1FD291998637C00302043 /* Opengl.lua in Resources */,
15D7638F19E8FC980069EAE8 /* StudioConstants.lua in Resources */,
1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */,
1503FAB718DA8B6C00F6518C /* http.lua in Resources */,
15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */,
1503FAC118DA8B6C00F6518C /* socket.lua in Resources */,
1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */,
1529F06219ED8A4E0064B9B1 /* http.lua in Resources */,
15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
15D7638B19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
15D7638319E8FC980069EAE8 /* CocosStudio.lua in Resources */,
1529F06819ED8A4E0064B9B1 /* mime.lua in Resources */,
15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
15D1FD241998637C00302043 /* luaoc.lua in Resources */,
1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */,
15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */,
15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */,
15D1FD151998637C00302043 /* extern.lua in Resources */,
1503FAB518DA8B6C00F6518C /* headers.lua in Resources */,
1503FAC318DA8B6C00F6518C /* tp.lua in Resources */,
1529F06719ED8A4E0064B9B1 /* ltn12.lua in Resources */,
15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */,
15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
15D1FD1A1998637C00302043 /* json.lua in Resources */,
15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */,
1529F06919ED8A4E0064B9B1 /* socket.lua in Resources */,
1AC35D2918CEDE7200F37B72 /* res in Resources */,
1529F06019ED8A4E0064B9B1 /* ftp.lua in Resources */,
1529F06519ED8A4E0064B9B1 /* tp.lua in Resources */,
1529F06419ED8A4E0064B9B1 /* smtp.lua in Resources */,
15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
1AC35D2B18CEDE7200F37B72 /* src in Resources */,
1529F06119ED8A4E0064B9B1 /* headers.lua in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -7596,45 +7596,45 @@
15D1FD171998637C00302043 /* extern.lua in Resources */,
15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
15D7638D19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
1529F07219ED8A510064B9B1 /* mime.lua in Resources */,
15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */,
1529F06E19ED8A510064B9B1 /* smtp.lua in Resources */,
15D7638519E8FC980069EAE8 /* CocosStudio.lua in Resources */,
1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */,
1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */,
15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */,
15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */,
1503FAB818DA8B6C00F6518C /* http.lua in Resources */,
1529F07319ED8A510064B9B1 /* socket.lua in Resources */,
1529F06F19ED8A510064B9B1 /* tp.lua in Resources */,
1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */,
1503FAC618DA8B6C00F6518C /* url.lua in Resources */,
1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */,
1529F06B19ED8A510064B9B1 /* headers.lua in Resources */,
1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */,
1503FAC418DA8B6C00F6518C /* tp.lua in Resources */,
1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */,
1503FABE18DA8B6C00F6518C /* mime.lua in Resources */,
15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
15D1FD2B1998637C00302043 /* Opengl.lua in Resources */,
15D7639119E8FC980069EAE8 /* StudioConstants.lua in Resources */,
1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */,
1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */,
1503FAC218DA8B6C00F6518C /* socket.lua in Resources */,
1503FABC18DA8B6C00F6518C /* mbox.lua in Resources */,
15D1FD1C1998637C00302043 /* json.lua in Resources */,
15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */,
1529F07119ED8A510064B9B1 /* ltn12.lua in Resources */,
15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */,
1503FAB618DA8B6C00F6518C /* headers.lua in Resources */,
1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */,
15D7638919E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */,
1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */,
15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */,
1AC35D2A18CEDE7200F37B72 /* res in Resources */,
1529F06C19ED8A510064B9B1 /* http.lua in Resources */,
1AC35D2C18CEDE7200F37B72 /* src in Resources */,
1AC35D4C18CEDE9400F37B72 /* Icon-152.png in Resources */,
15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
15D1FD211998637C00302043 /* luaj.lua in Resources */,
15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */,
1529F07019ED8A510064B9B1 /* url.lua in Resources */,
1AC35D4718CEDE9400F37B72 /* Default.png in Resources */,
15D1FD261998637C00302043 /* luaoc.lua in Resources */,
1529F06D19ED8A510064B9B1 /* mbox.lua in Resources */,
1529F06A19ED8A510064B9B1 /* ftp.lua in Resources */,
15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
);
@ -7644,6 +7644,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1529F05E19ED88830064B9B1 /* url.lua in Resources */,
15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */,
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */,
15D7638219E8FC980069EAE8 /* CocosStudio.lua in Resources */,
@ -7654,11 +7655,12 @@
3E2F27BC19D00D7200E7C490 /* audio in Resources */,
1AC35DC318CEE65100F37B72 /* Misc in Resources */,
1AC35DC618CEE65100F37B72 /* Shaders in Resources */,
1529F05C19ED88830064B9B1 /* tp.lua in Resources */,
15D1FD141998637C00302043 /* extern.lua in Resources */,
1AC35DBB18CEE65100F37B72 /* components in Resources */,
15D7638E19E8FC980069EAE8 /* StudioConstants.lua in Resources */,
1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */,
15C90B4318E66C1700D69802 /* mime.lua in Resources */,
1529F05A19ED88830064B9B1 /* smtp.lua in Resources */,
15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
1AC35DB118CEE5DA00F37B72 /* InfoPlist.strings in Resources */,
1AC35DDD18CEE65900F37B72 /* CocosBuilderExample.ccbproj in Resources */,
@ -7672,33 +7674,31 @@
1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */,
1AC35DBC18CEE65100F37B72 /* configs in Resources */,
1529F05219ED88830064B9B1 /* ftp.lua in Resources */,
15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
1AC35DE118CEE65900F37B72 /* background.ogg in Resources */,
15C90B4B18E66C2F00D69802 /* url.lua in Resources */,
1529F04919ED88640064B9B1 /* socket.lua in Resources */,
1AC35DDF18CEE65900F37B72 /* music.mid in Resources */,
1AC35D7518CEE58500F37B72 /* src in Resources */,
1AC35DE018CEE65900F37B72 /* background.mp3 in Resources */,
1A1645A6191B6281008C7C7F /* ccs-res in Resources */,
C08689C218D370C90093E810 /* background.caf in Resources */,
15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
15C90B4918E66C2A00D69802 /* tp.lua in Resources */,
15D7638A19E8FC980069EAE8 /* DeprecatedCocoStudioFunc.lua in Resources */,
15D1FD281998637C00302043 /* Opengl.lua in Resources */,
1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */,
3E2F27BD19D00D7D00E7C490 /* background.wav in Resources */,
15C90B3F18E66C0C00D69802 /* ltn12.lua in Resources */,
15C90B4718E66C2400D69802 /* socket.lua in Resources */,
15C90B3A18E66BE200D69802 /* ftp.lua in Resources */,
15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */,
1AC35DE518CEE65900F37B72 /* Hello.png in Resources */,
1529F05419ED88830064B9B1 /* headers.lua in Resources */,
1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */,
1AC35DC418CEE65100F37B72 /* Particles in Resources */,
15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */,
15D1FD191998637C00302043 /* json.lua in Resources */,
1AC35DB918CEE65100F37B72 /* ccb in Resources */,
15C90B4118E66C1100D69802 /* mbox.lua in Resources */,
15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */,
15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */,
1529F05619ED88830064B9B1 /* http.lua in Resources */,
15D1FD231998637C00302043 /* luaoc.lua in Resources */,
1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */,
15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
@ -7706,23 +7706,23 @@
15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */,
1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */,
15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */,
15C90B3D18E66BF100D69802 /* http.lua in Resources */,
15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */,
1529F04719ED88640064B9B1 /* mime.lua in Resources */,
15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */,
15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */,
1529F04519ED88640064B9B1 /* ltn12.lua in Resources */,
1AC35DE618CEE65900F37B72 /* effect1.raw in Resources */,
1AC35DC018CEE65100F37B72 /* Images in Resources */,
15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */,
15C90B3B18E66BEB00D69802 /* headers.lua in Resources */,
1AC35DC918CEE65100F37B72 /* zwoptex in Resources */,
15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */,
1529F05819ED88830064B9B1 /* mbox.lua in Resources */,
15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */,
1AC35DBD18CEE65100F37B72 /* extensions in Resources */,
15D1FD771998642800302043 /* GuiConstants.lua in Resources */,
15D1FD1E1998637C00302043 /* luaj.lua in Resources */,
1AC35DC718CEE65100F37B72 /* spine in Resources */,
15C90B4518E66C1E00D69802 /* smtp.lua in Resources */,
15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
1AC35DB718CEE65100F37B72 /* animations in Resources */,
);
@ -7736,9 +7736,7 @@
15B0870D195AD52000D6F62B /* ActionTimeline in Resources */,
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */,
15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */,
15C90B4418E66C1800D69802 /* mime.lua in Resources */,
15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */,
15C90B4C18E66C3100D69802 /* url.lua in Resources */,
15D1FD1B1998637C00302043 /* json.lua in Resources */,
1AC35DD618CEE65200F37B72 /* Misc in Resources */,
15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */,
@ -7752,27 +7750,25 @@
15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */,
3E2BDB0219C5E5D40055CDCD /* background.wav in Resources */,
1AC35D9D18CEE5D100F37B72 /* Icon-120.png in Resources */,
1529F05319ED88830064B9B1 /* ftp.lua in Resources */,
15D1FD781998642800302043 /* GuiConstants.lua in Resources */,
15C90B3E18E66BF200D69802 /* http.lua in Resources */,
1AC35DA018CEE5D100F37B72 /* Icon-57.png in Resources */,
1AC35DF118CEE65B00F37B72 /* fileLookup.plist in Resources */,
1AC35DEF18CEE65B00F37B72 /* background.ogg in Resources */,
1AC35D9E18CEE5D100F37B72 /* Icon-144.png in Resources */,
1529F05919ED88830064B9B1 /* mbox.lua in Resources */,
15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */,
1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */,
15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
15C90B4218E66C1200D69802 /* mbox.lua in Resources */,
15D1FD201998637C00302043 /* luaj.lua in Resources */,
1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */,
15C90B3718E66BE000D69802 /* ftp.lua in Resources */,
1AC35DCE18CEE65200F37B72 /* components in Resources */,
15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
1AC35D7618CEE58500F37B72 /* src in Resources */,
15C90B4A18E66C2B00D69802 /* tp.lua in Resources */,
1AC35DDC18CEE65200F37B72 /* zwoptex in Resources */,
1529F04A19ED88640064B9B1 /* socket.lua in Resources */,
1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
15C90B4618E66C1F00D69802 /* smtp.lua in Resources */,
15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */,
15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */,
1AC35DED18CEE65B00F37B72 /* music.mid in Resources */,
@ -7781,10 +7777,12 @@
15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */,
1529F04619ED88640064B9B1 /* ltn12.lua in Resources */,
1AC35DD018CEE65200F37B72 /* extensions in Resources */,
15D1FD2A1998637C00302043 /* Opengl.lua in Resources */,
15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */,
1AC35DD318CEE65200F37B72 /* Images in Resources */,
1529F05D19ED88830064B9B1 /* tp.lua in Resources */,
1AC35DF018CEE65B00F37B72 /* effect2.ogg in Resources */,
3E2BDAFF19C5E5B40055CDCD /* audio in Resources */,
1AC35DEB18CEE65B00F37B72 /* CocosBuilderExample.ccbproj in Resources */,
@ -7793,19 +7791,21 @@
15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */,
15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */,
15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
1529F05B19ED88830064B9B1 /* smtp.lua in Resources */,
1A1645A9191B6283008C7C7F /* ccs-res in Resources */,
15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */,
1529F05519ED88830064B9B1 /* headers.lua in Resources */,
1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */,
15D7638819E8FC980069EAE8 /* DeprecatedCocoStudioClass.lua in Resources */,
15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */,
15D1FD161998637C00302043 /* extern.lua in Resources */,
1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */,
15C90B4818E66C2500D69802 /* socket.lua in Resources */,
1529F04819ED88640064B9B1 /* mime.lua in Resources */,
1529F05719ED88830064B9B1 /* http.lua in Resources */,
15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */,
15C90B3C18E66BEC00D69802 /* headers.lua in Resources */,
15D7638419E8FC980069EAE8 /* CocosStudio.lua in Resources */,
1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */,
1AC35DD918CEE65200F37B72 /* Shaders in Resources */,
1529F05F19ED88830064B9B1 /* url.lua in Resources */,
1AC35DCF18CEE65200F37B72 /* configs in Resources */,
1AC35DDA18CEE65200F37B72 /* spine in Resources */,
15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */,

1
cocos/scripting/lua-bindings/CMakeLists.txt
View File

@ -12,6 +12,7 @@ include_directories(
${cocos_root}/cocos/3d
${cocos_root}/cocos/editor-support/spine
${cocos_root}/cocos/editor-support/cocostudio
${cocos_root}/cocos/editor-support/cocostudio/ActionTimeline
${cocos_root}/cocos/editor-support/cocosbuilder
${cocos_root}/cocos/editor-support
${cocos_root}/cocos/platform

44
cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp
View File

@ -407,49 +407,6 @@ static void extendBone(lua_State* L)
lua_pop(L, 1);
}
int lua_cocos2dx_studio_CSLoader_getInstance(lua_State* L)
{
int argc = 0;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(L,1,"cc.CSLoader",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(L) - 1;
if (argc == 0)
{
if(!ok)
return 0;
CSLoader* ret = CSLoader::getInstance();
tolua_pushusertype(L,(void*)ret, "cc.CSLoader");
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CSLoader:getInstance",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(L,"#ferror in function 'lua_cocos2dx_studio_CSLoader_getInstance'.",&tolua_err);
#endif
return 0;
}
static void extendCSLoader(lua_State* L)
{
lua_pushstring(L, "cc.CSLoader");
lua_rawget(L, LUA_REGISTRYINDEX);
if (lua_istable(L,-1))
{
tolua_function(L, "getInstance", lua_cocos2dx_studio_CSLoader_getInstance);
}
lua_pop(L, 1);
}
int lua_cocos2dx_studio_ActionTimelineCache_getInstance(lua_State* L)
{
int argc = 0;
@ -611,7 +568,6 @@ int register_all_cocos2dx_coco_studio_manual(lua_State* L)
extendArmatureDataManager(L);
extendBone(L);
extendActionTimelineCache(L);
extendCSLoader(L);
extendActionTimeline(L);
return 0;

1
cocos/scripting/lua-bindings/proj.android/Android.mk
View File

@ -101,6 +101,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \
$(LOCAL_PATH)/../../../network \
$(LOCAL_PATH)/../../../editor-support/cocosbuilder \
$(LOCAL_PATH)/../../../editor-support/cocostudio \
$(LOCAL_PATH)/../../../editor-support/cocostudio/ActionTimeline \
$(LOCAL_PATH)/../../../editor-support/spine \
$(LOCAL_PATH)/../../../ui \
$(LOCAL_PATH)/../../../../extensions \

4
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
View File

@ -1178,7 +1178,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline";
};
name = Debug;
};
@ -1211,7 +1211,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../.. $(SRCROOT)/../../.. $(SRCROOT)/../../../base $(SRCROOT)/../../../3d $(SRCROOT)/../../../2d $(SRCROOT)/../../../deprecated $(SRCROOT)/../../../physics $(SRCROOT)/../../../math/kazmath $(SRCROOT)/../../../2d/platform $(SRCROOT)/../../../audio/include $(SRCROOT)/../../../editor-support $(SRCROOT)/../../../editor-support/spine $(SRCROOT)/../../../editor-support/cocostudio $(SRCROOT)/../../../editor-support/cocosbuilder $(SRCROOT)/../../../ui $(SRCROOT)/../../../storage $(SRCROOT)/../../../../extensions $(SRCROOT)/../../../../external $(SRCROOT)/../../../../external/chipmunk/include/chipmunk $(SRCROOT)/../../../../external/lua $(SRCROOT)/../../../../external/lua/luajit/include $(SRCROOT)/../../../../external/lua/tolua $(SRCROOT)/../../../editor-support/cocostudio/ActionTimeline";
VALIDATE_PRODUCT = YES;
};
name = Release;

4
cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
View File

@ -267,7 +267,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -299,7 +299,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$
<ClCompile>
<Optimization>MinSpace</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>

9
tools/tolua/cocos2dx.ini
View File

@ -13,7 +13,7 @@ android_flags = -D_SIZE_T_DEFINED_
clang_headers = -I%(clangllvmdir)s/lib/clang/3.3/include
clang_flags = -nostdinc -x c++ -std=c++11 -U __SSE__
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android
cocos_headers = -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/external
cocos_flags = -DANDROID
cxxgenerator_headers =
@ -22,11 +22,11 @@ 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/cocos2d.h %(cocosdir)s/cocos/2d/CCProtectedNode.h
headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/2d/CCProtectedNode.h %(cocosdir)s/cocos/editor-support/cocostudio/ActionTimeline/CSLoader.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*$".
classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewImpl GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console GLProgramCache GLProgramState Device
classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewImpl GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console GLProgramCache GLProgramState Device CSLoader
# what should we skip? in the format ClassName::[function function]
# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also
@ -144,7 +144,8 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
DirectionLight3D::[*],
PointLight3D::[*],
SpotLight3D::[*],
AmbientLight3D::[*]
AmbientLight3D::[*],
CSLoader::[nodeFromXML nodeFromProtocolBuffers createTimeline]
rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame],
ProgressTimer::[setReverseProgress=setReverseDirection],

1
tools/tolua/cocos2dx_studio.ini
View File

@ -52,7 +52,6 @@ skip = *::[^visit$ copyWith.* onEnter.* onExit.* ^description$ getObjectType .*
ActionNode::[initWithDictionary],
ActionObject::[initWithDictionary initWithBinary],
BaseData::[copy subtract],
CSLoader::[getInstance nodeFromXML],
ActionTimelineCache::[getInstance loadActionTimelineFromXML]
rename_functions = GUIReader::[shareReader=getInstance purgeGUIReader=destroyInstance],