Merge pull request #7888 from CocosRobot/update_cocosfiles_1409118024

[AUTO][ci skip]: updating cocos2dx_files.json
This commit is contained in:
minggo 2014-08-27 13:45:02 +08:00
commit 2efd7eef6c
1 changed files with 6 additions and 34 deletions

View File

@ -192,7 +192,6 @@
"cocos/2d/libcocos2d.vcxproj", "cocos/2d/libcocos2d.vcxproj",
"cocos/2d/libcocos2d.vcxproj.filters", "cocos/2d/libcocos2d.vcxproj.filters",
"cocos/3d/3dExport.h", "cocos/3d/3dExport.h",
"cocos/3d/Android.mk",
"cocos/3d/CCAABB.cpp", "cocos/3d/CCAABB.cpp",
"cocos/3d/CCAABB.h", "cocos/3d/CCAABB.h",
"cocos/3d/CCAnimate3D.cpp", "cocos/3d/CCAnimate3D.cpp",
@ -228,12 +227,8 @@
"cocos/3d/CCSprite3DMaterial.h", "cocos/3d/CCSprite3DMaterial.h",
"cocos/3d/CMakeLists.txt", "cocos/3d/CMakeLists.txt",
"cocos/3d/cocos3d.h", "cocos/3d/cocos3d.h",
"cocos/3d/proj.win32/libcocos3d.vcxproj",
"cocos/3d/proj.win32/libcocos3d.vcxproj.filters",
"cocos/3d/proj.win32/libcocos3d.vcxproj.user",
"cocos/Android.mk", "cocos/Android.mk",
"cocos/CMakeLists.txt", "cocos/CMakeLists.txt",
"cocos/audio/android/Android.mk",
"cocos/audio/android/ccdandroidUtils.cpp", "cocos/audio/android/ccdandroidUtils.cpp",
"cocos/audio/android/ccdandroidUtils.h", "cocos/audio/android/ccdandroidUtils.h",
"cocos/audio/android/cddSimpleAudioEngine.cpp", "cocos/audio/android/cddSimpleAudioEngine.cpp",
@ -270,9 +265,6 @@
"cocos/audio/openal/OpenALDecoder.cpp", "cocos/audio/openal/OpenALDecoder.cpp",
"cocos/audio/openal/OpenALDecoder.h", "cocos/audio/openal/OpenALDecoder.h",
"cocos/audio/openal/SimpleAudioEngineOpenAL.cpp", "cocos/audio/openal/SimpleAudioEngineOpenAL.cpp",
"cocos/audio/proj.win32/libcocosdenshion.vcxproj",
"cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters",
"cocos/audio/proj.win32/libcocosdenshion.vcxproj.user",
"cocos/audio/proj.wp8/CocosDenshion.vcxproj", "cocos/audio/proj.wp8/CocosDenshion.vcxproj",
"cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters",
"cocos/audio/proj.wp8/CocosDenshion.vcxproj.user", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.user",
@ -422,7 +414,6 @@
"cocos/deprecated/CCSet.h", "cocos/deprecated/CCSet.h",
"cocos/deprecated/CCString.cpp", "cocos/deprecated/CCString.cpp",
"cocos/deprecated/CCString.h", "cocos/deprecated/CCString.h",
"cocos/editor-support/cocosbuilder/Android.mk",
"cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp", "cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp",
"cocos/editor-support/cocosbuilder/CCBAnimationManager.h", "cocos/editor-support/cocosbuilder/CCBAnimationManager.h",
"cocos/editor-support/cocosbuilder/CCBFileLoader.cpp", "cocos/editor-support/cocosbuilder/CCBFileLoader.cpp",
@ -472,9 +463,6 @@
"cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp", "cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp",
"cocos/editor-support/cocosbuilder/CCSpriteLoader.h", "cocos/editor-support/cocosbuilder/CCSpriteLoader.h",
"cocos/editor-support/cocosbuilder/CocosBuilder.h", "cocos/editor-support/cocosbuilder/CocosBuilder.h",
"cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters",
"cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user",
"cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj",
"cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj",
"cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters",
"cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user",
@ -491,7 +479,6 @@
"cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp", "cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp",
"cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h", "cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h",
"cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h", "cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h",
"cocos/editor-support/cocostudio/Android.mk",
"cocos/editor-support/cocostudio/CCActionFrame.cpp", "cocos/editor-support/cocostudio/CCActionFrame.cpp",
"cocos/editor-support/cocostudio/CCActionFrame.h", "cocos/editor-support/cocostudio/CCActionFrame.h",
"cocos/editor-support/cocostudio/CCActionFrameEasing.cpp", "cocos/editor-support/cocostudio/CCActionFrameEasing.cpp",
@ -594,15 +581,11 @@
"cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp", "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp",
"cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h", "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h",
"cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h", "cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h",
"cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj",
"cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters",
"cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user",
"cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj",
"cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters",
"cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user",
"cocos/editor-support/cocostudio/proj.wp8/pch.cpp", "cocos/editor-support/cocostudio/proj.wp8/pch.cpp",
"cocos/editor-support/cocostudio/proj.wp8/pch.h", "cocos/editor-support/cocostudio/proj.wp8/pch.h",
"cocos/editor-support/spine/Android.mk",
"cocos/editor-support/spine/Animation.cpp", "cocos/editor-support/spine/Animation.cpp",
"cocos/editor-support/spine/Animation.h", "cocos/editor-support/spine/Animation.h",
"cocos/editor-support/spine/AnimationState.cpp", "cocos/editor-support/spine/AnimationState.cpp",
@ -652,9 +635,6 @@
"cocos/editor-support/spine/SlotData.h", "cocos/editor-support/spine/SlotData.h",
"cocos/editor-support/spine/extension.cpp", "cocos/editor-support/spine/extension.cpp",
"cocos/editor-support/spine/extension.h", "cocos/editor-support/spine/extension.h",
"cocos/editor-support/spine/proj.win32/libSpine.vcxproj",
"cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters",
"cocos/editor-support/spine/proj.win32/libSpine.vcxproj.user",
"cocos/editor-support/spine/proj.wp8/libSpine.vcxproj", "cocos/editor-support/spine/proj.wp8/libSpine.vcxproj",
"cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters", "cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters",
"cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.user", "cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.user",
@ -693,7 +673,6 @@
"cocos/math/Vec4.cpp", "cocos/math/Vec4.cpp",
"cocos/math/Vec4.h", "cocos/math/Vec4.h",
"cocos/math/Vec4.inl", "cocos/math/Vec4.inl",
"cocos/network/Android.mk",
"cocos/network/HttpClient.cpp", "cocos/network/HttpClient.cpp",
"cocos/network/HttpClient.h", "cocos/network/HttpClient.h",
"cocos/network/HttpRequest.h", "cocos/network/HttpRequest.h",
@ -702,9 +681,6 @@
"cocos/network/SocketIO.h", "cocos/network/SocketIO.h",
"cocos/network/WebSocket.cpp", "cocos/network/WebSocket.cpp",
"cocos/network/WebSocket.h", "cocos/network/WebSocket.h",
"cocos/network/proj.win32/libnetwork.vcxproj",
"cocos/network/proj.win32/libnetwork.vcxproj.filters",
"cocos/network/proj.win32/libnetwork.vcxproj.user",
"cocos/network/proj.wp8/libNetwork.vcxproj", "cocos/network/proj.wp8/libNetwork.vcxproj",
"cocos/network/proj.wp8/libNetwork.vcxproj.filters", "cocos/network/proj.wp8/libNetwork.vcxproj.filters",
"cocos/physics/CCPhysicsBody.cpp", "cocos/physics/CCPhysicsBody.cpp",
@ -1002,7 +978,6 @@
"cocos/storage/local-storage/LocalStorageAndroid.cpp", "cocos/storage/local-storage/LocalStorageAndroid.cpp",
"cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj",
"cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters",
"cocos/ui/Android.mk",
"cocos/ui/CocosGUI.cpp", "cocos/ui/CocosGUI.cpp",
"cocos/ui/CocosGUI.h", "cocos/ui/CocosGUI.h",
"cocos/ui/GUIDefine.h", "cocos/ui/GUIDefine.h",
@ -1056,9 +1031,6 @@
"cocos/ui/UIVideoPlayerIOS.mm", "cocos/ui/UIVideoPlayerIOS.mm",
"cocos/ui/UIWidget.cpp", "cocos/ui/UIWidget.cpp",
"cocos/ui/UIWidget.h", "cocos/ui/UIWidget.h",
"cocos/ui/proj.win32/libui.vcxproj",
"cocos/ui/proj.win32/libui.vcxproj.filters",
"cocos/ui/proj.win32/libui.vcxproj.user",
"cocos/ui/proj.wp8/libGUI.vcxproj", "cocos/ui/proj.wp8/libGUI.vcxproj",
"cocos/ui/proj.wp8/libGUI.vcxproj.filters", "cocos/ui/proj.wp8/libGUI.vcxproj.filters",
"docs/CODING_STYLE.md", "docs/CODING_STYLE.md",
@ -1068,7 +1040,6 @@
"docs/cocos2dx_portrait.png", "docs/cocos2dx_portrait.png",
"docs/doxygen.config", "docs/doxygen.config",
"download-deps.py", "download-deps.py",
"extensions/Android.mk",
"extensions/CMakeLists.txt", "extensions/CMakeLists.txt",
"extensions/ExtensionExport.h", "extensions/ExtensionExport.h",
"extensions/ExtensionMacros.h", "extensions/ExtensionMacros.h",
@ -1126,14 +1097,10 @@
"extensions/physics-nodes/CCPhysicsSprite.h", "extensions/physics-nodes/CCPhysicsSprite.h",
"extensions/proj.win32/Win32InputBox.cpp", "extensions/proj.win32/Win32InputBox.cpp",
"extensions/proj.win32/Win32InputBox.h", "extensions/proj.win32/Win32InputBox.h",
"extensions/proj.win32/libextension.vcxproj",
"extensions/proj.win32/libextension.vcxproj.filters",
"extensions/proj.win32/libextension.vcxproj.user",
"extensions/proj.wp8/libExtensions.vcxproj", "extensions/proj.wp8/libExtensions.vcxproj",
"extensions/proj.wp8/libExtensions.vcxproj.filters", "extensions/proj.wp8/libExtensions.vcxproj.filters",
"extensions/proj.wp8/pch.cpp", "extensions/proj.wp8/pch.cpp",
"extensions/proj.wp8/pch.h", "extensions/proj.wp8/pch.h",
"external/Box2D/Android.mk",
"external/Box2D/Box2D.h", "external/Box2D/Box2D.h",
"external/Box2D/Collision/Shapes/b2ChainShape.cpp", "external/Box2D/Collision/Shapes/b2ChainShape.cpp",
"external/Box2D/Collision/Shapes/b2ChainShape.h", "external/Box2D/Collision/Shapes/b2ChainShape.h",
@ -1234,7 +1201,6 @@
"external/ConvertUTF/ConvertUTF.c", "external/ConvertUTF/ConvertUTF.c",
"external/ConvertUTF/ConvertUTF.h", "external/ConvertUTF/ConvertUTF.h",
"external/ConvertUTF/ConvertUTFWrapper.cpp", "external/ConvertUTF/ConvertUTFWrapper.cpp",
"external/chipmunk/Android.mk",
"external/chipmunk/LICENSE.txt", "external/chipmunk/LICENSE.txt",
"external/chipmunk/README.txt", "external/chipmunk/README.txt",
"external/chipmunk/chipmunk-docs.html", "external/chipmunk/chipmunk-docs.html",
@ -2203,6 +2169,10 @@
"external/websockets/prebuilt/wp8/arm/libwebsockets.lib", "external/websockets/prebuilt/wp8/arm/libwebsockets.lib",
"external/websockets/prebuilt/wp8/win32/libwebsockets.dll", "external/websockets/prebuilt/wp8/win32/libwebsockets.dll",
"external/websockets/prebuilt/wp8/win32/libwebsockets.lib", "external/websockets/prebuilt/wp8/win32/libwebsockets.lib",
"external/win32-specific/box2d/prebuilt/debug-lib/libbox2d.lib",
"external/win32-specific/box2d/prebuilt/release-lib/libbox2d.lib",
"external/win32-specific/chipmunk/prebuilt/debug-lib/libchipmunk.lib",
"external/win32-specific/chipmunk/prebuilt/release-lib/libchipmunk.lib",
"external/win32-specific/gles/include/OGLES/GL/glew.h", "external/win32-specific/gles/include/OGLES/GL/glew.h",
"external/win32-specific/gles/include/OGLES/GL/glxew.h", "external/win32-specific/gles/include/OGLES/GL/glxew.h",
"external/win32-specific/gles/include/OGLES/GL/wglew.h", "external/win32-specific/gles/include/OGLES/GL/wglew.h",
@ -2211,6 +2181,8 @@
"external/win32-specific/icon/include/iconv.h", "external/win32-specific/icon/include/iconv.h",
"external/win32-specific/icon/prebuilt/iconv.dll", "external/win32-specific/icon/prebuilt/iconv.dll",
"external/win32-specific/icon/prebuilt/libiconv.lib", "external/win32-specific/icon/prebuilt/libiconv.lib",
"external/win32-specific/spine/prebuilt/debug-lib/libspine.lib",
"external/win32-specific/spine/prebuilt/release-lib/libspine.lib",
"external/win32-specific/zlib/include/zconf.h", "external/win32-specific/zlib/include/zconf.h",
"external/win32-specific/zlib/include/zlib.h", "external/win32-specific/zlib/include/zlib.h",
"external/win32-specific/zlib/prebuilt/libzlib.lib", "external/win32-specific/zlib/prebuilt/libzlib.lib",