Skip to content

Commit 0496e46

Browse files
author
郑树新
committed
compile demos on windows for x64
1 parent d2c73a1 commit 0496e46

File tree

9 files changed

+47
-45
lines changed

9 files changed

+47
-45
lines changed

‎app/gson/gson_vc2019.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
<FunctionLevelLinking>true</FunctionLevelLinking>
124124
<IntrinsicFunctions>true</IntrinsicFunctions>
125125
<SDLCheck>true</SDLCheck>
126+
<AdditionalIncludeDirectories>$(SolutionDir)lib_acl_cpp\include;$(SolutionDir)lib_acl\include;./include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126128
</ClCompile>
127129
<Link>
128130
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎app/net_tools/net_tools_vc2019.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
</ResourceCompile>
117117
<Link>
118118
<AdditionalDependencies>uxtheme.lib;Iphlpapi.lib;lib_acl.lib;lib_protocol.lib;lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
119-
<AdditionalLibraryDirectories>..\..\lib\win32;..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
119+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
120120
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
121121
<GenerateDebugInformation>true</GenerateDebugInformation>
122122
<SubSystem>Windows</SubSystem>

‎app/redis_tools/redis_builder/redis_builder_vc2019.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
</ClCompile>
181181
<Link>
182182
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
183-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
183+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
184184
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
185185
<GenerateDebugInformation>true</GenerateDebugInformation>
186186
<ProgramDatabaseFile>$(OutDir)redis_builder.pdb</ProgramDatabaseFile>
@@ -199,7 +199,7 @@
199199
</ClCompile>
200200
<Link>
201201
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
202-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
202+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
203203
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
204204
<GenerateDebugInformation>true</GenerateDebugInformation>
205205
<SubSystem>Console</SubSystem>
@@ -219,7 +219,7 @@
219219
</ClCompile>
220220
<Link>
221221
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
222-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
222+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
223223
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
224224
<GenerateDebugInformation>true</GenerateDebugInformation>
225225
<SubSystem>Console</SubSystem>
@@ -238,7 +238,7 @@
238238
</ClCompile>
239239
<Link>
240240
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
241-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
241+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
242242
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
243243
<GenerateDebugInformation>true</GenerateDebugInformation>
244244
<SubSystem>Console</SubSystem>
@@ -263,7 +263,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
263263
</ClCompile>
264264
<Link>
265265
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
266-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
266+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
267267
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
268268
<GenerateDebugInformation>true</GenerateDebugInformation>
269269
<SubSystem>Console</SubSystem>
@@ -290,7 +290,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
290290
</ClCompile>
291291
<Link>
292292
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
293-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
293+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
294294
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
295295
<GenerateDebugInformation>true</GenerateDebugInformation>
296296
<ProgramDatabaseFile>$(OutDir)redis_builder.pdb</ProgramDatabaseFile>
@@ -316,7 +316,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir) /Y</Command>
316316
</ClCompile>
317317
<Link>
318318
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;%(AdditionalDependencies)</AdditionalDependencies>
319-
<OutputFile>$(OutDir)redis_builder.exe</OutputFile>
319+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
320320
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
321321
<GenerateDebugInformation>true</GenerateDebugInformation>
322322
<ProgramDatabaseFile>$(OutDir)redis_builder.pdb</ProgramDatabaseFile>

‎app/redis_tools/redis_builder/redis_commands.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ int redis_commands::scan(const char* addr, const char* pattern,
618618
}
619619

620620
i++;
621-
n += res.size();
621+
n += (int) res.size();
622622

623623
if (display_count > 0 && n1++ < display_count) {
624624
size_t n2 = 0;
@@ -628,7 +628,7 @@ int redis_commands::scan(const char* addr, const char* pattern,
628628
if (display_count > 0 && n2 >= display_count) {
629629
break;
630630
}
631-
get((*cit).c_str(), display_count);
631+
get((*cit).c_str(), (int) display_count);
632632
n2++;
633633
}
634634
}

‎app/wizard/wizard_vc2019.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7373
<LinkIncremental>true</LinkIncremental>
74-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
74+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
7575
<IntDir>$(Platform)\$(Configuration)\</IntDir>
7676
</PropertyGroup>
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -81,7 +81,7 @@
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8383
<LinkIncremental>false</LinkIncremental>
84-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
84+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
8585
<IntDir>$(Platform)\$(Configuration)\</IntDir>
8686
</PropertyGroup>
8787
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -136,7 +136,7 @@
136136
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_protocol\include;..\..\lib_acl_cpp\include;</AdditionalIncludeDirectories>
137137
</ClCompile>
138138
<Link>
139-
<OutputFile>$(OutDir)wizard.exe</OutputFile>
139+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
140140
<GenerateDebugInformation>true</GenerateDebugInformation>
141141
<SubSystem>Console</SubSystem>
142142
<OptimizeReferences>true</OptimizeReferences>
@@ -156,7 +156,7 @@
156156
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_protocol\include;..\..\lib_acl_cpp\include;</AdditionalIncludeDirectories>
157157
</ClCompile>
158158
<Link>
159-
<OutputFile>$(OutDir)wizard.exe</OutputFile>
159+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
160160
<GenerateDebugInformation>true</GenerateDebugInformation>
161161
<SubSystem>Console</SubSystem>
162162
<OptimizeReferences>true</OptimizeReferences>

‎app/wizard_demo/dns-gate/service/dns-gate_vc2019.vcxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
</PropertyGroup>
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
121121
<LinkIncremental>true</LinkIncremental>
122-
<OutDir>.\</OutDir>
123-
<IntDir>Debug\</IntDir>
122+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
123+
<IntDir>$(Configuration)\</IntDir>
124124
</PropertyGroup>
125125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
126126
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
@@ -129,8 +129,8 @@
129129
</PropertyGroup>
130130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
131131
<LinkIncremental>false</LinkIncremental>
132-
<OutDir>.\</OutDir>
133-
<IntDir>Release\</IntDir>
132+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
133+
<IntDir>$(Configuration)\</IntDir>
134134
</PropertyGroup>
135135
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
136136
<OutDir>.\</OutDir>
@@ -139,8 +139,8 @@
139139
</PropertyGroup>
140140
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'">
141141
<LinkIncremental>false</LinkIncremental>
142-
<OutDir>.\</OutDir>
143-
<IntDir>ReleaseDll\</IntDir>
142+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
143+
<IntDir>$(Configuration)\</IntDir>
144144
</PropertyGroup>
145145
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
146146
<OutDir>.\</OutDir>
@@ -149,8 +149,8 @@
149149
</PropertyGroup>
150150
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">
151151
<LinkIncremental>true</LinkIncremental>
152-
<OutDir>.\</OutDir>
153-
<IntDir>DebugDll\</IntDir>
152+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
153+
<IntDir>$(Configuration)\</IntDir>
154154
</PropertyGroup>
155155
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
156156
<ClCompile>
@@ -178,7 +178,7 @@
178178
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
179179
<ClCompile>
180180
<Optimization>Disabled</Optimization>
181-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
181+
<AdditionalIncludeDirectories>..\..\..\..\lib_acl_cpp\include;..\..\..\..\lib_acl\include;..\..\..\..\lib_fiber\cpp\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182182
<PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183183
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
184184
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -188,7 +188,7 @@
188188
</ClCompile>
189189
<Link>
190190
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;libfiber.lib;libfiber_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
191-
<OutputFile>$(OutDir)dns-gate.exe</OutputFile>
191+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
192192
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
193193
<GenerateDebugInformation>true</GenerateDebugInformation>
194194
<ProgramDatabaseFile>$(OutDir)dns-gate.pdb</ProgramDatabaseFile>
@@ -222,7 +222,7 @@
222222
</ItemDefinitionGroup>
223223
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
224224
<ClCompile>
225-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225+
<AdditionalIncludeDirectories>..\..\..\..\lib_acl_cpp\include;..\..\..\..\lib_acl\include;..\..\..\..\lib_fiber\cpp\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226226
<PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227227
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
228228
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -231,7 +231,7 @@
231231
</ClCompile>
232232
<Link>
233233
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;libfiber.lib;libfiber_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
234-
<OutputFile>$(OutDir)dns-gate.exe</OutputFile>
234+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
235235
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
236236
<GenerateDebugInformation>true</GenerateDebugInformation>
237237
<SubSystem>Console</SubSystem>
@@ -266,7 +266,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
266266
</ItemDefinitionGroup>
267267
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'">
268268
<ClCompile>
269-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
269+
<AdditionalIncludeDirectories>..\..\..\..\lib_acl_cpp\include;..\..\..\..\lib_acl\include;..\..\..\..\lib_fiber\cpp\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
270270
<PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;ACL_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
271271
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
272272
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -275,7 +275,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol.dll $(OutDir) /Y</Command>
275275
</ClCompile>
276276
<Link>
277277
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;libfiber.lib;libfiber_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
278-
<OutputFile>$(OutDir)dns-gate.exe</OutputFile>
278+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
279279
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
280280
<GenerateDebugInformation>true</GenerateDebugInformation>
281281
<SubSystem>Console</SubSystem>
@@ -318,7 +318,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir) /Y</Command>
318318
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">
319319
<ClCompile>
320320
<Optimization>Disabled</Optimization>
321-
<AdditionalIncludeDirectories>..\..\..\lib_acl_cpp\include;..\..\..\lib_acl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
321+
<AdditionalIncludeDirectories>..\..\..\..\lib_acl_cpp\include;..\..\..\..\lib_acl\include;..\..\..\..\lib_fiber\cpp\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
322322
<PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;ACL_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
323323
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
324324
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -328,7 +328,7 @@ copy ..\..\..\dist\lib\win32\lib_protocol_d.dll $(OutDir) /Y</Command>
328328
</ClCompile>
329329
<Link>
330330
<AdditionalDependencies>lib_acl_cpp.lib;lib_acl.lib;lib_protocol.lib;libfiber.lib;libfiber_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
331-
<OutputFile>$(OutDir)dns-gate.exe</OutputFile>
331+
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
332332
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
333333
<GenerateDebugInformation>true</GenerateDebugInformation>
334334
<ProgramDatabaseFile>$(OutDir)dns-gate.pdb</ProgramDatabaseFile>

‎app/wizard_demo/httpd_proxy/http_servlet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ bool http_servlet::doConnect(request_t& req, response_t&)
153153
delete peer;
154154
return false;
155155
}
156-
printf("connect %s ok, fd=%d\r\n", host.c_str(), peer->sock_handle());
156+
printf("connect %s ok, fd=%d\r\n", host.c_str(), (int) peer->sock_handle());
157157

158158
#define USE_REFER
159159

0 commit comments

Comments
 (0)