Merge pull request #8719 from CocosRobot/update_cocosfiles_1413423316

[AUTO][ci skip]: updating cocos2dx_files.json
This commit is contained in:
minggo 2014-10-16 11:53:10 +08:00
commit 79bd19af7b
1 changed files with 47 additions and 54 deletions

View File

@ -7,31 +7,12 @@
"README.md", "README.md",
"build/android-build.py", "build/android-build.py",
"build/cocos2d-win32.vc2012.sln", "build/cocos2d-win32.vc2012.sln",
"build/cocos2d-wp8.vc2012.sln", "build/cocos2d-wp8.sln",
"build/cocos2d_libs.xcodeproj/project.pbxproj", "build/cocos2d_libs.xcodeproj/project.pbxproj",
"build/cocos2d_tests.xcodeproj/project.pbxproj", "build/cocos2d_tests.xcodeproj/project.pbxproj",
"build/install-deps-linux.sh", "build/install-deps-linux.sh",
"build/win32-msvc-2012-x86.cmd", "build/win32-msvc-2012-x86.cmd",
"build/win32-msvc-2013-x86.cmd", "build/win32-msvc-2013-x86.cmd",
"build/winrt/Cocos2dShaderCompiler/App.xaml",
"build/winrt/Cocos2dShaderCompiler/App.xaml.cpp",
"build/winrt/Cocos2dShaderCompiler/App.xaml.h",
"build/winrt/Cocos2dShaderCompiler/Assets/Logo.png",
"build/winrt/Cocos2dShaderCompiler/Assets/SmallLogo.png",
"build/winrt/Cocos2dShaderCompiler/Assets/SplashScreen.png",
"build/winrt/Cocos2dShaderCompiler/Assets/StoreLogo.png",
"build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln",
"build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj",
"build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters",
"build/winrt/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx",
"build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml",
"build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml.cpp",
"build/winrt/Cocos2dShaderCompiler/DirectXPage.xaml.h",
"build/winrt/Cocos2dShaderCompiler/Package.appxmanifest",
"build/winrt/Cocos2dShaderCompiler/ShaderCompiler.cpp",
"build/winrt/Cocos2dShaderCompiler/ShaderCompiler.h",
"build/winrt/Cocos2dShaderCompiler/pch.cpp",
"build/winrt/Cocos2dShaderCompiler/pch.h",
"build/winrt/angle.bat", "build/winrt/angle.bat",
"build/winrt/convertprojects.ps1", "build/winrt/convertprojects.ps1",
"build/winrt/scripts/converterutils.ps1", "build/winrt/scripts/converterutils.ps1",
@ -47,6 +28,22 @@
"build/winrt/scripts/templates/wp8_sln_header_template.txt", "build/winrt/scripts/templates/wp8_sln_header_template.txt",
"build/winrt/scripts/winrtconverter.ps1", "build/winrt/scripts/winrtconverter.ps1",
"build/winrt/wp8_precompiled_shaders.txt", "build/winrt/wp8_precompiled_shaders.txt",
"build/wp8/Cocos2dShaderCompiler/App.xaml",
"build/wp8/Cocos2dShaderCompiler/App.xaml.cpp",
"build/wp8/Cocos2dShaderCompiler/App.xaml.h",
"build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.sln",
"build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj",
"build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler.vcxproj.filters",
"build/wp8/Cocos2dShaderCompiler/Cocos2dShaderCompiler_TemporaryKey.pfx",
"build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml",
"build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml.cpp",
"build/wp8/Cocos2dShaderCompiler/DirectXPage.xaml.h",
"build/wp8/Cocos2dShaderCompiler/Package.appxmanifest",
"build/wp8/Cocos2dShaderCompiler/ShaderCompiler.cpp",
"build/wp8/Cocos2dShaderCompiler/ShaderCompiler.h",
"build/wp8/Cocos2dShaderCompiler/pch.cpp",
"build/wp8/Cocos2dShaderCompiler/pch.h",
"build/wp8/wp8_precompiled_shaders.txt",
"cmake/BuildHelpers.CMakeLists.txt", "cmake/BuildHelpers.CMakeLists.txt",
"cmake/Modules/CMakeParseArguments.cmake", "cmake/Modules/CMakeParseArguments.cmake",
"cmake/Modules/FindChipmunk.cmake", "cmake/Modules/FindChipmunk.cmake",
@ -193,16 +190,29 @@
"cocos/2d/CMakeLists.txt", "cocos/2d/CMakeLists.txt",
"cocos/2d/cocos2d.def", "cocos/2d/cocos2d.def",
"cocos/2d/cocos2d_headers.props", "cocos/2d/cocos2d_headers.props",
"cocos/2d/cocos2d_winrt.props",
"cocos/2d/cocos2d_winrt.vcxproj",
"cocos/2d/cocos2d_winrt.vcxproj.filters",
"cocos/2d/cocos2d_winrt_headers.props",
"cocos/2d/cocos2d_wp8.vcxproj",
"cocos/2d/cocos2d_wp8.vcxproj.filters",
"cocos/2d/cocos2d_wp8_headers.props",
"cocos/2d/cocos2dx.props", "cocos/2d/cocos2dx.props",
"cocos/2d/libcocos2d.vcxproj", "cocos/2d/libcocos2d.vcxproj",
"cocos/2d/libcocos2d.vcxproj.filters", "cocos/2d/libcocos2d.vcxproj.filters",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1.sln",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/targetver.h",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj.filters",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj",
"cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj.filters",
"cocos/2d/libcocos2d_wp8.vcxproj",
"cocos/2d/libcocos2d_wp8.vcxproj.filters",
"cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1.props",
"cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_app.props",
"cocos/2d/winrt_8.1_props/cocos2d_winrt_8.1_platform.props",
"cocos/2d/winrt_props/cocos2d_winrt.props",
"cocos/2d/winrt_props/cocos2d_winrt_app.props",
"cocos/2d/winrt_props/cocos2d_winrt_platform.props",
"cocos/2d/wp8_props/cocos2d_wp8.props",
"cocos/2d/wp8_props/cocos2d_wp8_app.props",
"cocos/2d/wp8_props/cocos2d_wp8_component.props",
"cocos/2d/wp_8.1_props/cocos2d_wp_8.1_platform.props",
"cocos/3d/Android.mk", "cocos/3d/Android.mk",
"cocos/3d/CCAABB.cpp", "cocos/3d/CCAABB.cpp",
"cocos/3d/CCAABB.h", "cocos/3d/CCAABB.h",
@ -291,9 +301,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.wp8/CocosDenshion.vcxproj",
"cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters",
"cocos/audio/proj.wp8/CocosDenshion.vcxproj.user",
"cocos/audio/win32/AudioCache.cpp", "cocos/audio/win32/AudioCache.cpp",
"cocos/audio/win32/AudioCache.h", "cocos/audio/win32/AudioCache.h",
"cocos/audio/win32/AudioEngine-win32.cpp", "cocos/audio/win32/AudioEngine-win32.cpp",
@ -498,11 +505,6 @@
"cocos/editor-support/cocosbuilder/CCSpriteLoader.h", "cocos/editor-support/cocosbuilder/CCSpriteLoader.h",
"cocos/editor-support/cocosbuilder/CMakeLists.txt", "cocos/editor-support/cocosbuilder/CMakeLists.txt",
"cocos/editor-support/cocosbuilder/CocosBuilder.h", "cocos/editor-support/cocosbuilder/CocosBuilder.h",
"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.user",
"cocos/editor-support/cocosbuilder/proj.wp8/pch.cpp",
"cocos/editor-support/cocosbuilder/proj.wp8/pch.h",
"cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp", "cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp",
"cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h", "cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h",
"cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp", "cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp",
@ -622,11 +624,6 @@
"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.wp8/libCocosStudio.vcxproj",
"cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters",
"cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user",
"cocos/editor-support/cocostudio/proj.wp8/pch.cpp",
"cocos/editor-support/cocostudio/proj.wp8/pch.h",
"cocos/editor-support/spine/Android.mk", "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",
@ -679,11 +676,15 @@
"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",
"cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters", "cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters",
"cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems",
"cocos/editor-support/spine/proj.win8.1-universal/libSpine.Shared/libSpine.Shared.vcxitems.filters",
"cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj",
"cocos/editor-support/spine/proj.win8.1-universal/libSpine.Windows/libSpine.Windows.vcxproj.filters",
"cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj",
"cocos/editor-support/spine/proj.win8.1-universal/libSpine.WindowsPhone/libSpine.WindowsPhone.vcxproj.filters",
"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",
"cocos/editor-support/spine/proj.wp8/pch.cpp",
"cocos/editor-support/spine/proj.wp8/pch.h",
"cocos/editor-support/spine/spine-cocos2dx.cpp", "cocos/editor-support/spine/spine-cocos2dx.cpp",
"cocos/editor-support/spine/spine-cocos2dx.h", "cocos/editor-support/spine/spine-cocos2dx.h",
"cocos/editor-support/spine/spine.h", "cocos/editor-support/spine/spine.h",
@ -729,8 +730,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.wp8/libNetwork.vcxproj",
"cocos/network/proj.wp8/libNetwork.vcxproj.filters",
"cocos/physics/CCPhysicsBody.cpp", "cocos/physics/CCPhysicsBody.cpp",
"cocos/physics/CCPhysicsBody.h", "cocos/physics/CCPhysicsBody.h",
"cocos/physics/CCPhysicsContact.cpp", "cocos/physics/CCPhysicsContact.cpp",
@ -911,11 +910,14 @@
"cocos/platform/winrt/CCFreeTypeFont.cpp", "cocos/platform/winrt/CCFreeTypeFont.cpp",
"cocos/platform/winrt/CCFreeTypeFont.h", "cocos/platform/winrt/CCFreeTypeFont.h",
"cocos/platform/winrt/CCGL.h", "cocos/platform/winrt/CCGL.h",
"cocos/platform/winrt/CCGLViewImpl-winrt.cpp",
"cocos/platform/winrt/CCGLViewImpl-winrt.h",
"cocos/platform/winrt/CCGLViewImpl.cpp", "cocos/platform/winrt/CCGLViewImpl.cpp",
"cocos/platform/winrt/CCGLViewImpl.h", "cocos/platform/winrt/CCGLViewImpl.h",
"cocos/platform/winrt/CCGL_Angle.h", "cocos/platform/winrt/CCGL_Angle.h",
"cocos/platform/winrt/CCPThreadWinRT.cpp", "cocos/platform/winrt/CCPThreadWinRT.cpp",
"cocos/platform/winrt/CCPThreadWinRT.h", "cocos/platform/winrt/CCPThreadWinRT.h",
"cocos/platform/winrt/CCPlatformDefine-winrt.h",
"cocos/platform/winrt/CCPlatformDefine.h", "cocos/platform/winrt/CCPlatformDefine.h",
"cocos/platform/winrt/CCPrecompiledShaders.cpp", "cocos/platform/winrt/CCPrecompiledShaders.cpp",
"cocos/platform/winrt/CCPrecompiledShaders.h", "cocos/platform/winrt/CCPrecompiledShaders.h",
@ -936,6 +938,7 @@
"cocos/platform/winrt/sha1.cpp", "cocos/platform/winrt/sha1.cpp",
"cocos/platform/winrt/sha1.h", "cocos/platform/winrt/sha1.h",
"cocos/platform/winrt/shaders/precompiledshaders.h", "cocos/platform/winrt/shaders/precompiledshaders.h",
"cocos/platform/winrt/targetver.h",
"cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj", "cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj",
"cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters", "cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters",
"cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user", "cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user",
@ -962,8 +965,6 @@
"cocos/platform/wp8/Direct3DBase.h", "cocos/platform/wp8/Direct3DBase.h",
"cocos/platform/wp8/DirectXBase.cpp", "cocos/platform/wp8/DirectXBase.cpp",
"cocos/platform/wp8/DirectXBase.h", "cocos/platform/wp8/DirectXBase.h",
"cocos/platform/wp8/pch.cpp",
"cocos/platform/wp8/pch.h",
"cocos/platform/wp8/shaders/precompiledshaders.h", "cocos/platform/wp8/shaders/precompiledshaders.h",
"cocos/renderer/CCBatchCommand.cpp", "cocos/renderer/CCBatchCommand.cpp",
"cocos/renderer/CCBatchCommand.h", "cocos/renderer/CCBatchCommand.h",
@ -1042,8 +1043,6 @@
"cocos/storage/local-storage/LocalStorage-android.cpp", "cocos/storage/local-storage/LocalStorage-android.cpp",
"cocos/storage/local-storage/LocalStorage.cpp", "cocos/storage/local-storage/LocalStorage.cpp",
"cocos/storage/local-storage/LocalStorage.h", "cocos/storage/local-storage/LocalStorage.h",
"cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj",
"cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters",
"cocos/ui/Android.mk", "cocos/ui/Android.mk",
"cocos/ui/CMakeLists.txt", "cocos/ui/CMakeLists.txt",
"cocos/ui/CocosGUI.cpp", "cocos/ui/CocosGUI.cpp",
@ -1127,8 +1126,6 @@
"cocos/ui/UIWidget.h", "cocos/ui/UIWidget.h",
"cocos/ui/proj.win32/libui.vcxproj", "cocos/ui/proj.win32/libui.vcxproj",
"cocos/ui/proj.win32/libui.vcxproj.filters", "cocos/ui/proj.win32/libui.vcxproj.filters",
"cocos/ui/proj.wp8/libGUI.vcxproj",
"cocos/ui/proj.wp8/libGUI.vcxproj.filters",
"docs/CODING_STYLE.md", "docs/CODING_STYLE.md",
"docs/Groups.h", "docs/Groups.h",
"docs/MainPage.h", "docs/MainPage.h",
@ -1178,10 +1175,6 @@
"extensions/physics-nodes/CCPhysicsDebugNode.h", "extensions/physics-nodes/CCPhysicsDebugNode.h",
"extensions/physics-nodes/CCPhysicsSprite.cpp", "extensions/physics-nodes/CCPhysicsSprite.cpp",
"extensions/physics-nodes/CCPhysicsSprite.h", "extensions/physics-nodes/CCPhysicsSprite.h",
"extensions/proj.wp8/libExtensions.vcxproj",
"extensions/proj.wp8/libExtensions.vcxproj.filters",
"extensions/proj.wp8/pch.cpp",
"extensions/proj.wp8/pch.h",
"external/Box2D/Android.mk", "external/Box2D/Android.mk",
"external/Box2D/Box2D.h", "external/Box2D/Box2D.h",
"external/Box2D/CMakeLists.txt", "external/Box2D/CMakeLists.txt",