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

Merge pull request #13087 from natural-law/v3 

[ci skip] Move web folder from js template folder to engine folder in Cocos Framework.
This commit is contained in:
pandamicro 2015-07-29 17:51:39 +08:00
parent 3dadc77850 c8ff43133f
commit ff7d01376e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/framework-compile/bin-templates/js-template-runtime/cocos-project-template.json
View File

@ -32,6 +32,10 @@
"include": [ "include": [
"*.js" "*.js"
] ]
},
{
"from": "web",
"to": "frameworks/cocos2d-html5"
} }
] ]
}, },

4
tools/framework-compile/bin/template_binary_config.json
View File

@ -56,10 +56,6 @@
"runtime/*" "runtime/*"
] ]
}, },
{
"from": "web",
"to": "js-template-binary/frameworks/cocos2d-html5"
},
{ {
"from": "tools/simulator/frameworks/runtime-src/Classes/ide-support", "from": "tools/simulator/frameworks/runtime-src/Classes/ide-support",
"to": "lua-template-binary/frameworks/runtime-src/Classes/ide-support/", "to": "lua-template-binary/frameworks/runtime-src/Classes/ide-support/",