From c2f83814dc7f69e0be02f7b034ba1c7ad58da0c9 Mon Sep 17 00:00:00 2001 From: Norbert Nemec Date: Tue, 9 Oct 2012 12:11:01 +0200 Subject: [PATCH] Update vcpp2008 project files and use common.vsprops for configuring external dependencies (i.e. boost) --- windows/vcpp2008/common.vsprops | 15 ++ windows/vcpp2008/examples/chatclient.vcproj | 6 +- windows/vcpp2008/examples/chatserver.vcproj | 8 +- .../examples/concurrent_server.vcproj | 189 ++++++++++++++++ windows/vcpp2008/examples/echoserver.vcproj | 22 +- windows/vcpp2008/websocketpp.sln | 10 + windows/vcpp2008/websocketpp.vcproj | 210 ++++++++++++++---- 7 files changed, 393 insertions(+), 67 deletions(-) create mode 100644 windows/vcpp2008/common.vsprops create mode 100644 windows/vcpp2008/examples/concurrent_server.vcproj diff --git a/windows/vcpp2008/common.vsprops b/windows/vcpp2008/common.vsprops new file mode 100644 index 0000000000..405a9f9042 --- /dev/null +++ b/windows/vcpp2008/common.vsprops @@ -0,0 +1,15 @@ + + + + + diff --git a/windows/vcpp2008/examples/chatclient.vcproj b/windows/vcpp2008/examples/chatclient.vcproj index 929efff01e..a5b570c5e2 100644 --- a/windows/vcpp2008/examples/chatclient.vcproj +++ b/windows/vcpp2008/examples/chatclient.vcproj @@ -21,6 +21,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" + InheritedPropertySheets="..\common.vsprops" CharacterSet="1" > @@ -138,7 +139,6 @@ @@ -116,7 +117,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\..\boost_1_47_0;.." + AdditionalIncludeDirectories=".." PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -138,7 +139,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/vcpp2008/examples/echoserver.vcproj b/windows/vcpp2008/examples/echoserver.vcproj index f2fc495064..f5d28de880 100644 --- a/windows/vcpp2008/examples/echoserver.vcproj +++ b/windows/vcpp2008/examples/echoserver.vcproj @@ -21,6 +21,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" + InheritedPropertySheets="..\common.vsprops" CharacterSet="1" > @@ -117,7 +118,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\..\..\boost_1_47_0;.." + AdditionalIncludeDirectories=".." PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -139,7 +140,6 @@ - - - - - - diff --git a/windows/vcpp2008/websocketpp.sln b/windows/vcpp2008/websocketpp.sln index 2c657c2785..26e10dd30b 100644 --- a/windows/vcpp2008/websocketpp.sln +++ b/windows/vcpp2008/websocketpp.sln @@ -20,6 +20,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatclient", "examples\chat {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "concurrent_server", "examples\concurrent_server.vcproj", "{F633A1F7-8FE5-408B-924F-4A3CAEF172C1}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -42,6 +47,10 @@ Global {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Debug|Win32.Build.0 = Debug|Win32 {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Release|Win32.ActiveCfg = Release|Win32 {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Release|Win32.Build.0 = Release|Win32 + {F633A1F7-8FE5-408B-924F-4A3CAEF172C1}.Debug|Win32.ActiveCfg = Debug|Win32 + {F633A1F7-8FE5-408B-924F-4A3CAEF172C1}.Debug|Win32.Build.0 = Debug|Win32 + {F633A1F7-8FE5-408B-924F-4A3CAEF172C1}.Release|Win32.ActiveCfg = Release|Win32 + {F633A1F7-8FE5-408B-924F-4A3CAEF172C1}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -50,5 +59,6 @@ Global {B569A272-D7D3-404B-B5FB-9187C0EB9F48} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} {2AFECE48-86DE-47D0-9263-DC0D203AA62D} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} + {F633A1F7-8FE5-408B-924F-4A3CAEF172C1} = {14E490FC-930E-40EE-B14A-84E2D98DEC9F} EndGlobalSection EndGlobal diff --git a/windows/vcpp2008/websocketpp.vcproj b/windows/vcpp2008/websocketpp.vcproj index eb63530692..b992f2287c 100644 --- a/windows/vcpp2008/websocketpp.vcproj +++ b/windows/vcpp2008/websocketpp.vcproj @@ -21,6 +21,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" + InheritedPropertySheets=".\common.vsprops" CharacterSet="1" > @@ -107,7 +109,7 @@ Optimization="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\..\..\boost_1_47_0;." + AdditionalIncludeDirectories="." PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600" RuntimeLibrary="0" BufferSecurityCheck="false" @@ -159,27 +161,7 @@ > - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - @@ -249,7 +267,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +