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

Merge pull request #7764 from natural-law/v3 

Adjust the lua templates for the lua modules.
This commit is contained in:
minggo 2014-08-13 14:37:48 +08:00
parent f068cd2458 e766a22bda
commit 8fdaaccd3d
7 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json
View File

@ -15,11 +15,11 @@
"to": "res"
},
{
"from": "../../../../cocos/scripting/lua-bindings/script/cocos2d",
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d",
"to": ""
},
{
"from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion",
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion",
"to": ""
}
]

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

@ -109,8 +109,8 @@ xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosden
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
<Command>
</Command>
</PreLinkEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -157,8 +157,8 @@ xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosden
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
<Command>
</Command>
</PreLinkEvent>
</ItemDefinitionGroup>
<ItemGroup>

6
templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json
View File

@ -9,7 +9,11 @@
"to": "res"
},
{
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script",
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d",
"to": ""
},
{
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion",
"to": ""
}
]

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

@ -14,17 +14,32 @@
},
"append_dir": [
{
"from": "cocos/scripting/lua-bindings/script",
"from": "cocos/scripting/lua-bindings/script/cocos2d",
"to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources",
"exclude": []
},
{
"from": "cocos/scripting/lua-bindings/script",
"from": "cocos/scripting/lua-bindings/script/cocos2d",
"to": "runtime/ios/PrebuiltRuntimeLua.app",
"exclude": []
},
{
"from": "cocos/scripting/lua-bindings/script",
"from": "cocos/scripting/lua-bindings/script/cocos2d",
"to": "runtime/win32",
"exclude": []
},
{
"from": "cocos/scripting/lua-bindings/script/cocosdenshion",
"to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources",
"exclude": []
},
{
"from": "cocos/scripting/lua-bindings/script/cocosdenshion",
"to": "runtime/ios/PrebuiltRuntimeLua.app",
"exclude": []
},
{
"from": "cocos/scripting/lua-bindings/script/cocosdenshion",
"to": "runtime/win32",
"exclude": []
},

4
templates/lua-template-runtime/frameworks/runtime-src/proj.android/build-cfg.json
View File

@ -23,11 +23,11 @@
],
"must_copy_resources": [
{
"from": "../../../../cocos/scripting/lua-bindings/script/cocos2d",
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d",
"to": ""
},
{
"from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion",
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion",
"to": ""
},
{

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

@ -108,14 +108,14 @@
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y</Command>
<Command>if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)"
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(LocalDebuggerWorkingDirectory)" /e /Y</Command>
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
<Command>
</Command>
</PreLinkEvent>
<PostBuildEvent>
<Command>xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\"</Command>
@ -162,14 +162,22 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</C
</DllDataFileName>
</Midl>
<PreBuildEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y</Command>
<Command>if exist "$(LocalDebuggerWorkingDirectory)" rd /s /q "$(LocalDebuggerWorkingDirectory)"
mkdir "$(LocalDebuggerWorkingDirectory)"
mkdir "$(LocalDebuggerWorkingDirectory)\src"
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\cocos2d" "$(LocalDebuggerWorkingDirectory)" /e /Y
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(LocalDebuggerWorkingDirectory)" /e /Y
</Command>
<Message>copy files</Message>
</PreBuildEvent>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
<Command>
</Command>
</PreLinkEvent>
</ItemDefinitionGroup>
<ItemGroup>

6
templates/lua-template-runtime/frameworks/runtime-src/proj.win32/build-cfg.json
View File

@ -15,7 +15,11 @@
],
"must_copy_resources": [
{
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script",
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d",
"to": ""
},
{
"from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion",
"to": ""
},
{