Skip to content

Commit 58ed156

Browse files
committed
Merge pull request #27 from chuanweizhang2013/v3luaruntime
move runtime res path
2 parents 5e198aa + 1b3af4b commit 58ed156

File tree

8 files changed

+12
-4
lines changed

8 files changed

+12
-4
lines changed

templates/lua-template-runtime/frameworks/runtime-src/Classes/Runtime.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ class ConnectWaitLayer: public Layer
106106
int designWidth = 1280;
107107
int designHeight = 800;
108108
Director::getInstance()->getOpenGLView()->setDesignResolutionSize(designWidth,designHeight,ResolutionPolicy::EXACT_FIT);
109-
string playEnbleFile = "res/debug/Play1.png";
110-
string shineFile = "res/debug/shine.png";
111-
string backgroundFile = "res/debug/landscape.png";
109+
string playEnbleFile = "rtres/Play1.png";
110+
string shineFile = "rtres/shine.png";
111+
string backgroundFile = "rtres/landscape.png";
112112
if (!ConfigParser::getInstance()->isLanscape())
113113
{
114-
backgroundFile = "res/debug/portrait.png";
114+
backgroundFile = "rtres/portrait.png";
115115
Director::getInstance()->getOpenGLView()->setDesignResolutionSize(designHeight,designWidth,ResolutionPolicy::EXACT_FIT);
116116
}
117117

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
"from": "../../../config.json",
3131
"to": ""
3232
},
33+
{
34+
"from": "../../../runtime/rtres",
35+
"to": "rtres"
36+
},
3337
{
3438
"from": "../../cocos2d-x/external/lua/luasocket",
3539
"to": "",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,11 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
109109
mkdir "$(OutDir)\Resource"
110110
mkdir "$(OutDir)\Resource\src"
111111
mkdir "$(OutDir)\Resource\res"
112+
mkdir "$(OutDir)\Resource\rtres"
112113
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
113114
xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
114115
xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y
116+
xcopy "$(ProjectDir)..\..\..\runtime\rtres" "$(OutDir)\Resource\rtres" /e /Y
115117
copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y
116118
xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y</Command>
117119
<Message>copy files</Message>
@@ -165,9 +167,11 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
165167
mkdir "$(OutDir)\Resource"
166168
mkdir "$(OutDir)\Resource\src"
167169
mkdir "$(OutDir)\Resource\res"
170+
mkdir "$(OutDir)\Resource\rtres"
168171
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
169172
xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
170173
xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y
174+
xcopy "$(ProjectDir)..\..\..\runtime\rtres" "$(OutDir)\Resource\rtres" /e /Y
171175
copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y
172176
xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y</Command>
173177
<Message>copy files</Message>

0 commit comments

Comments
 (0)