diff --git a/win32port/client/client.vcxproj b/win32port/client/client.vcxproj index 407d52d7..4c0ba67c 100644 --- a/win32port/client/client.vcxproj +++ b/win32port/client/client.vcxproj @@ -1,6 +1,10 @@  + + Debug static + Win32 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release static + Win32 + Release Win32 @@ -47,11 +55,21 @@ true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application false @@ -70,9 +88,15 @@ + + + + + + @@ -83,9 +107,15 @@ true + + true + true + + true + false @@ -107,6 +137,22 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../win32helpers + MultiThreaded + + + Console + true + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + @@ -122,6 +168,21 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../win32helpers + + + Console + true + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + Level3 @@ -132,6 +193,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ../win32helpers + MultiThreaded Console diff --git a/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj b/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj index 107cdca2..2e4cfdde 100644 --- a/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj +++ b/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj @@ -1,6 +1,10 @@  + + Debug static + Win32 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release static + Win32 + Release Win32 @@ -29,11 +37,21 @@ true Unicode + + StaticLibrary + true + Unicode + StaticLibrary true Unicode + + StaticLibrary + true + Unicode + StaticLibrary false @@ -46,15 +64,24 @@ true Unicode + + StaticLibrary + + + + + + + @@ -62,7 +89,16 @@ - + + $(SolutionDir)..\output\ + D:\Libraries\libwebsockets\output\;$(LibraryPath) + + + D:\Libraries\libwebsockets\output\;$(LibraryPath) + + + D:\Libraries\libwebsockets\output\;$(LibraryPath) + @@ -77,6 +113,24 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../win32helpers;../zlib + MultiThreadedDebug + + + Windows + true + + + $(OutDir)libwebsockets_vc100-mt-sgd$(TargetExt) + + @@ -91,6 +145,20 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../win32helpers;../zlib + + + Windows + true + + Level3 @@ -101,6 +169,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) ../win32helpers;../zlib + MultiThreaded Windows @@ -127,6 +196,15 @@ true + + + ../win32helpers;../zlib + WIN32 + + + $(OutDir)libwebsockets_vc100-mt-s.lib + + @@ -140,6 +218,7 @@ + diff --git a/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters b/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters index 391f573f..0cdd1330 100644 --- a/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters +++ b/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters @@ -53,5 +53,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/win32port/server/server.vcxproj b/win32port/server/server.vcxproj index ebf366f6..ef6e9281 100644 --- a/win32port/server/server.vcxproj +++ b/win32port/server/server.vcxproj @@ -1,6 +1,10 @@  + + Debug static + Win32 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release static + Win32 + Release Win32 @@ -21,7 +29,9 @@ ../win32helpers + ../win32helpers ../win32helpers + ../win32helpers @@ -54,11 +64,21 @@ true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application false @@ -77,9 +97,15 @@ + + + + + + @@ -90,9 +116,15 @@ true + + true + true + + true + false @@ -116,6 +148,24 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../win32helpers + MultiThreadedDebug + + + Console + true + + + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + @@ -133,6 +183,23 @@ ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ../win32helpers + + + Console + true + + + ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + Level3 @@ -143,6 +210,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ../win32helpers + MultiThreaded Console diff --git a/win32port/win32port.sln b/win32port/win32port.sln index cc471390..b6f0d895 100644 --- a/win32port/win32port.sln +++ b/win32port/win32port.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +# Visual C++ Express 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server\server.vcxproj", "{E585B64F-9365-4C58-9EF8-56393EB27F8B}" ProjectSection(ProjectDependencies) = postProject {332BF17E-FD30-4363-975A-AA731A827B4F} = {332BF17E-FD30-4363-975A-AA731A827B4F} @@ -14,44 +14,64 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZLib", "zlib\ZLib.vcxproj", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug static|Win32 = Debug static|Win32 + Debug static|x64 = Debug static|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release static|Win32 = Release static|Win32 + Release static|x64 = Release static|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|Win32.ActiveCfg = Debug static|Win32 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|Win32.Build.0 = Debug static|Win32 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|x64.ActiveCfg = Debug static|Win32 {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|Win32.ActiveCfg = Debug|Win32 {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|Win32.Build.0 = Debug|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|x64.ActiveCfg = Debug|x64 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|x64.Build.0 = Debug|x64 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|x64.ActiveCfg = Debug|Win32 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|Win32.ActiveCfg = Release static|Win32 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|Win32.Build.0 = Release static|Win32 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|x64.ActiveCfg = Release static|Win32 {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|Win32.ActiveCfg = Release|Win32 {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|Win32.Build.0 = Release|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|x64.ActiveCfg = Release|x64 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|x64.Build.0 = Release|x64 + {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|x64.ActiveCfg = Release|Win32 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|Win32.ActiveCfg = Debug static|Win32 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|Win32.Build.0 = Debug static|Win32 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|x64.ActiveCfg = Debug static|Win32 {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|Win32.ActiveCfg = Debug|Win32 {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|Win32.Build.0 = Debug|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|x64.ActiveCfg = Debug|x64 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|x64.Build.0 = Debug|x64 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|x64.ActiveCfg = Debug|Win32 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|Win32.ActiveCfg = Release static|Win32 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|Win32.Build.0 = Release static|Win32 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|x64.ActiveCfg = Release static|Win32 {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|Win32.ActiveCfg = Release|Win32 {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|Win32.Build.0 = Release|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|x64.ActiveCfg = Release|x64 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|x64.Build.0 = Release|x64 + {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|x64.ActiveCfg = Release|Win32 + {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|Win32.ActiveCfg = Debug static|Win32 + {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|Win32.Build.0 = Debug static|Win32 + {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|x64.ActiveCfg = Debug static|Win32 {6265650C-4799-451C-A687-94DE48759A8B}.Debug|Win32.ActiveCfg = Debug|Win32 {6265650C-4799-451C-A687-94DE48759A8B}.Debug|Win32.Build.0 = Debug|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug|x64.ActiveCfg = Debug|x64 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug|x64.Build.0 = Debug|x64 + {6265650C-4799-451C-A687-94DE48759A8B}.Debug|x64.ActiveCfg = Debug|Win32 + {6265650C-4799-451C-A687-94DE48759A8B}.Release static|Win32.ActiveCfg = Release static|Win32 + {6265650C-4799-451C-A687-94DE48759A8B}.Release static|Win32.Build.0 = Release static|Win32 + {6265650C-4799-451C-A687-94DE48759A8B}.Release static|x64.ActiveCfg = Release static|Win32 {6265650C-4799-451C-A687-94DE48759A8B}.Release|Win32.ActiveCfg = Release|Win32 {6265650C-4799-451C-A687-94DE48759A8B}.Release|Win32.Build.0 = Release|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release|x64.ActiveCfg = Release|x64 - {6265650C-4799-451C-A687-94DE48759A8B}.Release|x64.Build.0 = Release|x64 + {6265650C-4799-451C-A687-94DE48759A8B}.Release|x64.ActiveCfg = Release|Win32 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|Win32.ActiveCfg = Debug static|Win32 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|Win32.Build.0 = Debug static|Win32 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|x64.ActiveCfg = Debug static|Win32 {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|Win32.ActiveCfg = Debug|Win32 {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|Win32.Build.0 = Debug|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|x64.ActiveCfg = Debug|x64 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|x64.Build.0 = Debug|x64 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|x64.ActiveCfg = Debug|Win32 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|Win32.ActiveCfg = Release static|Win32 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|Win32.Build.0 = Release static|Win32 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|x64.ActiveCfg = Release static|Win32 {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|Win32.ActiveCfg = Release|Win32 {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|Win32.Build.0 = Release|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|x64.ActiveCfg = Release|x64 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|x64.Build.0 = Release|x64 + {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32port/zlib/ZLib.vcxproj b/win32port/zlib/ZLib.vcxproj index ee676ac5..eb924553 100644 --- a/win32port/zlib/ZLib.vcxproj +++ b/win32port/zlib/ZLib.vcxproj @@ -1,6 +1,10 @@  + + Debug static + Win32 + Debug Win32 @@ -9,6 +13,10 @@ Debug x64 + + Release static + Win32 + Release Win32 @@ -36,10 +44,21 @@ StaticLibrary MultiByte + + StaticLibrary + MultiByte + StaticLibrary MultiByte + + StaticLibrary + MultiByte + + + StaticLibrary + @@ -55,27 +74,46 @@ + + + + + + + + DebugV10\ DebugV10\ + + $(SolutionDir)..\output\ + DebugV10\ + DebugV10\ DebugV10\ + + DebugV10\ + DebugV10\ + - .\Release\ + $(SolutionDir)..\output\ .\Release\ .\Release\ .\Release\ + + $(SolutionDir)..\output\ + MultiThreadedDebugDLL @@ -107,6 +145,37 @@ DebugV10\ZLib.lib + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + true + EditAndContinue + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + DebugV10\ + DebugV10\ZLib.pch + DebugV10\ + DebugV10\ + EnableFastChecks + false + + + 0x1c09 + _DEBUG;%(PreprocessorDefinitions) + + + true + DebugV10\ZLib.bsc + + + true + $(OutDir)ZLib_vc100-mt-sgd.lib + + MultiThreadedDebugDLL @@ -137,9 +206,39 @@ DebugV10\ZLib.lib + + + MultiThreadedDebugDLL + Default + false + Disabled + true + Level3 + ProgramDatabase + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + DebugV10\ + DebugV10\ZLib.pch + DebugV10\ + DebugV10\ + EnableFastChecks + false + + + 0x1c09 + _DEBUG;%(PreprocessorDefinitions) + + + true + DebugV10\ZLib.bsc + + + true + DebugV10\ZLib.lib + + - MultiThreadedDLL + MultiThreaded OnlyExplicitInline true true @@ -195,6 +294,14 @@ .\Release\ZLib.lib + + + $(OutDir)ZLib_vc100-mt-s.lib + + + MultiThreaded + +