From a8febf9656117c3c12fef7fff79db43b1c817d59 Mon Sep 17 00:00:00 2001 From: pipu Date: Mon, 13 Oct 2014 15:31:29 +0800 Subject: [PATCH] 1. update wp8 projects. --- cocos/2d/cocos2d_wp8.vcxproj | 43 ++++++- cocos/2d/cocos2d_wp8.vcxproj.filters | 114 +++++++++++++++++ .../proj.wp8/libCocosStudio.vcxproj | 40 +----- .../proj.wp8/libCocosStudio.vcxproj.filters | 117 ------------------ 4 files changed, 155 insertions(+), 159 deletions(-) diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index 9b3fa119eb..2e40199da9 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -78,7 +78,7 @@ Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) + $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) pch.h @@ -103,7 +103,7 @@ Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) + $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) WP8;_LIB;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) pch.h @@ -128,7 +128,7 @@ Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) + $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) WP8;_LIB;_DEBUG;COCOS2D_DEBUG=1;CC_STATIC;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) pch.h @@ -154,7 +154,7 @@ Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) + $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) WP8;_LIB;NDEBUG;CC_STATIC;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) pch.h @@ -202,6 +202,19 @@ + + + + + + + + + + + + + @@ -444,6 +457,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index 485ead9924..b670c0eeb1 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -55,6 +55,15 @@ {fdee8fd3-05f9-46a1-aa15-6ceb16358145} + + {85e8e428-d95d-4ca2-9765-c27ce7571bc4} + + + {f57aa1db-2f62-429c-bdf2-c772da13b9fe} + + + {f8d8f14c-cf4b-41a4-8948-6abdb29edcad} + @@ -668,6 +677,45 @@ base + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + @@ -1376,6 +1424,72 @@ base + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\io + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite\stubs + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + + + external\protobuf-lite + diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj index e2c80b49c6..bbceb192f9 100644 --- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj @@ -77,7 +77,7 @@ NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protocolBuf\win32;$(EngineRoot)external\protocolBuf\src;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) WP8;_DEBUG;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) /Zm200 %(AdditionalOptions) @@ -100,7 +100,7 @@ Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protocolBuf\win32;$(EngineRoot)external\protocolBuf\src;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\protobuf-lite\src;%(AdditionalIncludeDirectories) WP8;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CC_STATIC;%(PreprocessorDefinitions) /Zm200 %(AdditionalOptions) pch.h @@ -166,19 +166,6 @@ - - - - - - - - - - - - - @@ -252,29 +239,6 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters index 8461a55cc8..e9d25e2379 100644 --- a/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters +++ b/cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters @@ -85,15 +85,6 @@ {5f5a98dd-657c-4a9b-8862-c11555ad1293} - - {b4299b06-bcd4-4478-a38a-bfacea23d5fa} - - - {133b3cc5-9d12-48fe-9732-0d9a4e29f260} - - - {f125eae6-6a01-4e02-9f19-693bcadcb616} - @@ -262,45 +253,6 @@ TimelineAction - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - @@ -508,74 +460,5 @@ TimelineAction - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\io - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf\stubs - - - json\protocolBuf - \ No newline at end of file