From 0019d9a06129cae4e1a349c6a4f4e29013371ef0 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Fri, 20 Jun 2014 10:50:43 +0800 Subject: [PATCH] Optimize the win32 projects configuration. --- cocos/2d/cocos2d.vcxproj | 8 ++++++-- cocos/audio/proj.win32/CocosDenshion.vcxproj | 12 +++++++----- .../proj.win32/libCocosBuilder.vcxproj | 12 +++++++----- .../cocostudio/proj.win32/libCocosStudio.vcxproj | 4 +++- .../spine/proj.win32/libSpine.vcxproj | 12 +++++++----- cocos/network/proj.win32/libNetwork.vcxproj | 12 +++++++----- .../lua-bindings/proj.win32/liblua.vcxproj | 5 +++-- .../proj.win32/libLocalStorage.vcxproj | 12 +++++++----- cocos/ui/proj.win32/libGUI.vcxproj | 6 ++++-- extensions/proj.win32/libExtensions.vcxproj | 5 +++-- external/Box2D/proj.win32/Box2D.vcxproj | 12 +++++++----- external/chipmunk/proj.win32/chipmunk.vcxproj | 14 ++++++++------ tests/cpp-tests/proj.win32/cpp-tests.vcxproj | 10 ++++------ 13 files changed, 73 insertions(+), 51 deletions(-) diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index fa3b106289..96e90dd061 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -99,6 +99,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\jpeg\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\png\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\tiff\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\webp\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)" @@ -125,16 +126,18 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;%(AdditionalIncludeDirectories) + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 - ProgramDatabase + None 4267;4251;4244;%(DisableSpecificWarnings) true CompileAsCpp + false + MinSpace if not exist "$(OutDir)" mkdir "$(OutDir)" @@ -145,6 +148,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\jpeg\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\png\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\tiff\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\webp\prebuilt\win32\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)" diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj b/cocos/audio/proj.win32/CocosDenshion.vcxproj index 27bbe7021d..836fc86ec5 100644 --- a/cocos/audio/proj.win32/CocosDenshion.vcxproj +++ b/cocos/audio/proj.win32/CocosDenshion.vcxproj @@ -23,8 +23,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp StaticLibrary @@ -32,8 +32,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -103,9 +103,11 @@ Level3 - ProgramDatabase + None 4251 true + MinSpace + false winmm.lib;libcocos2d.lib;%(AdditionalDependencies) diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj index 1ab8540b96..1c4ac42ad3 100644 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj +++ b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj @@ -21,8 +21,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Unicode @@ -31,8 +31,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp true Unicode @@ -76,13 +76,15 @@ Level3 - MaxSpeed + MinSpace true true $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + None + false true diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index 8a5ffbb33e..e745fff1ae 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -189,13 +189,15 @@ Level3 - MaxSpeed + MinSpace true true WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + None + false true diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index 1908cd64a2..2f033657b8 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -76,8 +76,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Unicode @@ -86,8 +86,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp true Unicode @@ -130,13 +130,15 @@ Level3 - MaxSpeed + MinSpace true true WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + None + false true diff --git a/cocos/network/proj.win32/libNetwork.vcxproj b/cocos/network/proj.win32/libNetwork.vcxproj index 81d55f49d3..8a218e85ee 100644 --- a/cocos/network/proj.win32/libNetwork.vcxproj +++ b/cocos/network/proj.win32/libNetwork.vcxproj @@ -35,8 +35,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp StaticLibrary @@ -44,8 +44,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -113,9 +113,11 @@ Level3 - ProgramDatabase + None 4251 true + MinSpace + false winmm.lib;libcocos2d.lib;%(AdditionalDependencies) diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj index f646029bfe..8bfdfe3e54 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj @@ -218,7 +218,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ - MaxSpeed + MinSpace true $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -231,9 +231,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ Level3 - ProgramDatabase + None 4800;4267;4251;4244;%(DisableSpecificWarnings) true + false libcocos2d.lib;%(AdditionalLibraryDirectories) diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj index 16c4f896fd..2f37b0f0fd 100644 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj +++ b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj @@ -27,8 +27,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Unicode @@ -37,8 +37,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp true Unicode @@ -81,13 +81,15 @@ Level3 - MaxSpeed + MinSpace true true $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + None + false true diff --git a/cocos/ui/proj.win32/libGUI.vcxproj b/cocos/ui/proj.win32/libGUI.vcxproj index 862a4989c3..8ef4105661 100644 --- a/cocos/ui/proj.win32/libGUI.vcxproj +++ b/cocos/ui/proj.win32/libGUI.vcxproj @@ -126,13 +126,15 @@ Level3 - MaxSpeed + MinSpace true true WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + None + false true @@ -143,4 +145,4 @@ - + \ No newline at end of file diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libExtensions.vcxproj index 1a1e465d6c..b3a911b84e 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libExtensions.vcxproj @@ -83,7 +83,7 @@ - MaxSpeed + MinSpace true $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -92,9 +92,10 @@ Level3 - ProgramDatabase + None 4267;4251;4244;%(DisableSpecificWarnings) true + false diff --git a/external/Box2D/proj.win32/Box2D.vcxproj b/external/Box2D/proj.win32/Box2D.vcxproj index ba55486c3a..8193b38dff 100644 --- a/external/Box2D/proj.win32/Box2D.vcxproj +++ b/external/Box2D/proj.win32/Box2D.vcxproj @@ -23,8 +23,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp StaticLibrary @@ -32,8 +32,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -90,8 +90,10 @@ Level3 - ProgramDatabase + None true + MinSpace + false $(OutDir)$(ProjectName).lib diff --git a/external/chipmunk/proj.win32/chipmunk.vcxproj b/external/chipmunk/proj.win32/chipmunk.vcxproj index 2114cd34ec..fb5898fe54 100644 --- a/external/chipmunk/proj.win32/chipmunk.vcxproj +++ b/external/chipmunk/proj.win32/chipmunk.vcxproj @@ -22,17 +22,17 @@ v100 v110 v110_xp - v120 - v120_xp - + v120 + v120_xp + StaticLibrary Unicode v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -93,10 +93,12 @@ Level3 - ProgramDatabase + None CompileAsCpp 4068;4996;%(DisableSpecificWarnings) true + MinSpace + false $(OutDir)$(ProjectName).lib diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index 237d58b5ac..0ade6b8a77 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -97,9 +97,8 @@ - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - + + @@ -134,9 +133,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - + +