From fcd083d307fa1e0e929a0af7d2052da81c85401a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=A0=91=E6=96=B0?= Date: Fri, 14 Dec 2018 16:34:28 +0800 Subject: [PATCH] build on Windows ok --- acl_cpp_vc2012.sln | 79 ++++--- acl_cpp_vc2013.sln | 43 ++-- lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj | 6 +- lib_fiber/c/libfiber_vc2012.vcxproj | 163 ++++++++++++- lib_fiber/c/libfiber_vc2013.vcxproj | 145 +++++++++++- lib_fiber/c/src/event.c | 4 +- lib_fiber/c/src/event.h | 2 +- lib_fiber/cpp/libfiber_cpp_vc2012.vcxproj | 157 ++++++++++++- lib_fiber/cpp/libfiber_cpp_vc2013.vcxproj | 149 ++++++++++++ lib_fiber/cpp/src/fiber_server.cpp | 2 +- lib_fiber/samples/WinEchod/FiberConnect.cpp | 2 +- lib_fiber/samples/WinEchod/WinEchod.rc | Bin 11814 -> 11862 bytes lib_fiber/samples/WinEchod/WinEchod.vcxproj | 222 +++++++++++++++++- .../samples/WinEchod/WinEchod_vc2013.vcxproj | 208 +++++++++++++++- lib_fiber/samples/fiber/fiber_vc2013.vcxproj | 147 +++++++++++- 15 files changed, 1263 insertions(+), 66 deletions(-) diff --git a/acl_cpp_vc2012.sln b/acl_cpp_vc2012.sln index ed855e561..a5686e596 100644 --- a/acl_cpp_vc2012.sln +++ b/acl_cpp_vc2012.sln @@ -725,12 +725,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fiber", "fiber", "{D75ACD1D EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber", "lib_fiber\samples\fiber\fiber_vc2012.vcxproj", "{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEchod", "lib_fiber\samples\WinEchod\WinEchod.vcxproj", "{F74A61AD-A309-47A5-A7C6-BAC888660BBC}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples\server2\server2_vc2012.vcxproj", "{EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples\client2\client2_vc2012.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEchod", "lib_fiber\samples\WinEchod\WinEchod.vcxproj", "{F74A61AD-A309-47A5-A7C6-BAC888660BBC}" + ProjectSection(ProjectDependencies) = postProject + {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} + {A456325D-93BC-4656-8F07-A75F5526DF53} = {A456325D-93BC-4656-8F07-A75F5526DF53} + {34506C5D-E131-43BB-9656-BA39F0B56485} = {34506C5D-E131-43BB-9656-BA39F0B56485} + {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} + {FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Mixed Platforms = Debug|Mixed Platforms @@ -3509,22 +3516,22 @@ Global {A456325D-93BC-4656-8F07-A75F5526DF53}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Debug|Win32.ActiveCfg = Debug|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Debug|Win32.Build.0 = Debug|Win32 - {A456325D-93BC-4656-8F07-A75F5526DF53}.Debug|x64.ActiveCfg = Debug|Win32 + {A456325D-93BC-4656-8F07-A75F5526DF53}.Debug|x64.ActiveCfg = Debug|x64 {A456325D-93BC-4656-8F07-A75F5526DF53}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {A456325D-93BC-4656-8F07-A75F5526DF53}.DebugDll|x64.ActiveCfg = DebugDll|Win32 + {A456325D-93BC-4656-8F07-A75F5526DF53}.DebugDll|x64.ActiveCfg = DebugDll|x64 {A456325D-93BC-4656-8F07-A75F5526DF53}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Release|Mixed Platforms.Build.0 = Release|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Release|Win32.ActiveCfg = Release|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Release|Win32.Build.0 = Release|Win32 - {A456325D-93BC-4656-8F07-A75F5526DF53}.Release|x64.ActiveCfg = Release|Win32 + {A456325D-93BC-4656-8F07-A75F5526DF53}.Release|x64.ActiveCfg = Release|x64 {A456325D-93BC-4656-8F07-A75F5526DF53}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Releasedll|Win32.Build.0 = ReleaseDll|Win32 - {A456325D-93BC-4656-8F07-A75F5526DF53}.Releasedll|x64.ActiveCfg = ReleaseDll|Win32 + {A456325D-93BC-4656-8F07-A75F5526DF53}.Releasedll|x64.ActiveCfg = ReleaseDll|x64 {A456325D-93BC-4656-8F07-A75F5526DF53}.Template|Mixed Platforms.ActiveCfg = Release|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Template|Mixed Platforms.Build.0 = Release|Win32 {A456325D-93BC-4656-8F07-A75F5526DF53}.Template|Win32.ActiveCfg = Release|Win32 @@ -3534,22 +3541,22 @@ Global {34506C5D-E131-43BB-9656-BA39F0B56485}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Debug|Win32.ActiveCfg = Debug|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Debug|Win32.Build.0 = Debug|Win32 - {34506C5D-E131-43BB-9656-BA39F0B56485}.Debug|x64.ActiveCfg = Debug|Win32 + {34506C5D-E131-43BB-9656-BA39F0B56485}.Debug|x64.ActiveCfg = Debug|x64 {34506C5D-E131-43BB-9656-BA39F0B56485}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {34506C5D-E131-43BB-9656-BA39F0B56485}.DebugDll|x64.ActiveCfg = DebugDll|Win32 + {34506C5D-E131-43BB-9656-BA39F0B56485}.DebugDll|x64.ActiveCfg = DebugDll|x64 {34506C5D-E131-43BB-9656-BA39F0B56485}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Release|Mixed Platforms.Build.0 = Release|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Release|Win32.ActiveCfg = Release|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Release|Win32.Build.0 = Release|Win32 - {34506C5D-E131-43BB-9656-BA39F0B56485}.Release|x64.ActiveCfg = Release|Win32 + {34506C5D-E131-43BB-9656-BA39F0B56485}.Release|x64.ActiveCfg = Release|x64 {34506C5D-E131-43BB-9656-BA39F0B56485}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Releasedll|Win32.Build.0 = ReleaseDll|Win32 - {34506C5D-E131-43BB-9656-BA39F0B56485}.Releasedll|x64.ActiveCfg = ReleaseDll|Win32 + {34506C5D-E131-43BB-9656-BA39F0B56485}.Releasedll|x64.ActiveCfg = ReleaseDll|x64 {34506C5D-E131-43BB-9656-BA39F0B56485}.Template|Mixed Platforms.ActiveCfg = Release|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Template|Mixed Platforms.Build.0 = Release|Win32 {34506C5D-E131-43BB-9656-BA39F0B56485}.Template|Win32.ActiveCfg = Release|Win32 @@ -3580,31 +3587,6 @@ Global {BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|Win32.ActiveCfg = Release|Win32 {BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|Win32.Build.0 = Release|Win32 {BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|x64.ActiveCfg = Release|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {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 = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 - {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|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.Build.0 = Release|Win32 - {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 = ReleaseDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32 - {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|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.Build.0 = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.ActiveCfg = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.Build.0 = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|x64.ActiveCfg = DebugDll|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -3655,6 +3637,31 @@ Global {A08F48F5-D359-4332-8743-F9D85887AEF6}.Template|Win32.ActiveCfg = DebugDll|Win32 {A08F48F5-D359-4332-8743-F9D85887AEF6}.Template|Win32.Build.0 = DebugDll|Win32 {A08F48F5-D359-4332-8743-F9D85887AEF6}.Template|x64.ActiveCfg = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {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}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 + {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}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.Build.0 = Release|Win32 + {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}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32 + {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}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.Build.0 = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.ActiveCfg = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.Build.0 = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|x64.ActiveCfg = DebugDll|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3783,8 +3790,8 @@ Global {1B392F34-557F-44E2-8A47-B808C2EA4832} = {3C576B18-D253-4CA2-986E-7173C2978AC3} {20299269-7A1C-45CB-8807-861745A55F82} = {3C576B18-D253-4CA2-986E-7173C2978AC3} {BFCE4280-B6E5-414A-A8CD-F827A4A19B6F} = {D75ACD1D-AD2A-4A16-B761-6EA5202D5EA5} - {F74A61AD-A309-47A5-A7C6-BAC888660BBC} = {D75ACD1D-AD2A-4A16-B761-6EA5202D5EA5} {EE518BE5-94B2-4F8E-82CC-C08503BBD6B2} = {D75ACD1D-AD2A-4A16-B761-6EA5202D5EA5} {A08F48F5-D359-4332-8743-F9D85887AEF6} = {D75ACD1D-AD2A-4A16-B761-6EA5202D5EA5} + {F74A61AD-A309-47A5-A7C6-BAC888660BBC} = {D75ACD1D-AD2A-4A16-B761-6EA5202D5EA5} EndGlobalSection EndGlobal diff --git a/acl_cpp_vc2013.sln b/acl_cpp_vc2013.sln index 5f8bca76e..b909bedb4 100644 --- a/acl_cpp_vc2013.sln +++ b/acl_cpp_vc2013.sln @@ -20,12 +20,23 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fiber", "fiber", "{BF81B2CD-2948-4EB9-925F-764AE0EB9BF9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber", "lib_fiber\samples\fiber\fiber_vc2013.vcxproj", "{6265F6E1-CF6D-4C22-8F91-95921659C146}" + ProjectSection(ProjectDependencies) = postProject + {AD99B75A-40BF-46DC-844B-23417FDC8690} = {AD99B75A-40BF-46DC-844B-23417FDC8690} + {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfiber_cpp", "lib_fiber\cpp\libfiber_cpp_vc2013.vcxproj", "{F2479E2C-7267-436C-A1F1-A63B39E7CB30}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfiber", "lib_fiber\c\libfiber_vc2013.vcxproj", "{AD99B75A-40BF-46DC-844B-23417FDC8690}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEchod", "lib_fiber\samples\WinEchod\WinEchod_vc2013.vcxproj", "{F74A61AD-A309-47A5-A7C6-BAC888660BBC}" + ProjectSection(ProjectDependencies) = postProject + {F2479E2C-7267-436C-A1F1-A63B39E7CB30} = {F2479E2C-7267-436C-A1F1-A63B39E7CB30} + {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} + {AD99B75A-40BF-46DC-844B-23417FDC8690} = {AD99B75A-40BF-46DC-844B-23417FDC8690} + {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B} + {FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -125,22 +136,22 @@ Global {6265F6E1-CF6D-4C22-8F91-95921659C146}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Debug|Win32.ActiveCfg = Debug|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Debug|Win32.Build.0 = Debug|Win32 - {6265F6E1-CF6D-4C22-8F91-95921659C146}.Debug|x64.ActiveCfg = Debug|Win32 + {6265F6E1-CF6D-4C22-8F91-95921659C146}.Debug|x64.ActiveCfg = Debug|x64 {6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|x64.ActiveCfg = Debug|Win32 + {6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|x64.ActiveCfg = DebugDll|x64 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Release|Mixed Platforms.Build.0 = Release|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Release|Win32.ActiveCfg = Release|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Release|Win32.Build.0 = Release|Win32 - {6265F6E1-CF6D-4C22-8F91-95921659C146}.Release|x64.ActiveCfg = Release|Win32 + {6265F6E1-CF6D-4C22-8F91-95921659C146}.Release|x64.ActiveCfg = Release|x64 {6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|x64.ActiveCfg = Release|Win32 + {6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Template|Mixed Platforms.ActiveCfg = Release|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Template|Mixed Platforms.Build.0 = Release|Win32 {6265F6E1-CF6D-4C22-8F91-95921659C146}.Template|Win32.ActiveCfg = Release|Win32 @@ -150,22 +161,22 @@ Global {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|Win32.ActiveCfg = Debug|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|Win32.Build.0 = Debug|Win32 - {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|x64.ActiveCfg = Debug|Win32 + {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|x64.ActiveCfg = Debug|x64 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Win32.ActiveCfg = DebugDll|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Win32.Build.0 = DebugDll|Win32 - {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|x64.ActiveCfg = Debug|Win32 + {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|x64.ActiveCfg = DebugDll|x64 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Release|Mixed Platforms.Build.0 = Release|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Release|Win32.ActiveCfg = Release|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Release|Win32.Build.0 = Release|Win32 - {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Release|x64.ActiveCfg = Release|Win32 + {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Release|x64.ActiveCfg = Release|x64 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32 - {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|x64.ActiveCfg = Release|Win32 + {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|Mixed Platforms.ActiveCfg = Release|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|Mixed Platforms.Build.0 = Release|Win32 {F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|Win32.ActiveCfg = Release|Win32 @@ -175,22 +186,22 @@ Global {AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {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|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|x64.ActiveCfg = Debug|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 {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|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|x64.ActiveCfg = DebugDll|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|Mixed Platforms.Build.0 = Release|Win32 {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|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.Release|x64.ActiveCfg = Release|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32 {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|Win32 + {AD99B75A-40BF-46DC-844B-23417FDC8690}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Mixed Platforms.Build.0 = DebugDll|Win32 {AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Win32.ActiveCfg = DebugDll|Win32 @@ -200,22 +211,22 @@ Global {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {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|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|x64.ActiveCfg = Debug|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 {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|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|x64.ActiveCfg = DebugDll|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.Build.0 = Release|Win32 {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|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|x64.ActiveCfg = Release|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32 {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|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.Build.0 = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.ActiveCfg = DebugDll|Win32 diff --git a/lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj b/lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj index 6822eba62..76f024513 100644 --- a/lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj +++ b/lib_acl_cpp/lib_acl_cpp_vc2012.vcxproj @@ -116,9 +116,9 @@ .\ Release\ .\ - $(Configuration)\ + DebugDll\ .\ - $(Configuration)\ + ReleaseDll\ AllRules.ruleset AllRules.ruleset @@ -818,4 +818,4 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y - + \ No newline at end of file diff --git a/lib_fiber/c/libfiber_vc2012.vcxproj b/lib_fiber/c/libfiber_vc2012.vcxproj index b8a3b463f..07c0f1051 100644 --- a/lib_fiber/c/libfiber_vc2012.vcxproj +++ b/lib_fiber/c/libfiber_vc2012.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {34506C5D-E131-43BB-9656-BA39F0B56485} @@ -31,12 +47,24 @@ v110 MultiByte + + StaticLibrary + true + v110 + MultiByte + DynamicLibrary true v110 MultiByte + + DynamicLibrary + true + v110 + MultiByte + StaticLibrary false @@ -44,6 +72,13 @@ true MultiByte + + StaticLibrary + false + v110 + true + MultiByte + DynamicLibrary false @@ -51,43 +86,88 @@ true MultiByte + + DynamicLibrary + false + v110 + true + MultiByte + DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + + + + + + + + + + + + + .\ + + .\ + $(Configuration)\ + .\ + DebugDll\ + + + .\ + DebugDll\ .\ .dll $(ProjectName).dll + + .dll + $(ProjectName).dll + .\ + ReleaseDll\ + + + .\ + ReleaseDll\ .\ + + .\ + $(Configuration)\ + Use @@ -103,6 +183,21 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + .\src;.\include + MultiThreadedDebug + + + Windows + true + + Use @@ -121,6 +216,28 @@ wsock32.lib;ws2_32.lib;IPHlpApi.Lib wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + $(ProjectName).dll + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;MT;_CRT_SECURE_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions) + true + .\src;.\include + MultiThreadedDLL + + + Windows + true + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + wsock32.lib;ws2_32.lib;IPHlpApi.Lib + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + $(ProjectName).dll @@ -142,6 +259,25 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + .\src;.\include + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -159,6 +295,27 @@ true true wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + $(ProjectName).dll + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIBMT;_CRT_SECURE_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions) + true + .\src;.\include + + + Windows + true + true + true + wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies) + $(ProjectName).dll @@ -257,12 +414,16 @@ Create + Create Create + Create Create + Create Create + Create - + \ No newline at end of file diff --git a/lib_fiber/c/libfiber_vc2013.vcxproj b/lib_fiber/c/libfiber_vc2013.vcxproj index 9986e66b3..1486f976d 100644 --- a/lib_fiber/c/libfiber_vc2013.vcxproj +++ b/lib_fiber/c/libfiber_vc2013.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 @@ v120 MultiByte + + StaticLibrary + true + v120 + MultiByte + DynamicLibrary true v120 MultiByte + + DynamicLibrary + true + v120 + MultiByte + StaticLibrary false @@ -44,6 +72,13 @@ true MultiByte + + StaticLibrary + false + v120 + true + MultiByte + DynamicLibrary false @@ -51,34 +86,69 @@ true MultiByte + + DynamicLibrary + false + v120 + true + MultiByte + + + + + + + + + + + + + .\ + + .\ + $(Configuration)\ + .\ + + .\ + $(Configuration)\ + .\ + + .\ + $(Configuration)\ + .\ + + .\ + $(Configuration)\ + Use @@ -94,6 +164,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 +195,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 +230,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 +268,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) + + @@ -244,12 +383,16 @@ Create + Create Create + Create Create + Create Create + Create - + \ No newline at end of file diff --git a/lib_fiber/c/src/event.c b/lib_fiber/c/src/event.c index fc211bc73..adb71f3f6 100644 --- a/lib_fiber/c/src/event.c +++ b/lib_fiber/c/src/event.c @@ -178,7 +178,7 @@ int event_add_read(EVENT *ev, FILE_EVENT *fe, event_proc *proc) return 0; } - if (fe->fd >= ev->setsize) { + if (fe->fd >= (socket_t) ev->setsize) { msg_error("fd: %d >= setsize: %d", fe->fd, ev->setsize); acl_fiber_set_error(ERANGE); return 0; @@ -217,7 +217,7 @@ int event_add_write(EVENT *ev, FILE_EVENT *fe, event_proc *proc) return 0; } - if (fe->fd >= ev->setsize) { + if (fe->fd >= (socket_t) ev->setsize) { msg_error("fd: %d >= setsize: %d", fe->fd, ev->setsize); acl_fiber_set_error(ERANGE); return 0; diff --git a/lib_fiber/c/src/event.h b/lib_fiber/c/src/event.h index a884ed95b..110dfceb0 100644 --- a/lib_fiber/c/src/event.h +++ b/lib_fiber/c/src/event.h @@ -150,7 +150,7 @@ struct EVENT { RING events; int timeout; int fdcount; - socket_t setsize; + ssize_t setsize; socket_t maxfd; unsigned flag; diff --git a/lib_fiber/cpp/libfiber_cpp_vc2012.vcxproj b/lib_fiber/cpp/libfiber_cpp_vc2012.vcxproj index 7f20973aa..eb4daa24d 100644 --- a/lib_fiber/cpp/libfiber_cpp_vc2012.vcxproj +++ b/lib_fiber/cpp/libfiber_cpp_vc2012.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {A456325D-93BC-4656-8F07-A75F5526DF53} @@ -31,12 +47,24 @@ v110 MultiByte + + StaticLibrary + true + v110 + MultiByte + DynamicLibrary true v110 MultiByte + + DynamicLibrary + true + v110 + MultiByte + StaticLibrary false @@ -44,6 +72,13 @@ true MultiByte + + StaticLibrary + false + v110 + true + MultiByte + DynamicLibrary false @@ -51,34 +86,71 @@ true MultiByte + + DynamicLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + .\ + + .\ + $(Configuration)\ + .\ + DebugDll\ + + + .\ + DebugDll\ .\ + ReleaseDll\ + + + .\ + ReleaseDll\ .\ + + .\ + $(Configuration)\ + Use @@ -95,6 +167,22 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master;%(AdditionalIncludeDirectories) + stdafx.hpp + + + Windows + true + + Use @@ -111,6 +199,26 @@ true lib_protocol_d.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c + $(ProjectName).dll + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master;%(AdditionalIncludeDirectories) + stdafx.hpp + + + Windows + true + lib_protocol_d.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c + $(ProjectName).dll @@ -133,6 +241,26 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master;%(AdditionalIncludeDirectories) + stdafx.hpp + + + Windows + true + true + true + + Level3 @@ -152,6 +280,29 @@ true ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c lib_protocol.lib;lib_acl.lib;lib_acl_cpp.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + $(ProjectName).dll + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master;%(AdditionalIncludeDirectories) + stdafx.hpp + + + Windows + true + true + true + ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c + lib_protocol.lib;lib_acl.lib;lib_acl_cpp.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + $(ProjectName).dll @@ -182,12 +333,16 @@ Create + Create Create + Create Create + Create Create + Create - + \ No newline at end of file diff --git a/lib_fiber/cpp/libfiber_cpp_vc2013.vcxproj b/lib_fiber/cpp/libfiber_cpp_vc2013.vcxproj index 0813c39e0..b92014285 100644 --- a/lib_fiber/cpp/libfiber_cpp_vc2013.vcxproj +++ b/lib_fiber/cpp/libfiber_cpp_vc2013.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {F2479E2C-7267-436C-A1F1-A63B39E7CB30} @@ -31,12 +47,24 @@ v120 MultiByte + + StaticLibrary + true + v120 + MultiByte + DynamicLibrary true v120 MultiByte + + DynamicLibrary + true + v120 + MultiByte + StaticLibrary false @@ -44,6 +72,13 @@ true MultiByte + + StaticLibrary + false + v120 + true + MultiByte + DynamicLibrary false @@ -51,34 +86,69 @@ true MultiByte + + DynamicLibrary + false + v120 + true + MultiByte + + + + + + + + + + + + + .\ + + .\ + $(Configuration)\ + .\ + + .\ + $(Configuration)\ + .\ + + .\ + $(Configuration)\ + .\ + + .\ + $(Configuration)\ + Use @@ -95,6 +165,22 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master + MultiThreadedDebug + stdafx.hpp + + + Windows + true + + Use @@ -113,6 +199,24 @@ ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master + MultiThreadedDebugDLL + stdafx.hpp + + + Windows + true + lib_protocol_d.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c + + Level3 @@ -133,6 +237,26 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master + MultiThreaded + stdafx.hpp + + + Windows + true + true + true + + Level3 @@ -154,6 +278,27 @@ lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master + stdafx.hpp + + + Windows + true + true + true + ..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c + lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib;libfiber.lib;ws2_32.lib;%(AdditionalDependencies) + + @@ -183,9 +328,13 @@ Create + Create Create + Create Create + Create Create + Create diff --git a/lib_fiber/cpp/src/fiber_server.cpp b/lib_fiber/cpp/src/fiber_server.cpp index 75c3f3932..70f1ca1c4 100644 --- a/lib_fiber/cpp/src/fiber_server.cpp +++ b/lib_fiber/cpp/src/fiber_server.cpp @@ -136,7 +136,7 @@ static void fiber_client(ACL_FIBER *fiber acl_unused, void *ctx) static void thread_fiber_accept(ACL_FIBER *fiber, void *ctx) { - static int __max_fd = 0, __last_fd = 0; + static socket_t __max_fd = 0, __last_fd = 0; ACL_VSTREAM *sstream = (ACL_VSTREAM *) ctx, *cstream; char ip[64]; diff --git a/lib_fiber/samples/WinEchod/FiberConnect.cpp b/lib_fiber/samples/WinEchod/FiberConnect.cpp index 70ad48797..eb0568cfe 100644 --- a/lib_fiber/samples/WinEchod/FiberConnect.cpp +++ b/lib_fiber/samples/WinEchod/FiberConnect.cpp @@ -60,7 +60,7 @@ void CFiberConnect::doEcho(socket_t sock) for (int i = 0; i < m_count; i++) { - if (acl_fiber_send(sock, s, strlen(s), 0) < 0) + if (acl_fiber_send(sock, s, (int) strlen(s), 0) < 0) { printf("send error %s\r\n", acl::last_serror()); break; diff --git a/lib_fiber/samples/WinEchod/WinEchod.rc b/lib_fiber/samples/WinEchod/WinEchod.rc index 0cff4b1d04e54af71057010fb1b50031e719fbe8..c34f0b93c9ba08787ebef48fa1a815a80584fde2 100644 GIT binary patch delta 193 zcmZ1$b1i1WAyF2825*MR$3(+;oEZ`s@)(jCQWCM$@=3FI>r06BRK3Jfj`{tUqk zn|s7M7{!x-V(AQ-U~wNHUCdAdQZ@ObnB-&w2{*0~pja+Yq=;d1gG3IWGebU5X&z7@ z8K`jb2Z=gHi^=(tSA{?l$qc1HbwwckAW0u74Q68ov&rRBrtCgIX`llp-xiV07wZgH2?qr delta 150 zcmcZ>vn*!AA<@ZJ!a|d;h;W>T&SqX<{9WEEmgk zLMHzalbGx$;l?E$^eb*w^taTEu*vfza#-&5FHN2-Az3$>N6Kz;mAJ;_KavF;WpNjS x3sR;2Pp*^FU^Zf~n7mTTl#3;jtwb>!DlEfq$zaN$1H>jk(wM + + 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} @@ -31,6 +47,13 @@ Unicode Dynamic + + Application + true + v110 + Unicode + Dynamic + Application true @@ -38,6 +61,13 @@ Unicode Static + + Application + true + v110 + Unicode + Static + Application false @@ -46,6 +76,14 @@ Unicode Dynamic + + Application + false + v110 + true + Unicode + Dynamic + Application false @@ -54,38 +92,80 @@ Unicode Static + + Application + false + v110 + true + Unicode + Static + + + + + + + + + + + + + true .\ + DebugDll\ + + + true + .\ + DebugDll\ true .\ + + true + .\ + $(Configuration)\ + false .\ + ReleaseDll\ + + + false + .\ + ReleaseDll\ false .\ + + false + .\ + $(Configuration)\ + Use @@ -100,6 +180,7 @@ true ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; libfiber.lib;libfiber_cpp.lib;lib_acl_d.lib;lib_protocol_d.lib;lib_acl_cpp_d.lib + $(ProjectName).exe false @@ -116,6 +197,39 @@ copy ..\..\..\lib_acl_cpp\lib_acl_cpp_d.dll .\ /Y copy ..\..\..\lib_protocol\lib_protocol_d.dll .\ /Y copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y +copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;FIBER_CPP_DLL;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + + + Windows + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl_d.lib;lib_protocol_d.lib;lib_acl_cpp_d.lib + $(ProjectName).exe + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + copy ..\..\..\lib_acl\lib_acl_d.dll .\ /Y +copy ..\..\..\lib_acl_cpp\lib_acl_cpp_d.dll .\ /Y +copy ..\..\..\lib_protocol\lib_protocol_d.dll .\ /Y +copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y @@ -150,6 +264,36 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + MultiThreadedDebug + + + Windows + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl_vc2012d.lib;lib_protocol_vc2012d.lib;lib_acl_cpp_vc2012d.lib + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + Level3 @@ -168,6 +312,7 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y true ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; libfiber.lib;libfiber_cpp.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib + $(ProjectName).exe false @@ -184,6 +329,43 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y copy ..\..\..\lib_acl_cpp\lib_acl_cpp.dll .\ /Y copy ..\..\..\lib_protocol\lib_protocol.dll .\ /Y copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y +copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;FIBER_CPP_DLL;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + + + Windows + true + true + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib + $(ProjectName).exe + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + copy ..\..\..\lib_acl\lib_acl.dll .\ /Y +copy ..\..\..\lib_acl_cpp\lib_acl_cpp.dll .\ /Y +copy ..\..\..\lib_protocol\lib_protocol.dll .\ /Y +copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y @@ -222,6 +404,40 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + MultiThreaded + + + Windows + true + true + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl_vc2012.lib;lib_protocol_vc2012.lib;lib_acl_cpp_vc2012.lib + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + @@ -243,9 +459,13 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y Create + Create Create + Create Create + Create Create + Create @@ -267,4 +487,4 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y - + \ No newline at end of file diff --git a/lib_fiber/samples/WinEchod/WinEchod_vc2013.vcxproj b/lib_fiber/samples/WinEchod/WinEchod_vc2013.vcxproj index da89853cb..7fd8fabd4 100644 --- a/lib_fiber/samples/WinEchod/WinEchod_vc2013.vcxproj +++ b/lib_fiber/samples/WinEchod/WinEchod_vc2013.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 + v120 + Unicode + Dynamic + Application true @@ -39,6 +62,13 @@ Unicode Static + + Application + true + v120 + Unicode + Static + Application false @@ -47,6 +77,14 @@ Unicode Dynamic + + Application + false + v120 + true + Unicode + Dynamic + Application false @@ -55,38 +93,70 @@ Unicode Static + + Application + false + v120 + true + Unicode + Static + + + + + + + + + + + + + true .\ + + true + true .\ + + true + false .\ + + false + false .\ + + false + Use @@ -117,6 +187,38 @@ copy ..\..\..\lib_acl_cpp\lib_acl_cpp_d.dll .\ /Y copy ..\..\..\lib_protocol\lib_protocol_d.dll .\ /Y copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y +copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;FIBER_CPP_DLL;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + + + Windows + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl_d.lib;lib_protocol_d.lib;lib_acl_cpp_d.lib + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + copy ..\..\..\lib_acl\lib_acl_d.dll .\ /Y +copy ..\..\..\lib_acl_cpp\lib_acl_cpp_d.dll .\ /Y +copy ..\..\..\lib_protocol\lib_protocol_d.dll .\ /Y +copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y @@ -151,6 +253,36 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + MultiThreadedDebug + + + Windows + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl_vc2013d.lib;lib_protocol_vc2013d.lib;lib_acl_cpp_vc2013d.lib + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + Level3 @@ -185,6 +317,42 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y copy ..\..\..\lib_acl_cpp\lib_acl_cpp.dll .\ /Y copy ..\..\..\lib_protocol\lib_protocol.dll .\ /Y copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y +copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;FIBER_CPP_DLL;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + + + Windows + true + true + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + copy ..\..\..\lib_acl\lib_acl.dll .\ /Y +copy ..\..\..\lib_acl_cpp\lib_acl_cpp.dll .\ /Y +copy ..\..\..\lib_protocol\lib_protocol.dll .\ /Y +copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y @@ -223,6 +391,40 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include + MultiThreaded + + + Windows + true + true + true + ..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp; + libfiber.lib;libfiber_cpp.lib;lib_acl_vc2013.lib;lib_protocol_vc2013.lib;lib_acl_cpp_vc2013.lib + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + @@ -244,9 +446,13 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y Create + Create Create + Create Create + Create Create + Create @@ -268,4 +474,4 @@ copy ..\..\..\lib_fiber\cpp\libfiber_cpp.dll .\ /Y - + \ No newline at end of file diff --git a/lib_fiber/samples/fiber/fiber_vc2013.vcxproj b/lib_fiber/samples/fiber/fiber_vc2013.vcxproj index a24b5ec96..79f6c9130 100644 --- a/lib_fiber/samples/fiber/fiber_vc2013.vcxproj +++ b/lib_fiber/samples/fiber/fiber_vc2013.vcxproj @@ -5,18 +5,34 @@ DebugDll Win32 + + DebugDll + x64 + Debug Win32 + + Debug + x64 + ReleaseDll Win32 + + ReleaseDll + x64 + Release Win32 + + Release + x64 + {6265F6E1-CF6D-4C22-8F91-95921659C146} @@ -31,18 +47,36 @@ v120 Unicode + + Application + true + v120 + Unicode + Application true v120 Unicode + + Application + true + v120 + Unicode + Application true v120 Unicode + + Application + true + v120 + Unicode + Application false @@ -50,37 +84,68 @@ true Unicode + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + true + + true + true .\ + + true + true .\ + + true + false .\ + + false + NotUsing @@ -98,6 +163,23 @@ lib_acl_vc2013d.lib;libfiber.lib;%(AdditionalDependencies) + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + ..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories) + lib_acl_vc2013d.lib;libfiber.lib;%(AdditionalDependencies) + + NotUsing @@ -116,6 +198,27 @@ copy ..\..\..\lib_acl\lib_acl_d.dll .\ /Y +copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;ACL_DLL;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + Console + true + ..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories) + lib_acl_d.lib;libfiber.lib;%(AdditionalDependencies) + + + copy ..\..\..\lib_acl\lib_acl_d.dll .\ /Y copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y @@ -137,6 +240,27 @@ copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y copy ..\..\..\lib_acl\lib_acl.dll .\ /Y +copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y + + + + + NotUsing + Level3 + Disabled + WIN32;NDEBUG;_CONSOLE;_LIB;ACL_DLL;FIBER_DLL;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + Console + true + ..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories) + lib_acl.lib;libfiber.lib;%(AdditionalDependencies) + + + copy ..\..\..\lib_acl\lib_acl.dll .\ /Y copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y @@ -161,6 +285,27 @@ copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y ..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories) + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + ..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + lib_acl_vc2013.lib;libfiber.lib;%(AdditionalDependencies) + ..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories) + + @@ -170,4 +315,4 @@ copy ..\..\..\lib_fiber\c\libfiber.dll .\ /Y - + \ No newline at end of file