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

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CSLoader_bindings

This commit is contained in:
samuele3hu 2014-10-14 23:39:56 +08:00
parent 4a67963420 3fae476cd2
commit 5e2ea91eb8
4 changed files with 8690 additions and 3489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
templates/lua-template-runtime/cocos-project-template.json
View File

@ -17,6 +17,55 @@
"from": "cocos/scripting/lua-bindings/script",
"to": "src/cocos",
"exclude": []
},
{
"from": "external/win32-specific/gles/prebuilt",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{
"from": "external/win32-specific/zlib/prebuilt",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{
"from": "external/win32-specific/icon/prebuilt",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{
"from": "external/curl/prebuilt/win32",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{
"from": "external/lua/luajit/prebuilt/win32",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{
"from": "external/websockets/prebuilt/win32",
"to": "runtime/win32",
"include": [
"*.dll"
]
},
{
"from": "external/tiff/prebuilt/win32",
"to": "runtime/win32",
"include": [
"*.dll"
]
}
]
},

12105
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.c
View File

File diff suppressed because it is too large Load Diff

6
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.h
View File

@ -1,8 +1,8 @@
/* lua_debugger.h.h */
#ifndef __LUA_MODULES_865AA78CBE5B66EE51A8CB6690FEE443_H_
#define __LUA_MODULES_865AA78CBE5B66EE51A8CB6690FEE443_H_
#ifndef __LUA_MODULES_049C000C96FE547176CCBB7690BA01B6_H_
#define __LUA_MODULES_049C000C96FE547176CCBB7690BA01B6_H_
#if __cplusplus
extern "C" {
@ -20,4 +20,4 @@ int luaopen_lua_m_debugger(lua_State* L);
}
#endif
#endif /* __LUA_MODULES_865AA78CBE5B66EE51A8CB6690FEE443_H_ */
#endif /* __LUA_MODULES_049C000C96FE547176CCBB7690BA01B6_H_ */

19
templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
View File

@ -111,15 +111,7 @@
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)"
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\network\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosbuilder\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\extension\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostudio\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y</Command>
<Command>if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)"</Command>
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>
@ -179,14 +171,7 @@ mkdir "$(LocalDebuggerWorkingDirectory)\res"
xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /e /Y
xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /e /Y
copy "$(ProjectDir)..\..\..\config.json" "$(LocalDebuggerWorkingDirectory)\config.json" /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\network\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosbuilder\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\extension\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostudio\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y</Command>
</Command>
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>