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

Merge pull request #13292 from natural-law/v3 

[ci skip] Add copy resources config of js-tests for web platform.
This commit is contained in:
pandamicro 2015-08-10 15:09:33 +08:00
parent 1471936c2f f91908d651
commit 940b53e271
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/js-tests/.cocos-project.json
View File

@ -25,7 +25,17 @@
"web_cfg": { "web_cfg": {
"project_path": "", "project_path": "",
"run_root_dir": "../../", "run_root_dir": "../../",
"sub_url": "/tests/js-tests/" "sub_url": "/tests/js-tests/",
"copy_resources": [
{
"from": "../cpp-tests/Resources/",
"to": "res/"
},
{
"from": "resjs",
"to": "res/"
}
]
}, },
"linux_cfg": { "linux_cfg": {
"project_path": "project/proj.linux", "project_path": "project/proj.linux",

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit 562bccdac8519d4ee1b8d958dd43cb1d084c7059 Subproject commit 85f71258c4f8fcba16ac5117c8047573e1680fd3