diff --git a/.gitignore b/.gitignore index e742c00..c07a343 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ build debug package *.a +.vs/ +*.VC.db +*.VC.opendb +ipch/ diff --git a/fiber_vc2015.sln b/fiber_vc2015.sln index 9d1ea53..6fd4485 100644 --- a/fiber_vc2015.sln +++ b/fiber_vc2015.sln @@ -16,43 +16,79 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 DebugDll|Win32 = DebugDll|Win32 + DebugDll|x64 = DebugDll|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 ReleaseDll|Win32 = ReleaseDll|Win32 + ReleaseDll|x64 = ReleaseDll|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|Win32.ActiveCfg = Debug|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|Win32.Build.0 = Debug|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|x64.ActiveCfg = Debug|x64 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|x64.Build.0 = Debug|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Win32.Build.0 = DebugDll|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|x64.ActiveCfg = DebugDll|x64 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|x64.Build.0 = DebugDll|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|Win32.ActiveCfg = Release|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|Win32.Build.0 = Release|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|x64.ActiveCfg = Release|x64 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|x64.Build.0 = Release|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|x64.Build.0 = ReleaseDll|x64 {A08F48F5-D359-4332-8743-F9D85887AEF6}.Debug|Win32.ActiveCfg = Debug|Win32 {A08F48F5-D359-4332-8743-F9D85887AEF6}.Debug|Win32.Build.0 = Debug|Win32 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.Debug|x64.ActiveCfg = Debug|x64 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.Debug|x64.Build.0 = Debug|x64 {A08F48F5-D359-4332-8743-F9D85887AEF6}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {A08F48F5-D359-4332-8743-F9D85887AEF6}.DebugDll|Win32.Build.0 = DebugDll|Win32 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.DebugDll|x64.ActiveCfg = DebugDll|x64 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.DebugDll|x64.Build.0 = DebugDll|x64 {A08F48F5-D359-4332-8743-F9D85887AEF6}.Release|Win32.ActiveCfg = Release|Win32 {A08F48F5-D359-4332-8743-F9D85887AEF6}.Release|Win32.Build.0 = Release|Win32 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.Release|x64.ActiveCfg = Release|x64 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.Release|x64.Build.0 = Release|x64 {A08F48F5-D359-4332-8743-F9D85887AEF6}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 {A08F48F5-D359-4332-8743-F9D85887AEF6}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 + {A08F48F5-D359-4332-8743-F9D85887AEF6}.ReleaseDll|x64.Build.0 = ReleaseDll|x64 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|Win32.ActiveCfg = Debug|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|Win32.Build.0 = Debug|Win32 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|x64.ActiveCfg = Debug|x64 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|x64.Build.0 = Debug|x64 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.DebugDll|Win32.Build.0 = DebugDll|Win32 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.DebugDll|x64.ActiveCfg = DebugDll|x64 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.DebugDll|x64.Build.0 = DebugDll|x64 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Release|Win32.ActiveCfg = Release|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Release|Win32.Build.0 = Release|Win32 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Release|x64.ActiveCfg = Release|x64 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Release|x64.Build.0 = Release|x64 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.ReleaseDll|x64.Build.0 = ReleaseDll|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.ActiveCfg = Debug|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.Build.0 = Debug|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|x64.ActiveCfg = Debug|x64 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|x64.Build.0 = Debug|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Win32.Build.0 = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|x64.ActiveCfg = DebugDll|x64 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|x64.Build.0 = DebugDll|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.ActiveCfg = Release|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.Build.0 = Release|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|x64.ActiveCfg = Release|x64 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|x64.Build.0 = Release|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|x64.Build.0 = ReleaseDll|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/libfiber_vc2015.vcxproj b/libfiber_vc2015.vcxproj index c5cc2e4..5252af6 100644 --- a/libfiber_vc2015.vcxproj +++ b/libfiber_vc2015.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {AD99B75A-40BF-46DC-844B-23417FDC8690} @@ -31,12 +47,24 @@ v140 MultiByte + + StaticLibrary + true + v140 + MultiByte + DynamicLibrary true v140 MultiByte + + DynamicLibrary + true + v140 + MultiByte + StaticLibrary false @@ -44,6 +72,13 @@ true MultiByte + + StaticLibrary + false + v140 + true + MultiByte + DynamicLibrary false @@ -51,25 +86,45 @@ true MultiByte + + DynamicLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + .\ + .\ @@ -94,6 +149,21 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + .\src;.\include + MultiThreadedDebug + + + Windows + true + + Use @@ -110,6 +180,22 @@ wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions) + true + .\src;.\include + MultiThreadedDebugDLL + + + Windows + true + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + + Level3 @@ -129,6 +215,25 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + .\src;.\include + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -148,6 +253,25 @@ wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions) + true + .\src;.\include + + + Windows + true + true + true + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + + @@ -241,9 +365,13 @@ Create + Create Create + Create Create + Create Create + Create diff --git a/samples/WinEchod/WinEchod_vc2015.vcxproj b/samples/WinEchod/WinEchod_vc2015.vcxproj index 82dd602..04eba75 100644 --- a/samples/WinEchod/WinEchod_vc2015.vcxproj +++ b/samples/WinEchod/WinEchod_vc2015.vcxproj @@ -1,6 +1,10 @@  + + DebugDll + x64 + Debug Win32 @@ -9,6 +13,14 @@ DebugDll Win32 + + Debug + x64 + + + ReleaseDll + x64 + Release Win32 @@ -17,6 +29,10 @@ ReleaseDll Win32 + + Release + x64 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC} @@ -32,6 +48,13 @@ Unicode Dynamic + + Application + true + v140 + Unicode + Dynamic + Application true @@ -39,6 +62,13 @@ Unicode Static + + Application + true + v140 + Unicode + Static + Application false @@ -47,6 +77,14 @@ Unicode Dynamic + + Application + false + v140 + true + Unicode + Dynamic + Application false @@ -55,38 +93,70 @@ Unicode Static + + Application + false + v140 + true + Unicode + Static + + + + + + + + + + + + + true .\ + + true + true .\ + + true + false .\ + + false + false .\ + + false + Use @@ -116,6 +186,34 @@ copy ..\..\libfiber.dll .\ /Y + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\include + + + Windows + true + ..\..\ + libfiber.lib + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + copy ..\..\libfiber.dll .\ /Y + + Use @@ -147,6 +245,35 @@ + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\include + MultiThreadedDebug + + + Windows + true + ..\..\ + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + Level3 @@ -180,6 +307,38 @@ copy ..\..\libfiber.dll .\ /Y + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\include + + + Windows + true + true + true + ..\..\ + libfiber.lib + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + copy ..\..\libfiber.dll .\ /Y + + Level3 @@ -215,6 +374,40 @@ + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\include + MultiThreaded + + + Windows + true + true + true + ..\..\ + libfiber.lib + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + @@ -238,9 +431,13 @@ Create + Create Create + Create Create + Create Create + Create diff --git a/samples/client/client_vc2015.vcxproj b/samples/client/client_vc2015.vcxproj index 08461cf..01a5172 100644 --- a/samples/client/client_vc2015.vcxproj +++ b/samples/client/client_vc2015.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {A08F48F5-D359-4332-8743-F9D85887AEF6} @@ -31,18 +47,36 @@ v140 MultiByte + + Application + true + v140 + MultiByte + Application true v140 MultiByte + + Application + true + v140 + MultiByte + Application true v140 MultiByte + + Application + true + v140 + MultiByte + Application false @@ -50,38 +84,69 @@ true MultiByte + + Application + false + v140 + true + MultiByte + + + + + + + + + + + + + true .\ + + true + true .\ + + true + true .\ + + true + false .\ + + false + NotUsing @@ -107,6 +172,30 @@ + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\include;..\ + MultiThreadedDebug + + + Console + true + ..\..\ + + + + + + + + + + @@ -132,6 +221,31 @@ copy ..\..\libfiber.dll .\ /Y + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\include;..\ + MultiThreadedDebugDLL + + + Console + true + ..\..\ + libfiber.lib;%(AdditionalDependencies) + + + + + + + copy ..\..\libfiber.dll .\ /Y + + NotUsing @@ -156,6 +270,30 @@ copy ..\..\libfiber.dll .\ /Y + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\include;..\ + MultiThreadedDLL + + + Console + true + ..\..\ + libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + + + copy ..\..\libfiber.dll .\ /Y + + Level3 @@ -177,6 +315,27 @@ libfiber.lib;%(AdditionalDependencies) + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\include;..\ + MultiThreaded + + + Console + true + true + true + ..\..\ + libfiber.lib;%(AdditionalDependencies) + + diff --git a/samples/server/server_vc2015.vcxproj b/samples/server/server_vc2015.vcxproj index 0d16f0b..f7ccee1 100644 --- a/samples/server/server_vc2015.vcxproj +++ b/samples/server/server_vc2015.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2} @@ -31,18 +47,36 @@ v140 MultiByte + + Application + true + v140 + MultiByte + Application true v140 MultiByte + + Application + true + v140 + MultiByte + Application true v140 MultiByte + + Application + true + v140 + MultiByte + Application false @@ -50,38 +84,69 @@ true MultiByte + + Application + false + v140 + true + MultiByte + + + + + + + + + + + + + true .\ + + true + true .\ + + true + true .\ + + true + false .\ + + false + NotUsing @@ -107,6 +172,30 @@ + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\include + MultiThreadedDebug + + + Console + true + ..\..\ + + + + + + + + + + @@ -132,6 +221,31 @@ copy ..\..\libfiber.dll .\ /Y + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\c\include; ..\..\..\lib_acl\include;..\ + MultiThreadedDebugDLL + + + Console + true + ..\..\c;..\..\..\lib_acl; + lib_acl_d.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + + + copy ..\..\libfiber.dll .\ /Y + + NotUsing @@ -156,6 +270,30 @@ copy ..\..\libfiber.dll .\ /Y + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\include + MultiThreadedDLL + + + Console + true + ..\..\ + libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + + + copy ..\..\libfiber.dll .\ /Y + + Level3 @@ -177,6 +315,27 @@ libfiber.lib;lib_acl_vc2012.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\c\include; ..\..\..\lib_acl\include;..\ + MultiThreaded + + + Console + true + true + true + ..\..\c;..\..\..\lib_acl; + libfiber.lib;lib_acl_vc2012.lib;ws2_32.lib;%(AdditionalDependencies) + +