From c6956504bfad86c6ad2bed1e29c4b5f2ab36af8f Mon Sep 17 00:00:00 2001 From: "Huabing.Xu" Date: Mon, 28 Jul 2014 21:35:16 +0800 Subject: [PATCH] change CocosDenshion to libcocosdenshion --- build/cocos2d-win32.vc2012.sln | 12 ++++++------ ...ocosDenshion.vcxproj => libcocosdenshion.vcxproj} | 0 ...proj.filters => libcocosdenshion.vcxproj.filters} | 0 ...on.vcxproj.user => libcocosdenshion.vcxproj.user} | 0 .../cocostudio/proj.win32/libCocosStudio.vcxproj | 2 +- tests/cpp-tests/proj.win32/cpp-tests.vcxproj | 3 +-- .../project/proj.win32/lua-empty-test.vcxproj | 2 +- .../project/proj.win32/lua-tests.win32.vcxproj | 6 +++--- 8 files changed, 12 insertions(+), 13 deletions(-) rename cocos/audio/proj.win32/{CocosDenshion.vcxproj => libcocosdenshion.vcxproj} (100%) rename cocos/audio/proj.win32/{CocosDenshion.vcxproj.filters => libcocosdenshion.vcxproj.filters} (100%) rename cocos/audio/proj.win32/{CocosDenshion.vcxproj.user => libcocosdenshion.vcxproj.user} (100%) diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index c03eb6cad4..3d893c7866 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -1,8 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" @@ -34,16 +32,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 @@ -100,6 +96,10 @@ Global {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj b/cocos/audio/proj.win32/libcocosdenshion.vcxproj similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj.filters b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj.filters rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj.user b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.user similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj.user rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj.user diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj index 6aec00e5b4..29471721e3 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj @@ -141,7 +141,7 @@ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index 793bcf9d23..1dc95b708f 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -561,9 +561,8 @@ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - false {811c0dab-7b96-4bd3-a154-b7572b58e4ab} diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index bbe0227bcb..f29de529f2 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -178,7 +178,7 @@ xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\. {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 8ab333821e..e3cc9db705 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -181,12 +181,12 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - {811c0dab-7b96-4bd3-a154-b7572b58e4ab}