Skip to content

Commit d6f45ef

Browse files
zhengshuxinzhengshuxin
committed
调整了代码结构，丰富了服务器框架的配置项
1 parent 929ebc1 commit d6f45ef

30 files changed

+175
-152
lines changed

‎app/wizard_demo/http_logger/Makefile‎ renamed to ‎app/http_logger/Makefile‎

File renamed without changes.

‎app/wizard_demo/http_logger/Makefile.in‎ renamed to ‎app/http_logger/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ ifneq ($(SYSPATH),)
7070
endif
7171
###########################################################
7272

73-
CFLAGS += -I../../../lib_acl/include -I../../../lib_protocol/include -I../../../lib_acl_cpp/include
73+
CFLAGS += -I../../lib_acl/include -I../../lib_protocol/include -I../../lib_acl_cpp/include
7474
EXTLIBS =
75-
LDFLAGS = -L../../../lib_acl_cpp/lib -l_acl_cpp -L../../../lib_protocol/lib -l_protocol -L../../../lib_acl/lib -l_acl \
75+
LDFLAGS = -L../../lib_acl_cpp/lib -l_acl_cpp -L../../lib_protocol/lib -l_protocol -L../../lib_acl/lib -l_acl \
7676
$(EXTLIBS) $(SYSLIB)
7777

7878
COMPILE = $(CC) $(CFLAGS)

‎app/wizard_demo/http_logger/http_logger.cf‎ renamed to ‎app/http_logger/http_logger.cf‎

File renamed without changes.

‎app/wizard_demo/http_logger/http_logger.sln‎ renamed to ‎app/http_logger/http_logger.sln‎

File renamed without changes.

‎app/wizard_demo/http_logger/http_logger.vcproj‎ renamed to ‎app/http_logger/http_logger.vcproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Tool
2020
Name="VCCLCompilerTool"
2121
Optimization="0"
22-
AdditionalIncludeDirectories="..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include"
22+
AdditionalIncludeDirectories="..\..\lib_acl_cpp\include;..\..\lib_acl\include"
2323
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;VC2003"
2424
MinimalRebuild="TRUE"
2525
BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
3535
AdditionalDependencies="lib_acl_cpp_vc2003d.lib lib_acl_vc2003d.lib lib_protocol_vc2003d.lib"
3636
OutputFile="$(OutDir)/http_logger.exe"
3737
LinkIncremental="2"
38-
AdditionalLibraryDirectories="..\..\..\dist\lib\win32"
38+
AdditionalLibraryDirectories="..\..\dist\lib\win32"
3939
GenerateDebugInformation="TRUE"
4040
ProgramDatabaseFile="$(OutDir)/http_logger.pdb"
4141
SubSystem="1"
@@ -69,7 +69,7 @@
6969
CharacterSet="2">
7070
<Tool
7171
Name="VCCLCompilerTool"
72-
AdditionalIncludeDirectories="..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include"
72+
AdditionalIncludeDirectories="..\..\lib_acl_cpp\include;..\..\lib_acl\include"
7373
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;VC2003"
7474
RuntimeLibrary="0"
7575
UsePrecompiledHeader="3"
@@ -83,7 +83,7 @@
8383
AdditionalDependencies="lib_acl_cpp_vc2003.lib lib_acl_vc2003.lib lib_protocol_vc2003.lib"
8484
OutputFile="$(OutDir)/http_logger.exe"
8585
LinkIncremental="1"
86-
AdditionalLibraryDirectories="..\..\..\dist\lib\win32"
86+
AdditionalLibraryDirectories="..\..\dist\lib\win32"
8787
GenerateDebugInformation="TRUE"
8888
SubSystem="1"
8989
OptimizeReferences="2"
@@ -118,7 +118,7 @@
118118
CharacterSet="2">
119119
<Tool
120120
Name="VCCLCompilerTool"
121-
AdditionalIncludeDirectories="..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include"
121+
AdditionalIncludeDirectories="..\..\lib_acl_cpp\include;..\..\lib_acl\include"
122122
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;VC2003;ACL_CPP_DLL"
123123
RuntimeLibrary="2"
124124
UsePrecompiledHeader="3"
@@ -132,7 +132,7 @@
132132
AdditionalDependencies="lib_acl_cpp_dll.lib lib_acl.lib lib_protocol.lib"
133133
OutputFile="$(OutDir)/http_logger.exe"
134134
LinkIncremental="1"
135-
AdditionalLibraryDirectories="..\..\..\dist\lib\win32"
135+
AdditionalLibraryDirectories="..\..\dist\lib\win32"
136136
GenerateDebugInformation="TRUE"
137137
SubSystem="1"
138138
OptimizeReferences="2"
@@ -144,9 +144,9 @@
144144
Name="VCPostBuildEventTool"/>
145145
<Tool
146146
Name="VCPreBuildEventTool"
147-
CommandLine="copy ..\..\..\dist\lib\win32\lib_acl.dll $(OutDir)\ /Y
148-
copy ..\..\..\dist\lib\win32\lib_acl_cpp_dll.dll $(OutDir)\ /Y
149-
copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir)\ /Y
147+
CommandLine="copy ..\..\dist\lib\win32\lib_acl.dll $(OutDir)\ /Y
148+
copy ..\..\dist\lib\win32\lib_acl_cpp_dll.dll $(OutDir)\ /Y
149+
copy ..\..\dist\lib\win32\lib_protocol.dll $(OutDir)\ /Y
150150
"/>
151151
<Tool
152152
Name="VCPreLinkEventTool"/>
@@ -172,7 +172,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir)\ /Y
172172
<Tool
173173
Name="VCCLCompilerTool"
174174
Optimization="0"
175-
AdditionalIncludeDirectories="..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include"
175+
AdditionalIncludeDirectories="..\..\lib_acl_cpp\include;..\..\lib_acl\include"
176176
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;VC2003;ACL_CPP_DLL"
177177
MinimalRebuild="TRUE"
178178
BasicRuntimeChecks="3"
@@ -188,7 +188,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir)\ /Y
188188
AdditionalDependencies="lib_acl_cppd_dll.lib lib_acl_d.lib lib_protocol_d.lib"
189189
OutputFile="$(OutDir)/http_logger.exe"
190190
LinkIncremental="2"
191-
AdditionalLibraryDirectories="..\..\..\dist\lib\win32"
191+
AdditionalLibraryDirectories="..\..\dist\lib\win32"
192192
GenerateDebugInformation="TRUE"
193193
ProgramDatabaseFile="$(OutDir)/http_logger.pdb"
194194
SubSystem="1"
@@ -199,9 +199,9 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir)\ /Y
199199
Name="VCPostBuildEventTool"/>
200200
<Tool
201201
Name="VCPreBuildEventTool"
202-
CommandLine="copy ..\..\..\dist\lib\win32\lib_acl_d.dll $(OutDir)\ /Y
203-
copy ..\..\..\dist\lib\win32\lib_acl_cppd_dll.dll $(OutDir)\ /Y
204-
copy ..\..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir)\ /Y
202+
CommandLine="copy ..\..\dist\lib\win32\lib_acl_d.dll $(OutDir)\ /Y
203+
copy ..\..\dist\lib\win32\lib_acl_cppd_dll.dll $(OutDir)\ /Y
204+
copy ..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir)\ /Y
205205
"/>
206206
<Tool
207207
Name="VCPreLinkEventTool"/>

‎app/wizard_demo/http_logger/http_logger_vc2012.sln‎ renamed to ‎app/http_logger/http_logger_vc2012.sln‎

File renamed without changes.

‎app/wizard_demo/http_logger/http_logger_vc2012.vcxproj‎ renamed to ‎app/http_logger/http_logger_vc2012.vcxproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8787
<ClCompile>
8888
<Optimization>Disabled</Optimization>
89-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
89+
<AdditionalIncludeDirectories>..\..\lib_acl_cpp\include;..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9090
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9191
<MinimalRebuild>true</MinimalRebuild>
9292
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
9898
<Link>
9999
<AdditionalDependencies>lib_acl_cpp_vc2012d.lib;lib_acl_vc2012d.lib;lib_protocol_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
100100
<OutputFile>$(OutDir)http_logger.exe</OutputFile>
101-
<AdditionalLibraryDirectories>..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
101+
<AdditionalLibraryDirectories>..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
102102
<GenerateDebugInformation>true</GenerateDebugInformation>
103103
<ProgramDatabaseFile>$(OutDir)http_logger.pdb</ProgramDatabaseFile>
104104
<SubSystem>Console</SubSystem>
@@ -108,7 +108,7 @@
108108
</ItemDefinitionGroup>
109109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
110110
<ClCompile>
111-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111+
<AdditionalIncludeDirectories>..\..\lib_acl_cpp\include;..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
112112
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113113
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
114114
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -118,7 +118,7 @@
118118
<Link>
119119
<AdditionalDependencies>lib_acl_cpp_vc2012.lib;lib_acl_vc2012.lib;lib_protocol_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
120120
<OutputFile>$(OutDir)http_logger.exe</OutputFile>
121-
<AdditionalLibraryDirectories>..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
121+
<AdditionalLibraryDirectories>..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
122122
<GenerateDebugInformation>true</GenerateDebugInformation>
123123
<SubSystem>Console</SubSystem>
124124
<OptimizeReferences>true</OptimizeReferences>
@@ -128,7 +128,7 @@
128128
</ItemDefinitionGroup>
129129
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
130130
<ClCompile>
131-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131+
<AdditionalIncludeDirectories>..\..\lib_acl_cpp\include;..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132132
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ACL_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133133
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
134134
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -138,23 +138,23 @@
138138
<Link>
139139
<AdditionalDependencies>lib_acl_cpp_dll.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
140140
<OutputFile>$(OutDir)http_logger.exe</OutputFile>
141-
<AdditionalLibraryDirectories>..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141+
<AdditionalLibraryDirectories>..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
142142
<GenerateDebugInformation>true</GenerateDebugInformation>
143143
<SubSystem>Console</SubSystem>
144144
<OptimizeReferences>true</OptimizeReferences>
145145
<EnableCOMDATFolding>true</EnableCOMDATFolding>
146146
<TargetMachine>MachineX86</TargetMachine>
147147
</Link>
148148
<PreBuildEvent>
149-
<Command>copy ..\..\..\dist\lib\win32\lib_acl.dll $(OutDir) /Y
150-
copy ..\..\..\dist\lib\win32\lib_acl_cpp_dll.dll $(OutDir) /Y
151-
copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
149+
<Command>copy ..\..\dist\lib\win32\lib_acl.dll $(OutDir) /Y
150+
copy ..\..\dist\lib\win32\lib_acl_cpp_dll.dll $(OutDir) /Y
151+
copy ..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
152152
</PreBuildEvent>
153153
</ItemDefinitionGroup>
154154
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
155155
<ClCompile>
156156
<Optimization>Disabled</Optimization>
157-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
157+
<AdditionalIncludeDirectories>..\..\lib_acl_cpp\include;..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158158
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ACL_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
159159
<MinimalRebuild>true</MinimalRebuild>
160160
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -166,16 +166,16 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
166166
<Link>
167167
<AdditionalDependencies>lib_acl_cppd_dll.lib;lib_acl_d.lib;lib_protocol_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
168168
<OutputFile>$(OutDir)http_logger.exe</OutputFile>
169-
<AdditionalLibraryDirectories>..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
169+
<AdditionalLibraryDirectories>..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
170170
<GenerateDebugInformation>true</GenerateDebugInformation>
171171
<ProgramDatabaseFile>$(OutDir)http_logger.pdb</ProgramDatabaseFile>
172172
<SubSystem>Console</SubSystem>
173173
<TargetMachine>MachineX86</TargetMachine>
174174
</Link>
175175
<PreBuildEvent>
176-
<Command>copy ..\..\..\dist\lib\win32\lib_acl_d.dll $(OutDir) /Y
177-
copy ..\..\..\dist\lib\win32\lib_acl_cppd_dll.dll $(OutDir) /Y
178-
copy ..\..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir) /Y</Command>
176+
<Command>copy ..\..\dist\lib\win32\lib_acl_d.dll $(OutDir) /Y
177+
copy ..\..\dist\lib\win32\lib_acl_cppd_dll.dll $(OutDir) /Y
178+
copy ..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir) /Y</Command>
179179
</PreBuildEvent>
180180
</ItemDefinitionGroup>
181181
<ItemGroup>

‎app/wizard_demo/http_logger/http_logger_vc2012.vcxproj.filters‎ renamed to ‎app/http_logger/http_logger_vc2012.vcxproj.filters‎

File renamed without changes.

‎app/wizard_demo/http_logger/logger_servlet.cpp‎ renamed to ‎app/http_logger/logger_servlet.cpp‎

File renamed without changes.

‎app/wizard_demo/http_logger/logger_servlet.h‎ renamed to ‎app/http_logger/logger_servlet.h‎

File renamed without changes.

0 commit comments

Comments
 (0)