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

merge cocos3d

This commit is contained in:
yangxiao 2014-08-25 09:16:30 +08:00
parent a224abe7c0 87af829d0f
commit 2f0e666ac1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/cocos2dx_files.json
View File

@ -213,8 +213,6 @@
"cocos/3d/CCMesh.h",
"cocos/3d/CCMeshSkin.cpp",
"cocos/3d/CCMeshSkin.h",
"cocos/3d/CCMeshVertexIndexData.cpp",
"cocos/3d/CCMeshVertexIndexData.h",
"cocos/3d/CCOBB.cpp",
"cocos/3d/CCOBB.h",
"cocos/3d/CCObjLoader.cpp",
@ -227,6 +225,8 @@
"cocos/3d/CCSprite3D.h",
"cocos/3d/CCSprite3DMaterial.cpp",
"cocos/3d/CCSprite3DMaterial.h",
"cocos/3d/CCMeshVertexIndexData.cpp",
"cocos/3d/CCMeshVertexIndexData.h",
"cocos/3d/CMakeLists.txt",
"cocos/3d/cocos3d.h",
"cocos/3d/proj.win32/libcocos3d.vcxproj",
@ -1971,7 +1971,6 @@
"external/glfw3/include/win32/glfw3native.h",
"external/glfw3/prebuilt/mac/libglfw3.a",
"external/glfw3/prebuilt/win32/glfw3.lib",
"external/jpeg/CMakeLists.txt",
"external/jpeg/include/android/jconfig.h",
"external/jpeg/include/android/jerror.h",
"external/jpeg/include/android/jmorecfg.h",
@ -2100,7 +2099,6 @@
"external/sqlite3/include/sqlite3ext.h",
"external/sqlite3/libraries/win32/sqlite3.dll",
"external/sqlite3/libraries/win32/sqlite3.lib",
"external/tiff/CMakeLists.txt",
"external/tiff/include/android/tiff.h",
"external/tiff/include/android/tiffconf.h",
"external/tiff/include/android/tiffio.h",
@ -2160,7 +2158,6 @@
"external/unzip/unzip.cpp",
"external/unzip/unzip.h",
"external/version.json",
"external/webp/CMakeLists.txt",
"external/webp/include/android/decode.h",
"external/webp/include/android/encode.h",
"external/webp/include/android/types.h",
@ -3910,6 +3907,7 @@
"cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua",
"cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua",
"cocos/scripting/lua-bindings/auto/api/StopGrid.lua",
"cocos/scripting/lua-bindings/auto/api/SubMeshState.lua",
"cocos/scripting/lua-bindings/auto/api/TMXLayer.lua",
"cocos/scripting/lua-bindings/auto/api/TMXLayerInfo.lua",
"cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua",