From 95e6a1f6a9fb3231af42a2b04e18aa3180828510 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 15:58:17 +0200 Subject: [PATCH 01/15] moved to version specific dir --- windows/{ => vcpp2008}/.gitignore | 0 windows/{ => vcpp2008}/examples/chatclient.vcproj | 0 windows/{ => vcpp2008}/examples/chatserver.vcproj | 0 windows/{ => vcpp2008}/examples/echoserver.vcproj | 0 windows/{ => vcpp2008}/stdint.h | 0 windows/{ => vcpp2008}/websocketpp.sln | 0 windows/{ => vcpp2008}/websocketpp.vcproj | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename windows/{ => vcpp2008}/.gitignore (100%) rename windows/{ => vcpp2008}/examples/chatclient.vcproj (100%) rename windows/{ => vcpp2008}/examples/chatserver.vcproj (100%) rename windows/{ => vcpp2008}/examples/echoserver.vcproj (100%) rename windows/{ => vcpp2008}/stdint.h (100%) rename windows/{ => vcpp2008}/websocketpp.sln (100%) rename windows/{ => vcpp2008}/websocketpp.vcproj (100%) diff --git a/windows/.gitignore b/windows/vcpp2008/.gitignore similarity index 100% rename from windows/.gitignore rename to windows/vcpp2008/.gitignore diff --git a/windows/examples/chatclient.vcproj b/windows/vcpp2008/examples/chatclient.vcproj similarity index 100% rename from windows/examples/chatclient.vcproj rename to windows/vcpp2008/examples/chatclient.vcproj diff --git a/windows/examples/chatserver.vcproj b/windows/vcpp2008/examples/chatserver.vcproj similarity index 100% rename from windows/examples/chatserver.vcproj rename to windows/vcpp2008/examples/chatserver.vcproj diff --git a/windows/examples/echoserver.vcproj b/windows/vcpp2008/examples/echoserver.vcproj similarity index 100% rename from windows/examples/echoserver.vcproj rename to windows/vcpp2008/examples/echoserver.vcproj diff --git a/windows/stdint.h b/windows/vcpp2008/stdint.h similarity index 100% rename from windows/stdint.h rename to windows/vcpp2008/stdint.h diff --git a/windows/websocketpp.sln b/windows/vcpp2008/websocketpp.sln similarity index 100% rename from windows/websocketpp.sln rename to windows/vcpp2008/websocketpp.sln diff --git a/windows/websocketpp.vcproj b/windows/vcpp2008/websocketpp.vcproj similarity index 100% rename from windows/websocketpp.vcproj rename to windows/vcpp2008/websocketpp.vcproj From 53fa78f0beeb7f2612d5384e2b5d7ba465e94145 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:00:54 +0200 Subject: [PATCH 02/15] add copy of vcpp2008 for 2010 adjustments --- windows/vcpp2010/.gitignore | 9 + windows/vcpp2010/examples/chatclient.vcproj | 201 +++++++++++++++ windows/vcpp2010/examples/chatserver.vcproj | 201 +++++++++++++++ windows/vcpp2010/examples/echoserver.vcproj | 202 +++++++++++++++ windows/vcpp2010/stdint.h | 44 ++++ windows/vcpp2010/websocketpp.sln | 54 ++++ windows/vcpp2010/websocketpp.vcproj | 271 ++++++++++++++++++++ 7 files changed, 982 insertions(+) create mode 100644 windows/vcpp2010/.gitignore create mode 100644 windows/vcpp2010/examples/chatclient.vcproj create mode 100644 windows/vcpp2010/examples/chatserver.vcproj create mode 100644 windows/vcpp2010/examples/echoserver.vcproj create mode 100644 windows/vcpp2010/stdint.h create mode 100644 windows/vcpp2010/websocketpp.sln create mode 100644 windows/vcpp2010/websocketpp.vcproj diff --git a/windows/vcpp2010/.gitignore b/windows/vcpp2010/.gitignore new file mode 100644 index 0000000000..f885bfa69a --- /dev/null +++ b/windows/vcpp2010/.gitignore @@ -0,0 +1,9 @@ +*.user +*.ncb +*.suo +Debug +Release +examples/*.user +examples/*.ncb +examples/Debug +examples/Release diff --git a/windows/vcpp2010/examples/chatclient.vcproj b/windows/vcpp2010/examples/chatclient.vcproj new file mode 100644 index 0000000000..4919d9f806 --- /dev/null +++ b/windows/vcpp2010/examples/chatclient.vcproj @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/vcpp2010/examples/chatserver.vcproj b/windows/vcpp2010/examples/chatserver.vcproj new file mode 100644 index 0000000000..a0080e75a8 --- /dev/null +++ b/windows/vcpp2010/examples/chatserver.vcproj @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/vcpp2010/examples/echoserver.vcproj b/windows/vcpp2010/examples/echoserver.vcproj new file mode 100644 index 0000000000..f0d6c88bea --- /dev/null +++ b/windows/vcpp2010/examples/echoserver.vcproj @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/vcpp2010/stdint.h b/windows/vcpp2010/stdint.h new file mode 100644 index 0000000000..b68541271b --- /dev/null +++ b/windows/vcpp2010/stdint.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011, Peter Thorson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the WebSocket++ Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef STDINT_WIN32_H +#define STDINT_WIN32_H + +/* This file emulates enough of stdint.h on Windows. */ +#define INT32_MIN (-2147483647i32 - 1) /* minimum signed 32 bit value */ +#define INT32_MAX 2147483647i32 /* maximum signed 32 bit value */ + +typedef unsigned char uint8_t; +typedef signed char int8_t; +typedef unsigned short uint16_t; +typedef short int16_t; +typedef unsigned int uint32_t; +typedef int int32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; + +#endif diff --git a/windows/vcpp2010/websocketpp.sln b/windows/vcpp2010/websocketpp.sln new file mode 100644 index 0000000000..2c657c2785 --- /dev/null +++ b/windows/vcpp2010/websocketpp.sln @@ -0,0 +1,54 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "websocketpp", "websocketpp.vcproj", "{1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{14E490FC-930E-40EE-B14A-84E2D98DEC9F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoserver", "examples\echoserver.vcproj", "{B569A272-D7D3-404B-B5FB-9187C0EB9F48}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatserver", "examples\chatserver.vcproj", "{2AFECE48-86DE-47D0-9263-DC0D203AA62D}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatclient", "examples\chatclient.vcproj", "{116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Debug|Win32.Build.0 = Debug|Win32 + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Release|Win32.ActiveCfg = Release|Win32 + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}.Release|Win32.Build.0 = Release|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Debug|Win32.ActiveCfg = Debug|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Debug|Win32.Build.0 = Debug|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Release|Win32.ActiveCfg = Release|Win32 + {B569A272-D7D3-404B-B5FB-9187C0EB9F48}.Release|Win32.Build.0 = Release|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Debug|Win32.ActiveCfg = Debug|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Debug|Win32.Build.0 = Debug|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Release|Win32.ActiveCfg = Release|Win32 + {2AFECE48-86DE-47D0-9263-DC0D203AA62D}.Release|Win32.Build.0 = Release|Win32 + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}.Debug|Win32.ActiveCfg = Debug|Win32 + {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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {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} + EndGlobalSection +EndGlobal diff --git a/windows/vcpp2010/websocketpp.vcproj b/windows/vcpp2010/websocketpp.vcproj new file mode 100644 index 0000000000..deea893c45 --- /dev/null +++ b/windows/vcpp2010/websocketpp.vcproj @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fc59c8038a1382fc2222e32c579ecc3828900301 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:15:13 +0200 Subject: [PATCH 03/15] fix relative paths --- windows/vcpp2008/examples/chatclient.vcproj | 14 +++---- windows/vcpp2008/examples/chatserver.vcproj | 14 +++---- windows/vcpp2008/examples/echoserver.vcproj | 14 +++---- windows/vcpp2008/websocketpp.vcproj | 46 ++++++++++----------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/windows/vcpp2008/examples/chatclient.vcproj b/windows/vcpp2008/examples/chatclient.vcproj index 4919d9f806..929efff01e 100644 --- a/windows/vcpp2008/examples/chatclient.vcproj +++ b/windows/vcpp2008/examples/chatclient.vcproj @@ -41,7 +41,7 @@ @@ -191,7 +191,7 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > diff --git a/windows/vcpp2008/examples/chatserver.vcproj b/windows/vcpp2008/examples/chatserver.vcproj index a0080e75a8..d16f5eb89c 100644 --- a/windows/vcpp2008/examples/chatserver.vcproj +++ b/windows/vcpp2008/examples/chatserver.vcproj @@ -41,7 +41,7 @@ @@ -191,7 +191,7 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > diff --git a/windows/vcpp2008/examples/echoserver.vcproj b/windows/vcpp2008/examples/echoserver.vcproj index f0d6c88bea..f2fc495064 100644 --- a/windows/vcpp2008/examples/echoserver.vcproj +++ b/windows/vcpp2008/examples/echoserver.vcproj @@ -41,7 +41,7 @@ @@ -192,7 +192,7 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > diff --git a/windows/vcpp2008/websocketpp.vcproj b/windows/vcpp2008/websocketpp.vcproj index deea893c45..eb63530692 100644 --- a/windows/vcpp2008/websocketpp.vcproj +++ b/windows/vcpp2008/websocketpp.vcproj @@ -41,7 +41,7 @@ @@ -194,7 +194,7 @@ Name="sha" > @@ -205,46 +205,46 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > @@ -252,7 +252,7 @@ Name="sha" > @@ -260,7 +260,7 @@ Name="utf8_validator" > From bdb7780f32ef6782fa2030ec957c184e8d3c5da4 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:20:38 +0200 Subject: [PATCH 04/15] remove old project files --- windows/vcpp2010/examples/chatclient.vcproj | 201 --------------- windows/vcpp2010/examples/chatserver.vcproj | 201 --------------- windows/vcpp2010/examples/echoserver.vcproj | 202 --------------- windows/vcpp2010/websocketpp.vcproj | 271 -------------------- 4 files changed, 875 deletions(-) delete mode 100644 windows/vcpp2010/examples/chatclient.vcproj delete mode 100644 windows/vcpp2010/examples/chatserver.vcproj delete mode 100644 windows/vcpp2010/examples/echoserver.vcproj delete mode 100644 windows/vcpp2010/websocketpp.vcproj diff --git a/windows/vcpp2010/examples/chatclient.vcproj b/windows/vcpp2010/examples/chatclient.vcproj deleted file mode 100644 index 4919d9f806..0000000000 --- a/windows/vcpp2010/examples/chatclient.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/vcpp2010/examples/chatserver.vcproj b/windows/vcpp2010/examples/chatserver.vcproj deleted file mode 100644 index a0080e75a8..0000000000 --- a/windows/vcpp2010/examples/chatserver.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/vcpp2010/examples/echoserver.vcproj b/windows/vcpp2010/examples/echoserver.vcproj deleted file mode 100644 index f0d6c88bea..0000000000 --- a/windows/vcpp2010/examples/echoserver.vcproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/vcpp2010/websocketpp.vcproj b/windows/vcpp2010/websocketpp.vcproj deleted file mode 100644 index deea893c45..0000000000 --- a/windows/vcpp2010/websocketpp.vcproj +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 7d60e093cd939812e5167c3dabf345960d7f1742 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:22:14 +0200 Subject: [PATCH 05/15] ignore vs2010 stuff --- windows/vcpp2010/.gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/windows/vcpp2010/.gitignore b/windows/vcpp2010/.gitignore index f885bfa69a..62b99499b0 100644 --- a/windows/vcpp2010/.gitignore +++ b/windows/vcpp2010/.gitignore @@ -1,9 +1,17 @@ +# files to be ignored: +# http://stackoverflow.com/questions/2538149/what-should-be-contained-in-a-global-subversion-ignore-pattern-for-visual-studio +# http://stackoverflow.com/questions/3922660/which-visual-c-file-types-should-be-committed-to-version-control +# http://msdn.microsoft.com/en-us/library/3awe4781%28v=VS.100%29.aspx + *.user *.ncb *.suo +*.sdf +*.opensdf Debug Release examples/*.user examples/*.ncb examples/Debug examples/Release +ipch/* From 8cb026725d9b22dc00348eb59e17676f6592de95 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:22:43 +0200 Subject: [PATCH 06/15] remove stdint which conflicts with vs2010 --- windows/vcpp2010/stdint.h | 44 --------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 windows/vcpp2010/stdint.h diff --git a/windows/vcpp2010/stdint.h b/windows/vcpp2010/stdint.h deleted file mode 100644 index b68541271b..0000000000 --- a/windows/vcpp2010/stdint.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2011, Peter Thorson. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the WebSocket++ Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef STDINT_WIN32_H -#define STDINT_WIN32_H - -/* This file emulates enough of stdint.h on Windows. */ -#define INT32_MIN (-2147483647i32 - 1) /* minimum signed 32 bit value */ -#define INT32_MAX 2147483647i32 /* maximum signed 32 bit value */ - -typedef unsigned char uint8_t; -typedef signed char int8_t; -typedef unsigned short uint16_t; -typedef short int16_t; -typedef unsigned int uint32_t; -typedef int int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -#endif From 1e4efbb1f3ba718e9678a36a9478426feb637ea2 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:22:57 +0200 Subject: [PATCH 07/15] add build readme --- windows/vcpp2010/readme.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 windows/vcpp2010/readme.txt diff --git a/windows/vcpp2010/readme.txt b/windows/vcpp2010/readme.txt new file mode 100644 index 0000000000..d32437e126 --- /dev/null +++ b/windows/vcpp2010/readme.txt @@ -0,0 +1,35 @@ +Build Boost +=========== + +Prerequisites: Visual Sutdio C ++ 2010 Express (or higher) + +Download Boost from http://www.boost.org/ + +Unzip boost_1_47_0.zip to C:\boost_1_47_0 + +Open a "Visual Studio Command Prompt (2010)" (not a regular cmd.exe!). + +cd C:\boost_1_47_0 + +bootstrap + +.\b2 runtime-link=static + +Now set a system environment variable: + +BOOSTROOT = C:\boost_1_47_0 + + +Background: + + - http://www.boost.org/doc/libs/1_47_0/more/getting_started/windows.html + - http://www.boost.org/doc/libs/1_47_0/more/getting_started/windows.html#library-naming + - http://stackoverflow.com/questions/2035287/static-runtime-library-linking-for-visual-c-express-2008 + + +Build websocket++ +================= + +Open websocketpp.sln in VS. + +Build Solution (F7). From 50281bcee8aaeb2d080a2de9fdcedbd29d0525eb Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:23:21 +0200 Subject: [PATCH 08/15] add VS2010 build/project files --- windows/vcpp2010/examples/chatclient.vcxproj | 108 +++++++++++++++++ .../examples/chatclient.vcxproj.filters | 26 +++++ windows/vcpp2010/examples/chatserver.vcxproj | 108 +++++++++++++++++ .../examples/chatserver.vcxproj.filters | 26 +++++ windows/vcpp2010/examples/echoserver.vcxproj | 109 ++++++++++++++++++ .../examples/echoserver.vcxproj.filters | 26 +++++ windows/vcpp2010/websocketpp.sln | 28 +---- windows/vcpp2010/websocketpp.vcxproj | 105 +++++++++++++++++ windows/vcpp2010/websocketpp.vcxproj.filters | 95 +++++++++++++++ 9 files changed, 609 insertions(+), 22 deletions(-) create mode 100644 windows/vcpp2010/examples/chatclient.vcxproj create mode 100644 windows/vcpp2010/examples/chatclient.vcxproj.filters create mode 100644 windows/vcpp2010/examples/chatserver.vcxproj create mode 100644 windows/vcpp2010/examples/chatserver.vcxproj.filters create mode 100644 windows/vcpp2010/examples/echoserver.vcxproj create mode 100644 windows/vcpp2010/examples/echoserver.vcxproj.filters create mode 100644 windows/vcpp2010/websocketpp.vcxproj create mode 100644 windows/vcpp2010/websocketpp.vcxproj.filters diff --git a/windows/vcpp2010/examples/chatclient.vcxproj b/windows/vcpp2010/examples/chatclient.vcxproj new file mode 100644 index 0000000000..53fd0b9f4d --- /dev/null +++ b/windows/vcpp2010/examples/chatclient.vcxproj @@ -0,0 +1,108 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {116BFEDA-AF8E-4B3F-8508-ACC5EE89F905} + chatclient + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreaded + + + Level3 + ProgramDatabase + + + ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + MaxSpeed + true + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + MultiThreaded + false + true + StreamingSIMDExtensions2 + + + Level3 + + + + + ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + {1c0fd04e-5aca-4031-b3d1-320a5360c9d0} + false + + + + + + \ No newline at end of file diff --git a/windows/vcpp2010/examples/chatclient.vcxproj.filters b/windows/vcpp2010/examples/chatclient.vcxproj.filters new file mode 100644 index 0000000000..34e66c830b --- /dev/null +++ b/windows/vcpp2010/examples/chatclient.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/windows/vcpp2010/examples/chatserver.vcxproj b/windows/vcpp2010/examples/chatserver.vcxproj new file mode 100644 index 0000000000..d760b9c662 --- /dev/null +++ b/windows/vcpp2010/examples/chatserver.vcxproj @@ -0,0 +1,108 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2AFECE48-86DE-47D0-9263-DC0D203AA62D} + chatserver + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreaded + + + Level3 + ProgramDatabase + + + ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + MaxSpeed + true + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + MultiThreaded + false + true + StreamingSIMDExtensions2 + + + Level3 + + + + + ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + {1c0fd04e-5aca-4031-b3d1-320a5360c9d0} + false + + + + + + \ No newline at end of file diff --git a/windows/vcpp2010/examples/chatserver.vcxproj.filters b/windows/vcpp2010/examples/chatserver.vcxproj.filters new file mode 100644 index 0000000000..e2ea4bd9dd --- /dev/null +++ b/windows/vcpp2010/examples/chatserver.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/windows/vcpp2010/examples/echoserver.vcxproj b/windows/vcpp2010/examples/echoserver.vcxproj new file mode 100644 index 0000000000..9627b339e7 --- /dev/null +++ b/windows/vcpp2010/examples/echoserver.vcxproj @@ -0,0 +1,109 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {B569A272-D7D3-404B-B5FB-9187C0EB9F48} + examples + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + + Disabled + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreaded + StreamingSIMDExtensions2 + + + Level3 + ProgramDatabase + + + ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + + + MaxSpeed + true + ..\..\..\boost_1_47_0;..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + MultiThreaded + false + true + StreamingSIMDExtensions2 + + + Level3 + + + + + ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + + + + + {1c0fd04e-5aca-4031-b3d1-320a5360c9d0} + false + + + + + + \ No newline at end of file diff --git a/windows/vcpp2010/examples/echoserver.vcxproj.filters b/windows/vcpp2010/examples/echoserver.vcxproj.filters new file mode 100644 index 0000000000..a62d813e87 --- /dev/null +++ b/windows/vcpp2010/examples/echoserver.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/windows/vcpp2010/websocketpp.sln b/windows/vcpp2010/websocketpp.sln index 2c657c2785..a2ca1b86e3 100644 --- a/windows/vcpp2010/websocketpp.sln +++ b/windows/vcpp2010/websocketpp.sln @@ -1,24 +1,13 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "websocketpp", "websocketpp.vcproj", "{1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "websocketpp", "websocketpp.vcxproj", "{1C0FD04E-5ACA-4031-B3D1-320A5360C9D0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{14E490FC-930E-40EE-B14A-84E2D98DEC9F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoserver", "examples\echoserver.vcxproj", "{B569A272-D7D3-404B-B5FB-9187C0EB9F48}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoserver", "examples\echoserver.vcproj", "{B569A272-D7D3-404B-B5FB-9187C0EB9F48}" - ProjectSection(ProjectDependencies) = postProject - {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatserver", "examples\chatserver.vcxproj", "{2AFECE48-86DE-47D0-9263-DC0D203AA62D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatserver", "examples\chatserver.vcproj", "{2AFECE48-86DE-47D0-9263-DC0D203AA62D}" - ProjectSection(ProjectDependencies) = postProject - {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatclient", "examples\chatclient.vcproj", "{116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}" - ProjectSection(ProjectDependencies) = postProject - {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatclient", "examples\chatclient.vcxproj", "{116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -46,9 +35,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {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} - EndGlobalSection EndGlobal diff --git a/windows/vcpp2010/websocketpp.vcxproj b/windows/vcpp2010/websocketpp.vcxproj new file mode 100644 index 0000000000..0ba1ca8384 --- /dev/null +++ b/windows/vcpp2010/websocketpp.vcxproj @@ -0,0 +1,105 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + websocketpp + Win32Proj + + + + StaticLibrary + Unicode + true + + + StaticLibrary + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + $(BOOSTROOT);.;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreaded + StreamingSIMDExtensions2 + + + Level3 + EditAndContinue + + + + + MaxSpeed + true + Speed + $(BOOSTROOT);.;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + MultiThreaded + false + true + StreamingSIMDExtensions2 + + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vcpp2010/websocketpp.vcxproj.filters b/windows/vcpp2010/websocketpp.vcxproj.filters new file mode 100644 index 0000000000..ace00626f3 --- /dev/null +++ b/windows/vcpp2010/websocketpp.vcxproj.filters @@ -0,0 +1,95 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {79820f1e-61d9-46bc-9eb2-a52c20f62fa4} + + + {b6f4bad9-f45a-495f-93f2-f4b1605b9ac4} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {d7e1c798-4217-4c1e-a897-90bfc59d83ad} + + + {84b75a09-d8c9-4327-806d-c4f54698e4c5} + + + {c849b58d-df43-4574-ae85-92ac66333899} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\base64 + + + Source Files\sha + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files\base64 + + + Header Files\sha + + + Header Files\utf8_validator + + + From 2c47fe17a4eeb2b1a66ca21ed6a2f82641db6b25 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 16:42:14 +0200 Subject: [PATCH 09/15] fix vs2010 build --- windows/vcpp2010/examples/chatclient.vcxproj | 6 +++--- windows/vcpp2010/examples/chatserver.vcxproj | 6 +++--- windows/vcpp2010/examples/echoserver.vcxproj | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/windows/vcpp2010/examples/chatclient.vcxproj b/windows/vcpp2010/examples/chatclient.vcxproj index 53fd0b9f4d..1cdf6b82f2 100644 --- a/windows/vcpp2010/examples/chatclient.vcxproj +++ b/windows/vcpp2010/examples/chatclient.vcxproj @@ -51,14 +51,14 @@ WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreaded + MultiThreadedDebug Level3 ProgramDatabase - ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -81,7 +81,7 @@ - ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) false Console true diff --git a/windows/vcpp2010/examples/chatserver.vcxproj b/windows/vcpp2010/examples/chatserver.vcxproj index d760b9c662..93c19831b8 100644 --- a/windows/vcpp2010/examples/chatserver.vcxproj +++ b/windows/vcpp2010/examples/chatserver.vcxproj @@ -51,14 +51,14 @@ WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreaded + MultiThreadedDebug Level3 ProgramDatabase - ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -81,7 +81,7 @@ - ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) false Console true diff --git a/windows/vcpp2010/examples/echoserver.vcxproj b/windows/vcpp2010/examples/echoserver.vcxproj index 9627b339e7..c632264918 100644 --- a/windows/vcpp2010/examples/echoserver.vcxproj +++ b/windows/vcpp2010/examples/echoserver.vcxproj @@ -51,7 +51,7 @@ WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreaded + MultiThreadedDebug StreamingSIMDExtensions2 @@ -59,7 +59,7 @@ ProgramDatabase - ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -82,7 +82,7 @@ - ..\..\..\boost_1_47_0\stage\lib;%(AdditionalLibraryDirectories) + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) false Console true From cc088644017b6eb2a46cef21acebc47d62a04e83 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 17:05:37 +0200 Subject: [PATCH 10/15] adjust chat server/client for new connection_handler ifc --- examples/chat_client/chat_client_handler.cpp | 2 +- examples/chat_client/chat_client_handler.hpp | 2 +- examples/chat_server/chat.cpp | 2 +- examples/chat_server/chat.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/chat_client/chat_client_handler.cpp b/examples/chat_client/chat_client_handler.cpp index 38f8ff80ee..e16a5f4717 100644 --- a/examples/chat_client/chat_client_handler.cpp +++ b/examples/chat_client/chat_client_handler.cpp @@ -39,7 +39,7 @@ void chat_client_handler::on_open(session_ptr s) { std::cout << "Successfully connected" << std::endl; } -void chat_client_handler::on_close(session_ptr s,uint16_t status,const std::string &reason) { +void chat_client_handler::on_close(session_ptr s) { // not sure if anything needs to happen here either. m_session = client_session_ptr(); diff --git a/examples/chat_client/chat_client_handler.hpp b/examples/chat_client/chat_client_handler.hpp index fb90a6e7aa..0b1f0e0676 100644 --- a/examples/chat_client/chat_client_handler.hpp +++ b/examples/chat_client/chat_client_handler.hpp @@ -63,7 +63,7 @@ public: void on_open(session_ptr s); // connection to chat room closed - void on_close(session_ptr s,uint16_t status,const std::string &reason); + void on_close(session_ptr s); // got a new message from server void on_message(session_ptr s,const std::string &msg); diff --git a/examples/chat_server/chat.cpp b/examples/chat_server/chat.cpp index d346281f99..9b629b45fb 100644 --- a/examples/chat_server/chat.cpp +++ b/examples/chat_server/chat.cpp @@ -59,7 +59,7 @@ void chat_server_handler::on_open(session_ptr client) { send_to_all(encode_message("server",m_connections[client]+" has joined the chat.")); } -void chat_server_handler::on_close(session_ptr client,uint16_t status,const std::string &reason) { +void chat_server_handler::on_close(session_ptr client) { std::map::iterator it = m_connections.find(client); if (it == m_connections.end()) { diff --git a/examples/chat_server/chat.hpp b/examples/chat_server/chat.hpp index 3eb9b721ce..0ef21c325c 100644 --- a/examples/chat_server/chat.hpp +++ b/examples/chat_server/chat.hpp @@ -59,7 +59,7 @@ public: void on_open(websocketpp::session_ptr client); // someone disconnected from the lobby, remove them - void on_close(websocketpp::session_ptr client,uint16_t status,const std::string &reason); + void on_close(websocketpp::session_ptr client); void on_message(websocketpp::session_ptr client,const std::string &msg); From 4274292858fda708c1a941c89e159b72738ba379 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 17:10:11 +0200 Subject: [PATCH 11/15] temporariy hack to work around access issue --- src/websocket_session.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/websocket_session.hpp b/src/websocket_session.hpp index b91b9ed38a..1d291f45b3 100644 --- a/src/websocket_session.hpp +++ b/src/websocket_session.hpp @@ -193,7 +193,7 @@ public: virtual void handle_write_handshake(const boost::system::error_code& e) = 0; virtual void handle_read_handshake(const boost::system::error_code& e, std::size_t bytes_transferred) = 0; -protected: +public: //protected: virtual void write_handshake() = 0; virtual void read_handshake() = 0; From d4860de04f872c04dd88c8a7dd6659c2ec941506 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Wed, 26 Oct 2011 17:10:26 +0200 Subject: [PATCH 12/15] fix build config for release --- windows/vcpp2010/examples/echoserver.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/vcpp2010/examples/echoserver.vcxproj b/windows/vcpp2010/examples/echoserver.vcxproj index c632264918..38bf907bca 100644 --- a/windows/vcpp2010/examples/echoserver.vcxproj +++ b/windows/vcpp2010/examples/echoserver.vcxproj @@ -69,7 +69,7 @@ MaxSpeed true - ..\..\..\boost_1_47_0;..;%(AdditionalIncludeDirectories) + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) MultiThreaded false From ad8726b06dd67817c644a897d9623cae966760d3 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 27 Oct 2011 17:58:50 +0200 Subject: [PATCH 13/15] fix for relative include paths --- examples/echo_client/echo_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/echo_client/echo_client.cpp b/examples/echo_client/echo_client.cpp index fc5f96057c..0d649e9121 100644 --- a/examples/echo_client/echo_client.cpp +++ b/examples/echo_client/echo_client.cpp @@ -27,7 +27,7 @@ #include "echo_client_handler.hpp" -#include +#include "../../src/websocketpp.hpp" #include #include From 445d65ffac4ba9b90ad906a27cf292b2e6e97ab1 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 27 Oct 2011 17:59:09 +0200 Subject: [PATCH 14/15] add echo client project --- windows/vcpp2010/examples/echoclient.vcxproj | 99 +++++++++++++++++++ .../examples/echoclient.vcxproj.filters | 30 ++++++ windows/vcpp2010/websocketpp.sln | 9 ++ 3 files changed, 138 insertions(+) create mode 100644 windows/vcpp2010/examples/echoclient.vcxproj create mode 100644 windows/vcpp2010/examples/echoclient.vcxproj.filters diff --git a/windows/vcpp2010/examples/echoclient.vcxproj b/windows/vcpp2010/examples/echoclient.vcxproj new file mode 100644 index 0000000000..cff2202597 --- /dev/null +++ b/windows/vcpp2010/examples/echoclient.vcxproj @@ -0,0 +1,99 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D7C36001-002F-4B8E-B4C0-A04E2F9522D0} + Win32Proj + echoclient + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + true + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;NOCOMM;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + $(BOOSTROOT);..;%(AdditionalIncludeDirectories) + MultiThreaded + false + StreamingSIMDExtensions2 + + + Console + true + true + true + $(BOOSTROOT)\stage\lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + {1c0fd04e-5aca-4031-b3d1-320a5360c9d0} + + + + + + \ No newline at end of file diff --git a/windows/vcpp2010/examples/echoclient.vcxproj.filters b/windows/vcpp2010/examples/echoclient.vcxproj.filters new file mode 100644 index 0000000000..765ace9c46 --- /dev/null +++ b/windows/vcpp2010/examples/echoclient.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/windows/vcpp2010/websocketpp.sln b/windows/vcpp2010/websocketpp.sln index a2ca1b86e3..4139952bfa 100644 --- a/windows/vcpp2010/websocketpp.sln +++ b/windows/vcpp2010/websocketpp.sln @@ -9,6 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatserver", "examples\chat EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chatclient", "examples\chatclient.vcxproj", "{116BFEDA-AF8E-4B3F-8508-ACC5EE89F905}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echoclient", "examples\echoclient.vcxproj", "{D7C36001-002F-4B8E-B4C0-A04E2F9522D0}" + ProjectSection(ProjectDependencies) = postProject + {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} = {1C0FD04E-5ACA-4031-B3D1-320A5360C9D0} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -31,6 +36,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 + {D7C36001-002F-4B8E-B4C0-A04E2F9522D0}.Debug|Win32.ActiveCfg = Debug|Win32 + {D7C36001-002F-4B8E-B4C0-A04E2F9522D0}.Debug|Win32.Build.0 = Debug|Win32 + {D7C36001-002F-4B8E-B4C0-A04E2F9522D0}.Release|Win32.ActiveCfg = Release|Win32 + {D7C36001-002F-4B8E-B4C0-A04E2F9522D0}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From dd5e620bd2aa2adebb968701fe342483d6409122 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Fri, 28 Oct 2011 12:56:34 +0200 Subject: [PATCH 15/15] disable incremental builds for all projects and configurations --- windows/vcpp2010/examples/chatclient.vcxproj | 2 +- windows/vcpp2010/examples/chatserver.vcxproj | 2 +- windows/vcpp2010/examples/echoclient.vcxproj | 2 +- windows/vcpp2010/examples/echoserver.vcxproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/vcpp2010/examples/chatclient.vcxproj b/windows/vcpp2010/examples/chatclient.vcxproj index 1cdf6b82f2..5a07f036a5 100644 --- a/windows/vcpp2010/examples/chatclient.vcxproj +++ b/windows/vcpp2010/examples/chatclient.vcxproj @@ -39,7 +39,7 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ - true + false $(SolutionDir)$(Configuration)\ $(Configuration)\ false diff --git a/windows/vcpp2010/examples/chatserver.vcxproj b/windows/vcpp2010/examples/chatserver.vcxproj index 93c19831b8..bfdec866f8 100644 --- a/windows/vcpp2010/examples/chatserver.vcxproj +++ b/windows/vcpp2010/examples/chatserver.vcxproj @@ -39,7 +39,7 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ - true + false $(SolutionDir)$(Configuration)\ $(Configuration)\ false diff --git a/windows/vcpp2010/examples/echoclient.vcxproj b/windows/vcpp2010/examples/echoclient.vcxproj index cff2202597..281a304a64 100644 --- a/windows/vcpp2010/examples/echoclient.vcxproj +++ b/windows/vcpp2010/examples/echoclient.vcxproj @@ -38,7 +38,7 @@ - true + false false diff --git a/windows/vcpp2010/examples/echoserver.vcxproj b/windows/vcpp2010/examples/echoserver.vcxproj index 38bf907bca..eeace56e03 100644 --- a/windows/vcpp2010/examples/echoserver.vcxproj +++ b/windows/vcpp2010/examples/echoserver.vcxproj @@ -39,9 +39,9 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ - true $(SolutionDir)$(Configuration)\ $(Configuration)\ + false false