building fiber lib and samples are all ok by vc2012 and vc2013

This commit is contained in:
zsxxsz 2018-01-13 23:24:45 +08:00
parent a3870339ac
commit c2a2d1b579
15 changed files with 708 additions and 192 deletions

View File

@ -3556,8 +3556,8 @@ Global
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Debug|Win32.ActiveCfg = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Debug|Win32.Build.0 = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Debug|x64.ActiveCfg = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|Mixed Platforms.ActiveCfg = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|Mixed Platforms.Build.0 = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|Win32.ActiveCfg = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|Win32.Build.0 = Debug|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.DebugDll|x64.ActiveCfg = Debug|Win32
@ -3566,41 +3566,41 @@ Global
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Release|Win32.ActiveCfg = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Release|Win32.Build.0 = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Release|x64.ActiveCfg = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|Mixed Platforms.ActiveCfg = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|Mixed Platforms.Build.0 = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|Win32.ActiveCfg = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|Win32.Build.0 = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Releasedll|x64.ActiveCfg = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|Mixed Platforms.ActiveCfg = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|Mixed Platforms.Build.0 = Release|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|Mixed Platforms.Build.0 = ReleaseDll|Win32
{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 = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.ActiveCfg = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.Build.0 = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Win32.ActiveCfg = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Win32.Build.0 = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|x64.ActiveCfg = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.ActiveCfg = DebugDll|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.Build.0 = DebugDll|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 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Win32.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Win32.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|x64.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|x64.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.ActiveCfg = ReleaseDll|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.Build.0 = ReleaseDll|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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -17,14 +17,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{C65ABD0D-658
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F3FA3285-72DD-49F2-82EF-8CA03CE20792}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_fiber", "lib_fiber\c\lib_fiber_vc2013.vcxproj", "{AD99B75A-40BF-46DC-844B-23417FDC8690}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_fiber_cpp", "lib_fiber\cpp\lib_fiber_cpp_vc2013.vcxproj", "{F2479E2C-7267-436C-A1F1-A63B39E7CB30}"
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}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEchod", "lib_fiber\samples\WinEchod\WinEchod_vc2013.vcxproj", "{F74A61AD-A309-47A5-A7C6-BAC888660BBC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_fiber_cpp", "lib_fiber\cpp\lib_fiber_cpp_vc2013.vcxproj", "{F2479E2C-7267-436C-A1F1-A63B39E7CB30}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_fiber", "lib_fiber\c\lib_fiber_vc2013.vcxproj", "{AD99B75A-40BF-46DC-844B-23417FDC8690}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Mixed Platforms = Debug|Mixed Platforms
@ -36,9 +38,9 @@ Global
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
Release|x64 = Release|x64
Releasedll|Mixed Platforms = Releasedll|Mixed Platforms
Releasedll|Win32 = Releasedll|Win32
Releasedll|x64 = Releasedll|x64
ReleaseDll|Mixed Platforms = ReleaseDll|Mixed Platforms
ReleaseDll|Win32 = ReleaseDll|Win32
ReleaseDll|x64 = ReleaseDll|x64
Template|Mixed Platforms = Template|Mixed Platforms
Template|Win32 = Template|Win32
Template|x64 = Template|x64
@ -59,11 +61,11 @@ Global
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Release|Win32.ActiveCfg = Release|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Release|Win32.Build.0 = Release|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Release|x64.ActiveCfg = Release|x64
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Template|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Template|Mixed Platforms.Build.0 = ReleaseDll|Win32
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B}.Template|Win32.ActiveCfg = Release|Win32
@ -84,11 +86,11 @@ Global
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Release|Win32.ActiveCfg = Release|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Release|Win32.Build.0 = Release|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Release|x64.ActiveCfg = Release|x64
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Template|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Template|Mixed Platforms.Build.0 = ReleaseDll|Win32
{FE724EF7-3763-4E78-BDF5-BCBC075719FD}.Template|Win32.ActiveCfg = Release|Win32
@ -109,73 +111,23 @@ Global
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Release|Win32.ActiveCfg = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Release|Win32.Build.0 = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Release|x64.ActiveCfg = Release|x64
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Releasedll|Mixed Platforms.ActiveCfg = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Releasedll|Mixed Platforms.Build.0 = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Releasedll|Win32.ActiveCfg = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Releasedll|Win32.Build.0 = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Releasedll|x64.ActiveCfg = Releasedll|x64
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|Mixed Platforms.ActiveCfg = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|Mixed Platforms.Build.0 = Releasedll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|Win32.ActiveCfg = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|Win32.Build.0 = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.ReleaseDll|x64.ActiveCfg = ReleaseDll|x64
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|Mixed Platforms.Build.0 = ReleaseDll|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|Win32.ActiveCfg = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|Win32.Build.0 = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|x64.ActiveCfg = Releasedll|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{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}.DebugDll|Mixed Platforms.ActiveCfg = Debug|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Mixed Platforms.Build.0 = Debug|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Win32.ActiveCfg = Debug|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|Win32.Build.0 = Debug|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.DebugDll|x64.ActiveCfg = Debug|Win32
{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}.Releasedll|Mixed Platforms.ActiveCfg = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Releasedll|Mixed Platforms.Build.0 = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Releasedll|Win32.ActiveCfg = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Releasedll|Win32.Build.0 = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Releasedll|x64.ActiveCfg = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Mixed Platforms.ActiveCfg = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Mixed Platforms.Build.0 = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Win32.ActiveCfg = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Win32.Build.0 = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|x64.ActiveCfg = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{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}.DebugDll|Mixed Platforms.ActiveCfg = Debug|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Mixed Platforms.Build.0 = Debug|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Win32.ActiveCfg = Debug|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Win32.Build.0 = Debug|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|x64.ActiveCfg = Debug|Win32
{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}.Releasedll|Mixed Platforms.ActiveCfg = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Releasedll|Mixed Platforms.Build.0 = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Releasedll|Win32.ActiveCfg = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Releasedll|Win32.Build.0 = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Releasedll|x64.ActiveCfg = Release|Win32
{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
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|Win32.Build.0 = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|x64.ActiveCfg = Release|Win32
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}.Template|x64.ActiveCfg = ReleaseDll|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{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}.DebugDll|Mixed Platforms.ActiveCfg = Debug|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|Mixed Platforms.Build.0 = Debug|Win32
{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 = Debug|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|Win32.Build.0 = Debug|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.DebugDll|x64.ActiveCfg = Debug|Win32
@ -184,16 +136,91 @@ Global
{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}.Releasedll|Mixed Platforms.ActiveCfg = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.Releasedll|Mixed Platforms.Build.0 = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.Releasedll|Win32.ActiveCfg = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.Releasedll|Win32.Build.0 = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.Releasedll|x64.ActiveCfg = Release|Win32
{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 = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|Win32.Build.0 = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.ReleaseDll|x64.ActiveCfg = Release|Win32
{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
{6265F6E1-CF6D-4C22-8F91-95921659C146}.Template|Win32.Build.0 = Release|Win32
{6265F6E1-CF6D-4C22-8F91-95921659C146}.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 = Debug|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 = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Win32.Build.0 = Debug|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|x64.ActiveCfg = Debug|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 = Release|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 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|Win32.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.ReleaseDll|x64.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Mixed Platforms.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.ActiveCfg = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|Win32.Build.0 = Release|Win32
{F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Template|x64.ActiveCfg = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{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}.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 = Debug|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|Win32.Build.0 = Debug|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.DebugDll|x64.ActiveCfg = Debug|Win32
{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}.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 = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|Win32.Build.0 = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.ReleaseDll|x64.ActiveCfg = Release|Win32
{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
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|Win32.Build.0 = Release|Win32
{F2479E2C-7267-436C-A1F1-A63B39E7CB30}.Template|x64.ActiveCfg = Release|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{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}.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}.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}.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}.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
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|Win32.Build.0 = DebugDll|Win32
{AD99B75A-40BF-46DC-844B-23417FDC8690}.Template|x64.ActiveCfg = DebugDll|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -201,5 +228,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{BF81B2CD-2948-4EB9-925F-764AE0EB9BF9} = {F3FA3285-72DD-49F2-82EF-8CA03CE20792}
{6265F6E1-CF6D-4C22-8F91-95921659C146} = {BF81B2CD-2948-4EB9-925F-764AE0EB9BF9}
{F74A61AD-A309-47A5-A7C6-BAC888660BBC} = {BF81B2CD-2948-4EB9-925F-764AE0EB9BF9}
EndGlobalSection
EndGlobal

View File

@ -42,14 +42,14 @@
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugDll1|Win32'">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@ -82,6 +82,12 @@
<TargetExt>.dll</TargetExt>
<TargetName>$(ProjectName).dll</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -124,8 +130,10 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -141,14 +149,16 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIBMT;_CRT_SECURE_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

View File

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDll|Win32">
<Configuration>DebugDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|Win32">
<Configuration>ReleaseDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -23,12 +31,25 @@
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -36,13 +57,28 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -58,6 +94,22 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -65,8 +117,10 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -75,6 +129,25 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FIBER_DLL;FIBER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.\src;.\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>wsock32.lib;ws2_32.lib;IPHlpApi.Lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
@ -86,6 +159,7 @@
<ClInclude Include="src\common\atomic.h" />
<ClInclude Include="src\common\fifo.h" />
<ClInclude Include="src\common\gettimeofday.h" />
<ClInclude Include="src\common\htable.h" />
<ClInclude Include="src\common\init.h" />
<ClInclude Include="src\common\iostuff.h" />
<ClInclude Include="src\common\iterator.h" />
@ -93,6 +167,7 @@
<ClInclude Include="src\common\msg.h" />
<ClInclude Include="src\common\pthread_patch.h" />
<ClInclude Include="src\common\ring.h" />
<ClInclude Include="src\common\sane_socket.h" />
<ClInclude Include="src\common\strops.h" />
<ClInclude Include="src\define.h" />
<ClInclude Include="src\dns\dns.h" />
@ -118,6 +193,7 @@
<ClCompile Include="src\common\doze.c" />
<ClCompile Include="src\common\fifo.c" />
<ClCompile Include="src\common\gettimeofday.c" />
<ClCompile Include="src\common\htable.c" />
<ClCompile Include="src\common\init.c" />
<ClCompile Include="src\common\memory.c" />
<ClCompile Include="src\common\msg.c" />
@ -125,6 +201,7 @@
<ClCompile Include="src\common\open_limit.c" />
<ClCompile Include="src\common\pthread_patch.c" />
<ClCompile Include="src\common\ring.c" />
<ClCompile Include="src\common\sane_socket.c" />
<ClCompile Include="src\common\socketpair.c" />
<ClCompile Include="src\common\strops.c" />
<ClCompile Include="src\common\tcp_nodelay.c" />
@ -155,7 +232,9 @@
<ClCompile Include="src\hook\socket.c" />
<ClCompile Include="src\stdafx.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View File

@ -120,6 +120,12 @@
<ClInclude Include="src\event\event_wmsg.h">
<Filter>源文件\event</Filter>
</ClInclude>
<ClInclude Include="src\common\htable.h">
<Filter>源文件\common</Filter>
</ClInclude>
<ClInclude Include="src\common\sane_socket.h">
<Filter>源文件\common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\stdafx.c">
@ -254,5 +260,11 @@
<ClCompile Include="src\event\event_wmsg.c">
<Filter>源文件\event</Filter>
</ClCompile>
<ClCompile Include="src\common\htable.c">
<Filter>源文件\common</Filter>
</ClCompile>
<ClCompile Include="src\common\sane_socket.c">
<Filter>源文件\common</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -42,14 +42,14 @@
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -73,6 +73,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -116,6 +122,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>stdafx.hpp</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -131,14 +140,18 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>stdafx.hpp</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_protocol_d.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

View File

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDll|Win32">
<Configuration>DebugDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|Win32">
<Configuration>ReleaseDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -23,12 +31,25 @@
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -36,11 +57,28 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -57,6 +95,24 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderFile>stdafx.hpp</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>lib_protocol_d.lib;lib_acl_d.lib;lib_acl_cpp_d.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -66,6 +122,9 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeaderFile>stdafx.hpp</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -74,6 +133,27 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_MT;FIBER_CPP_DLL;FIBER_CPP_EXPORTS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_acl_cpp\include;..\c\include;.\src;.\include;..\..\lib_acl\src\master</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>stdafx.hpp</PrecompiledHeaderFile>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\lib_acl;..\..\lib_protocol;..\..\lib_acl_cpp;..\..\lib_fiber\c</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_acl_cpp.lib;lib_protocol.lib;lib_acl.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
@ -91,7 +171,9 @@
<ClCompile Include="src\master_fiber.cpp" />
<ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View File

@ -1,9 +1,8 @@
#include "stdafx.h"
#include "FiberConnect.h"
CFiberConnect::CFiberConnect(const char* serverIP, int serverPort, UINT count)
: m_serverIP(serverIP)
, m_serverPort(serverPort)
CFiberConnect::CFiberConnect(const char* serverAddr, int count)
: m_serverAddr(serverAddr)
, m_count(count)
, m_sock(INVALID_SOCKET)
{
@ -17,17 +16,24 @@ CFiberConnect::~CFiberConnect(void)
void CFiberConnect::run(void)
{
acl::string serverAddr(m_serverAddr);
char *addr = serverAddr.c_str();
char *port_s = strchr(addr, ':');
ASSERT(port_s && *(port_s + 1));
*port_s++ = 0;
struct sockaddr_in sa;
int len = sizeof(sa);
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
sa.sin_port = htons(m_serverPort);
sa.sin_addr.s_addr = inet_addr(m_serverIP.GetString());
sa.sin_port = htons(atoi(port_s));
sa.sin_addr.s_addr = inet_addr(addr);
m_sock = acl_fiber_socket(AF_INET, SOCK_STREAM, 0);
if (acl_fiber_connect(m_sock, (const struct sockaddr*) &sa, len) < 0)
printf("connect %s:%d error %s\r\n", m_serverIP.GetString(),
m_serverPort, acl::last_serror());
printf("connect %s error %s\r\n", m_serverAddr.c_str(),
acl::last_serror());
else
doEcho();
delete this;
@ -38,7 +44,7 @@ void CFiberConnect::doEcho(void)
char buf[1024];
const char* s = "hello world\r\n";
for (UINT i = 0; i < m_count; i++)
for (int i = 0; i < m_count; i++)
{
if (acl_fiber_send(m_sock, s, strlen(s), 0) < 0)
{

View File

@ -2,7 +2,7 @@
class CFiberConnect : public acl::fiber
{
public:
CFiberConnect(const char* serverIP, int serverPort, UINT count);
CFiberConnect(const char* serverAddr, int count);
private:
~CFiberConnect(void);
@ -11,9 +11,8 @@ private:
void run(void);
private:
CString m_serverIP;
int m_serverPort;
UINT m_count;
acl::string m_serverAddr;
int m_count;
socket_t m_sock;
void doEcho(void);

View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugDll|Win32">
<Configuration>DebugDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|Win32">
<Configuration>ReleaseDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F74A61AD-A309-47A5-A7C6-BAC888660BBC}</ProjectGuid>
@ -16,11 +24,26 @@
<Keyword>MFCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@ -28,27 +51,42 @@
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@ -81,21 +119,55 @@ copy ..\..\..\lib_fiber\c\lib_fiber.dll .\ /Y
copy ..\..\..\lib_fiber\cpp\lib_fiber_cpp.dll .\ /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp;</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_fiber.lib;lib_fiber_cpp.lib;lib_acl_vc2012d.lib;lib_protocol_vc2012d.lib;lib_acl_cpp_vc2012d.lib</AdditionalDependencies>
</Link>
<Midl>
<MkTypLibCompatible>false</MkTypLibCompatible>
<ValidateAllParameters>true</ValidateAllParameters>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</Midl>
<ResourceCompile>
<Culture>0x0804</Culture>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;ACL_DLL;ACL_CPP_DLL;FIBER_DLL;FIBER_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp;</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_fiber.lib;lib_fiber_cpp.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib</AdditionalDependencies>
</Link>
<Midl>
<MkTypLibCompatible>false</MkTypLibCompatible>
@ -107,6 +179,48 @@ copy ..\..\..\lib_fiber\cpp\lib_fiber_cpp.dll .\ /Y</Command>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PostBuildEvent>
<Command>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\lib_fiber.dll .\ /Y
copy ..\..\..\lib_fiber\cpp\lib_fiber_cpp.dll .\ /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\..\..\lib_fiber\cpp\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\..\lib_acl;..\..\..\lib_acl_cpp;..\..\..\lib_protocol\;..\..\..\lib_fiber\c;..\..\..\lib_fiber\cpp;</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_fiber.lib;lib_fiber_cpp.lib;lib_acl_vc2012.lib;lib_protocol_vc2012.lib;lib_acl_cpp_vc2012.lib</AdditionalDependencies>
</Link>
<Midl>
<MkTypLibCompatible>false</MkTypLibCompatible>
<ValidateAllParameters>true</ValidateAllParameters>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</Midl>
<ResourceCompile>
<Culture>0x0804</Culture>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
@ -128,7 +242,9 @@ copy ..\..\..\lib_fiber\cpp\lib_fiber_cpp.dll .\ /Y</Command>
<ClCompile Include="FiberListener.cpp" />
<ClCompile Include="FiberSleep.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="WinEchod.cpp" />

View File

@ -1,4 +1,4 @@
// WinEchodDlg.cpp : 实现文件
// WinEchodDlg.cpp : 实现文件
//
#include "stdafx.h"
@ -14,20 +14,20 @@
#endif
// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
// 用于应用程序“关于”菜单项的 CAboutDlg 对话框
class CAboutDlg : public CDialogEx
{
public:
CAboutDlg();
// 对话框数据
// 对话框数据
enum { IDD = IDD_ABOUTBOX };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持
// 实现
// 实现
protected:
DECLARE_MESSAGE_MAP()
};
@ -45,7 +45,7 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialogEx)
END_MESSAGE_MAP()
// CWinEchodDlg 对话框
// CWinEchodDlg 对话框
CWinEchodDlg::CWinEchodDlg(CWnd* pParent /*=NULL*/)
@ -53,6 +53,7 @@ CWinEchodDlg::CWinEchodDlg(CWnd* pParent /*=NULL*/)
, m_dosFp(NULL)
, m_listenPort(9001)
, m_listenIP(_T("127.0.0.1"))
, m_listenAddr("127.0.0.1:9001")
, m_fiberListen(NULL)
, m_cocurrent(1)
, m_count(100)
@ -96,15 +97,15 @@ BEGIN_MESSAGE_MAP(CWinEchodDlg, CDialogEx)
END_MESSAGE_MAP()
// CWinEchodDlg 消息处理程序
// CWinEchodDlg 消息处理程序
BOOL CWinEchodDlg::OnInitDialog()
{
CDialogEx::OnInitDialog();
// 将“关于...”菜单项添加到系统菜单中。
// 将“关于...”菜单项添加到系统菜单中。
// IDM_ABOUTBOX 必须在系统命令范围内。
// IDM_ABOUTBOX 必须在系统命令范围内。
ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX);
ASSERT(IDM_ABOUTBOX < 0xF000);
@ -122,17 +123,17 @@ BOOL CWinEchodDlg::OnInitDialog()
}
}
// 设置此对话框的图标。当应用程序主窗口不是对话框时,框架将自动
// 执行此操作
SetIcon(m_hIcon, TRUE); // 设置大图标
SetIcon(m_hIcon, FALSE); // 设置小图标
// 设置此对话框的图标。当应用程序主窗口不是对话框时,框架将自动
// 执行此操作
SetIcon(m_hIcon, TRUE); // 设置大图标
SetIcon(m_hIcon, FALSE); // 设置小图标
//ShowWindow(SW_MAXIMIZE);
// TODO: 在此添加额外的初始化代码
// TODO: 在此添加额外的初始化代码
GetDlgItem(IDC_START_SCHEDULE)->EnableWindow(TRUE);
GetDlgItem(IDC_STOP_SCHEDULE)->EnableWindow(FALSE);
return TRUE; // 除非将焦点设置到控件,否则返回 TRUE
return TRUE; // 除非将焦点设置到控件,否则返回 TRUE
}
void CWinEchodDlg::OnSysCommand(UINT nID, LPARAM lParam)
@ -148,19 +149,19 @@ void CWinEchodDlg::OnSysCommand(UINT nID, LPARAM lParam)
}
}
// 如果向对话框添加最小化按钮,则需要下面的代码
// 来绘制该图标。对于使用文档/视图模型的 MFC 应用程序,
// 这将由框架自动完成。
// 如果向对话框添加最小化按钮,则需要下面的代码
// 来绘制该图标。对于使用文档/视图模型的 MFC 应用程序,
// 这将由框架自动完成。
void CWinEchodDlg::OnPaint()
{
if (IsIconic())
{
CPaintDC dc(this); // 用于绘制的设备上下文
CPaintDC dc(this); // 用于绘制的设备上下文
SendMessage(WM_ICONERASEBKGND, reinterpret_cast<WPARAM>(dc.GetSafeHdc()), 0);
// 使图标在工作区矩形中居中
// 使图标在工作区矩形中居中
int cxIcon = GetSystemMetrics(SM_CXICON);
int cyIcon = GetSystemMetrics(SM_CYICON);
CRect rect;
@ -168,7 +169,7 @@ void CWinEchodDlg::OnPaint()
int x = (rect.Width() - cxIcon + 1) / 2;
int y = (rect.Height() - cyIcon + 1) / 2;
// 绘制图标
// 绘制图标
dc.DrawIcon(x, y, m_hIcon);
}
else
@ -177,8 +178,8 @@ void CWinEchodDlg::OnPaint()
}
}
//当用户拖动最小化窗口时系统调用此函数取得光标
//显示。
//当用户拖动最小化窗口时系统调用此函数取得光标
//显示。
HCURSOR CWinEchodDlg::OnQueryDragIcon()
{
return static_cast<HCURSOR>(m_hIcon);
@ -186,7 +187,7 @@ HCURSOR CWinEchodDlg::OnQueryDragIcon()
void CWinEchodDlg::OnBnClickedOpenDos()
{
// TODO: 在此添加控件通知处理程序代码
// TODO: 在此添加控件通知处理程序代码
if (m_dosFp == NULL)
{
//GetDlgItem(IDC_OPEN_DOS)->EnableWindow(FALSE);
@ -195,21 +196,23 @@ void CWinEchodDlg::OnBnClickedOpenDos()
m_dosFp = freopen("CONOUT$","w+t",stdout);
printf("DOS opened now, listen=%s:%d\r\n",
m_listenIP.GetString(), m_listenPort);
GetDlgItem(IDC_OPEN_DOS)->SetWindowText("关闭 DOS 窗口");
CString info("关闭 DOS 窗口 ");
GetDlgItem(IDC_OPEN_DOS)->SetWindowText(info);
}
else
{
fclose(m_dosFp);
m_dosFp = NULL;
FreeConsole();
GetDlgItem(IDC_OPEN_DOS)->SetWindowText("打开 DOS 窗口");
CString info("打开 DOS 窗口");
GetDlgItem(IDC_OPEN_DOS)->SetWindowText(info);
}
}
void CWinEchodDlg::OnBnClickedListen()
{
// TODO: 在此添加控件通知处理程序代码
// TODO: 在此添加控件通知处理程序代码
if (m_fiberListen)
{
GetDlgItem(IDC_LISTEN)->EnableWindow(FALSE);
@ -219,21 +222,21 @@ void CWinEchodDlg::OnBnClickedListen()
printf("listening socket was closed\r\n");
m_fiberListen = NULL;
printf("fiber schedule stopped!\r\n");
GetDlgItem(IDC_LISTEN)->SetWindowText("监听");
CString info("开始监听");
GetDlgItem(IDC_LISTEN)->SetWindowText(info);
GetDlgItem(IDC_LISTEN)->EnableWindow(TRUE);
}
else
{
CString addr;
addr.Format("%s:%d", m_listenIP.GetString(), m_listenPort);
if (m_listen.open(addr) == false)
if (m_listen.open(m_listenAddr) == false)
{
printf("listen %s error %s\r\n", addr.GetString());
printf("listen %s error %s\r\n", m_listenAddr.c_str());
return;
}
GetDlgItem(IDC_LISTEN)->SetWindowText("停止");
CString info("停止监听");
GetDlgItem(IDC_LISTEN)->SetWindowText(info);
printf("listen %s ok\r\n", addr.GetString());
printf("listen %s ok\r\n", m_listenAddr.c_str());
m_fiberListen = new CFiberListener(m_listen);
m_fiberListen->start();
}
@ -242,7 +245,7 @@ void CWinEchodDlg::OnBnClickedListen()
void CWinEchodDlg::OnBnClickedStartSchedule()
{
// TODO: 在此添加控件通知处理程序代码
// TODO: 在此添加控件通知处理程序代码
GetDlgItem(IDC_START_SCHEDULE)->EnableWindow(FALSE);
GetDlgItem(IDC_STOP_SCHEDULE)->EnableWindow(TRUE);
@ -257,14 +260,14 @@ void CWinEchodDlg::OnBnClickedStartSchedule()
void CWinEchodDlg::OnBnClickedStopSchedule()
{
// TODO: 在此添加控件通知处理程序代码
// TODO: 在此添加控件通知处理程序代码
acl::fiber::schedule_stop();
}
void CWinEchodDlg::OnBnClickedCreateTimer()
{
// TODO: 在此添加控件通知处理程序代码
// TODO: 在此添加控件通知处理程序代码
acl::fiber* fb = new CFiberSleep;
fb->start();
}
@ -272,12 +275,11 @@ void CWinEchodDlg::OnBnClickedCreateTimer()
void CWinEchodDlg::OnBnClickedConnect()
{
// TODO: 在此添加控件通知处理程序代码
// TODO: 在此添加控件通知处理程序代码
UpdateData();
for (UINT i = 0; i < m_cocurrent; i++)
{
acl::fiber* fb = new CFiberConnect(m_listenIP.GetString(),
m_listenPort, m_count);
acl::fiber* fb = new CFiberConnect(m_listenAddr.c_str(), m_count);
fb->start();
}
}

View File

@ -34,6 +34,7 @@ private:
FILE* m_dosFp;
UINT m_listenPort;
CString m_listenIP;
acl::string m_listenAddr;
acl::server_socket m_listen;
acl::fiber* m_fiberListen;
public:

View File

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDll|Win32">
<Configuration>DebugDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|Win32">
<Configuration>ReleaseDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -23,12 +31,24 @@
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -36,6 +56,12 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@ -44,19 +70,53 @@
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\c\include; ..\..\..\lib_acl\include;..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\c;..\..\..\lib_acl;</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_fiber.lib;lib_acl_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ACL_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ACL_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\c\include; ..\..\..\lib_acl\include;..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -65,29 +125,58 @@
<AdditionalDependencies>lib_acl_d.lib;lib_fiber.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>libcmtd</IgnoreSpecificDefaultLibraries>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
</Link>
<PostBuildEvent>
<Command>copy ..\..\..\lib_acl\lib_acl_d.dll .\ /Y
copy ..\..\c\lib_fiber.dll .\ /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ACL_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\c\include; ..\..\..\lib_acl\include;..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\c;..\..\..\lib_acl;</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_acl.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
</Link>
<PostBuildEvent>
<Command>copy ..\..\..\lib_acl\lib_acl.dll .\ /Y
copy ..\..\c\lib_fiber.dll .\ /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\c\include; ..\..\..\lib_acl\include;..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>..\..\c;..\..\..\lib_acl;</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_fiber.lib;lib_acl_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

View File

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDll|Win32">
<Configuration>DebugDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|Win32">
<Configuration>ReleaseDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -23,6 +31,18 @@
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@ -36,6 +56,12 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@ -43,13 +69,21 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>.\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -64,22 +98,67 @@
<AdditionalDependencies>lib_acl_vc2013d.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;ACL_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_acl_d.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy ..\..\..\lib_acl\lib_acl_d.dll .\ /Y
copy ..\..\..\lib_fiber\c\lib_fiber.dll .\ /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;ACL_DLL;FIBER_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>lib_acl.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy ..\..\..\lib_acl\lib_acl.dll .\ /Y
copy ..\..\..\lib_fiber\c\lib_fiber.dll .\ /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\..\lib_acl\include;..\..\..\lib_fiber\c\include;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>lib_acl_vc2013.lib;lib_fiber.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\lib_acl\;..\..\..\lib_fiber\c\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>