]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/libdnet-stripped/libdnet-stripped.vcxproj b/libdnet-stripped/libdnet-stripped.vcxproj |
2 | index 1f2b760..1756c5c 100644 | |
3 | --- a/libdnet-stripped/libdnet-stripped.vcxproj | |
4 | +++ b/libdnet-stripped/libdnet-stripped.vcxproj | |
5 | @@ -5,10 +5,18 @@ | |
6 | <Configuration>Debug</Configuration> | |
7 | <Platform>Win32</Platform> | |
8 | </ProjectConfiguration> | |
9 | + <ProjectConfiguration Include="Debug|x64"> | |
10 | + <Configuration>Debug</Configuration> | |
11 | + <Platform>x64</Platform> | |
12 | + </ProjectConfiguration> | |
13 | <ProjectConfiguration Include="Release|Win32"> | |
14 | <Configuration>Release</Configuration> | |
15 | <Platform>Win32</Platform> | |
16 | </ProjectConfiguration> | |
17 | + <ProjectConfiguration Include="Release|x64"> | |
18 | + <Configuration>Release</Configuration> | |
19 | + <Platform>x64</Platform> | |
20 | + </ProjectConfiguration> | |
21 | </ItemGroup> | |
22 | <PropertyGroup Label="Globals"> | |
23 | <ProjectName>libdnet-stripped</ProjectName> | |
24 | @@ -22,11 +30,21 @@ | |
25 | <CharacterSet>MultiByte</CharacterSet> | |
26 | <PlatformToolset>v120</PlatformToolset> | |
27 | </PropertyGroup> | |
28 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
29 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
30 | + <CharacterSet>MultiByte</CharacterSet> | |
31 | + <PlatformToolset>v120</PlatformToolset> | |
32 | + </PropertyGroup> | |
33 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
34 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
35 | <CharacterSet>MultiByte</CharacterSet> | |
36 | <PlatformToolset>v120</PlatformToolset> | |
37 | </PropertyGroup> | |
38 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
39 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
40 | + <CharacterSet>MultiByte</CharacterSet> | |
41 | + <PlatformToolset>v120</PlatformToolset> | |
42 | + </PropertyGroup> | |
43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
44 | <ImportGroup Label="ExtensionSettings"> | |
45 | </ImportGroup> | |
46 | @@ -34,10 +52,18 @@ | |
47 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
48 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
49 | </ImportGroup> | |
50 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
51 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
52 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
53 | + </ImportGroup> | |
54 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
55 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
56 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
57 | </ImportGroup> | |
58 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
59 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
60 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
61 | + </ImportGroup> | |
62 | <PropertyGroup Label="UserMacros" /> | |
63 | <PropertyGroup> | |
64 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
65 | @@ -64,6 +90,23 @@ | |
66 | <OutputFile>$(OutDir)libdnet-stripped.lib</OutputFile> | |
67 | </Lib> | |
68 | </ItemDefinitionGroup> | |
69 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
70 | + <ClCompile> | |
71 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
72 | + <Optimization>Disabled</Optimization> | |
73 | + <AdditionalIncludeDirectories>include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
74 | + <PreprocessorDefinitions>WIN32;_LIB;BPF_MAJOR_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
75 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
76 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
77 | + <PrecompiledHeader> | |
78 | + </PrecompiledHeader> | |
79 | + <WarningLevel>Level3</WarningLevel> | |
80 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
81 | + </ClCompile> | |
82 | + <Lib> | |
83 | + <OutputFile>$(OutDir)libdnet-stripped.lib</OutputFile> | |
84 | + </Lib> | |
85 | + </ItemDefinitionGroup> | |
86 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
87 | <ClCompile> | |
88 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
89 | @@ -78,6 +121,20 @@ | |
90 | <OutputFile>$(OutDir)libdnet-stripped.lib</OutputFile> | |
91 | </Lib> | |
92 | </ItemDefinitionGroup> | |
93 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
94 | + <ClCompile> | |
95 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
96 | + <AdditionalIncludeDirectories>include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
97 | + <PreprocessorDefinitions>WIN32;_LIB;BPF_MAJOR_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
98 | + <PrecompiledHeader> | |
99 | + </PrecompiledHeader> | |
100 | + <WarningLevel>Level3</WarningLevel> | |
101 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
102 | + </ClCompile> | |
103 | + <Lib> | |
104 | + <OutputFile>$(OutDir)libdnet-stripped.lib</OutputFile> | |
105 | + </Lib> | |
106 | + </ItemDefinitionGroup> | |
107 | <ItemGroup> | |
108 | <ClCompile Include="src\addr-util.c" /> | |
109 | <ClCompile Include="src\addr.c" /> | |
110 | diff --git a/liblinear/liblinear.vcxproj b/liblinear/liblinear.vcxproj | |
111 | index cf99e3d..ac5ff7c 100644 | |
112 | --- a/liblinear/liblinear.vcxproj | |
113 | +++ b/liblinear/liblinear.vcxproj | |
114 | @@ -5,10 +5,18 @@ | |
115 | <Configuration>Debug</Configuration> | |
116 | <Platform>Win32</Platform> | |
117 | </ProjectConfiguration> | |
118 | + <ProjectConfiguration Include="Debug|x64"> | |
119 | + <Configuration>Debug</Configuration> | |
120 | + <Platform>x64</Platform> | |
121 | + </ProjectConfiguration> | |
122 | <ProjectConfiguration Include="Release|Win32"> | |
123 | <Configuration>Release</Configuration> | |
124 | <Platform>Win32</Platform> | |
125 | </ProjectConfiguration> | |
126 | + <ProjectConfiguration Include="Release|x64"> | |
127 | + <Configuration>Release</Configuration> | |
128 | + <Platform>x64</Platform> | |
129 | + </ProjectConfiguration> | |
130 | </ItemGroup> | |
131 | <ItemGroup> | |
132 | <ClCompile Include="blas\daxpy.c" /> | |
133 | @@ -36,6 +44,12 @@ | |
134 | <CharacterSet>Unicode</CharacterSet> | |
135 | <PlatformToolset>v120</PlatformToolset> | |
136 | </PropertyGroup> | |
137 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
138 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
139 | + <UseDebugLibraries>true</UseDebugLibraries> | |
140 | + <CharacterSet>Unicode</CharacterSet> | |
141 | + <PlatformToolset>v120</PlatformToolset> | |
142 | + </PropertyGroup> | |
143 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |
144 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
145 | <UseDebugLibraries>false</UseDebugLibraries> | |
146 | @@ -43,19 +57,33 @@ | |
147 | <CharacterSet>Unicode</CharacterSet> | |
148 | <PlatformToolset>v120</PlatformToolset> | |
149 | </PropertyGroup> | |
150 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
151 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
152 | + <UseDebugLibraries>false</UseDebugLibraries> | |
153 | + <WholeProgramOptimization>true</WholeProgramOptimization> | |
154 | + <CharacterSet>Unicode</CharacterSet> | |
155 | + <PlatformToolset>v120</PlatformToolset> | |
156 | + </PropertyGroup> | |
157 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
158 | <ImportGroup Label="ExtensionSettings"> | |
159 | </ImportGroup> | |
160 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |
161 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
162 | </ImportGroup> | |
163 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
164 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
165 | + </ImportGroup> | |
166 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
167 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
168 | </ImportGroup> | |
169 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
170 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
171 | + </ImportGroup> | |
172 | <PropertyGroup Label="UserMacros" /> | |
173 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |
174 | <OutDir>.\</OutDir> | |
175 | </PropertyGroup> | |
176 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | |
177 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
178 | <OutDir>.\</OutDir> | |
179 | </PropertyGroup> | |
180 | @@ -75,6 +103,21 @@ | |
181 | <GenerateDebugInformation>true</GenerateDebugInformation> | |
182 | </Link> | |
183 | </ItemDefinitionGroup> | |
184 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
185 | + <ClCompile> | |
186 | + <PrecompiledHeader> | |
187 | + </PrecompiledHeader> | |
188 | + <WarningLevel>Level3</WarningLevel> | |
189 | + <Optimization>Disabled</Optimization> | |
190 | + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
191 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
192 | + <AdditionalOptions> /D_CRT_SECURE_NO_WARNINGS=1 %(AdditionalOptions)</AdditionalOptions> | |
193 | + </ClCompile> | |
194 | + <Link> | |
195 | + <SubSystem>Windows</SubSystem> | |
196 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
197 | + </Link> | |
198 | + </ItemDefinitionGroup> | |
199 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
200 | <ClCompile> | |
201 | <WarningLevel>Level3</WarningLevel> | |
202 | @@ -93,6 +136,24 @@ | |
203 | <OptimizeReferences>true</OptimizeReferences> | |
204 | </Link> | |
205 | </ItemDefinitionGroup> | |
206 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
207 | + <ClCompile> | |
208 | + <WarningLevel>Level3</WarningLevel> | |
209 | + <PrecompiledHeader> | |
210 | + </PrecompiledHeader> | |
211 | + <Optimization>MaxSpeed</Optimization> | |
212 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
213 | + <IntrinsicFunctions>true</IntrinsicFunctions> | |
214 | + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
215 | + <AdditionalOptions> /D_CRT_SECURE_NO_WARNINGS=1 %(AdditionalOptions)</AdditionalOptions> | |
216 | + </ClCompile> | |
217 | + <Link> | |
218 | + <SubSystem>Windows</SubSystem> | |
219 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
220 | + <EnableCOMDATFolding>true</EnableCOMDATFolding> | |
221 | + <OptimizeReferences>true</OptimizeReferences> | |
222 | + </Link> | |
223 | + </ItemDefinitionGroup> | |
224 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | |
225 | <ImportGroup Label="ExtensionTargets"> | |
226 | </ImportGroup> | |
227 | diff --git a/liblua/liblua.vcxproj b/liblua/liblua.vcxproj | |
228 | index 8e80221..db6b1ea 100644 | |
229 | --- a/liblua/liblua.vcxproj | |
230 | +++ b/liblua/liblua.vcxproj | |
231 | @@ -5,10 +5,18 @@ | |
232 | <Configuration>Debug</Configuration> | |
233 | <Platform>Win32</Platform> | |
234 | </ProjectConfiguration> | |
235 | + <ProjectConfiguration Include="Debug|x64"> | |
236 | + <Configuration>Debug</Configuration> | |
237 | + <Platform>x64</Platform> | |
238 | + </ProjectConfiguration> | |
239 | <ProjectConfiguration Include="Release|Win32"> | |
240 | <Configuration>Release</Configuration> | |
241 | <Platform>Win32</Platform> | |
242 | </ProjectConfiguration> | |
243 | + <ProjectConfiguration Include="Release|x64"> | |
244 | + <Configuration>Release</Configuration> | |
245 | + <Platform>x64</Platform> | |
246 | + </ProjectConfiguration> | |
247 | </ItemGroup> | |
248 | <PropertyGroup Label="Globals"> | |
249 | <ProjectGuid>{31FB0767-A71F-4575-8379-002D72B8AF86}</ProjectGuid> | |
250 | @@ -22,20 +30,37 @@ | |
251 | <WholeProgramOptimization>true</WholeProgramOptimization> | |
252 | <PlatformToolset>v120</PlatformToolset> | |
253 | </PropertyGroup> | |
254 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
255 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
256 | + <CharacterSet>NotSet</CharacterSet> | |
257 | + <WholeProgramOptimization>true</WholeProgramOptimization> | |
258 | + <PlatformToolset>v120</PlatformToolset> | |
259 | + </PropertyGroup> | |
260 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
261 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
262 | <CharacterSet>NotSet</CharacterSet> | |
263 | <PlatformToolset>v120</PlatformToolset> | |
264 | </PropertyGroup> | |
265 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
266 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
267 | + <CharacterSet>NotSet</CharacterSet> | |
268 | + <PlatformToolset>v120</PlatformToolset> | |
269 | + </PropertyGroup> | |
270 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
271 | <ImportGroup Label="ExtensionSettings"> | |
272 | </ImportGroup> | |
273 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | |
274 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
275 | </ImportGroup> | |
276 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
277 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
278 | + </ImportGroup> | |
279 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
280 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
281 | </ImportGroup> | |
282 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
283 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
284 | + </ImportGroup> | |
285 | <PropertyGroup Label="UserMacros" /> | |
286 | <PropertyGroup> | |
287 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
288 | @@ -68,6 +93,29 @@ | |
289 | <OutputFile>$(OutDir)liblua.lib</OutputFile> | |
290 | </Lib> | |
291 | </ItemDefinitionGroup> | |
292 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
293 | + <ClCompile> | |
294 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
295 | + <Optimization>Disabled</Optimization> | |
296 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
297 | + <ExceptionHandling> | |
298 | + </ExceptionHandling> | |
299 | + <BasicRuntimeChecks>Default</BasicRuntimeChecks> | |
300 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
301 | + <BufferSecurityCheck>false</BufferSecurityCheck> | |
302 | + <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> | |
303 | + <RuntimeTypeInfo>false</RuntimeTypeInfo> | |
304 | + <PrecompiledHeader> | |
305 | + </PrecompiledHeader> | |
306 | + <WarningLevel>Level3</WarningLevel> | |
307 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
308 | + <CallingConvention>Cdecl</CallingConvention> | |
309 | + <CompileAs>CompileAsC</CompileAs> | |
310 | + </ClCompile> | |
311 | + <Lib> | |
312 | + <OutputFile>$(OutDir)liblua.lib</OutputFile> | |
313 | + </Lib> | |
314 | + </ItemDefinitionGroup> | |
315 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
316 | <ClCompile> | |
317 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
318 | @@ -91,6 +139,29 @@ | |
319 | <OutputFile>$(OutDir)liblua.lib</OutputFile> | |
320 | </Lib> | |
321 | </ItemDefinitionGroup> | |
322 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
323 | + <ClCompile> | |
324 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
325 | + <WholeProgramOptimization>false</WholeProgramOptimization> | |
326 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
327 | + <MinimalRebuild>false</MinimalRebuild> | |
328 | + <ExceptionHandling> | |
329 | + </ExceptionHandling> | |
330 | + <BasicRuntimeChecks>Default</BasicRuntimeChecks> | |
331 | + <BufferSecurityCheck>false</BufferSecurityCheck> | |
332 | + <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> | |
333 | + <RuntimeTypeInfo>false</RuntimeTypeInfo> | |
334 | + <PrecompiledHeader> | |
335 | + </PrecompiledHeader> | |
336 | + <WarningLevel>Level3</WarningLevel> | |
337 | + <DebugInformationFormat> | |
338 | + </DebugInformationFormat> | |
339 | + <CompileAs>CompileAsC</CompileAs> | |
340 | + </ClCompile> | |
341 | + <Lib> | |
342 | + <OutputFile>$(OutDir)liblua.lib</OutputFile> | |
343 | + </Lib> | |
344 | + </ItemDefinitionGroup> | |
345 | <ItemGroup> | |
346 | <ClCompile Include="lapi.c" /> | |
347 | <ClCompile Include="lauxlib.c" /> | |
348 | diff --git a/libnetutil/libnetutil.vcxproj b/libnetutil/libnetutil.vcxproj | |
349 | index 8f4fbb5..00cc7c2 100644 | |
350 | --- a/libnetutil/libnetutil.vcxproj | |
351 | +++ b/libnetutil/libnetutil.vcxproj | |
352 | @@ -5,10 +5,18 @@ | |
353 | <Configuration>Debug</Configuration> | |
354 | <Platform>Win32</Platform> | |
355 | </ProjectConfiguration> | |
356 | + <ProjectConfiguration Include="Debug|x64"> | |
357 | + <Configuration>Debug</Configuration> | |
358 | + <Platform>x64</Platform> | |
359 | + </ProjectConfiguration> | |
360 | <ProjectConfiguration Include="Release|Win32"> | |
361 | <Configuration>Release</Configuration> | |
362 | <Platform>Win32</Platform> | |
363 | </ProjectConfiguration> | |
364 | + <ProjectConfiguration Include="Release|x64"> | |
365 | + <Configuration>Release</Configuration> | |
366 | + <Platform>x64</Platform> | |
367 | + </ProjectConfiguration> | |
368 | </ItemGroup> | |
369 | <PropertyGroup Label="Globals"> | |
370 | <ProjectGuid>{99157C3F-39F6-4663-99D7-1D9C1484494E}</ProjectGuid> | |
371 | @@ -22,20 +30,37 @@ | |
372 | <WholeProgramOptimization>true</WholeProgramOptimization> | |
373 | <PlatformToolset>v120</PlatformToolset> | |
374 | </PropertyGroup> | |
375 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
376 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
377 | + <CharacterSet>Unicode</CharacterSet> | |
378 | + <WholeProgramOptimization>true</WholeProgramOptimization> | |
379 | + <PlatformToolset>v120</PlatformToolset> | |
380 | + </PropertyGroup> | |
381 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
382 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
383 | <CharacterSet>Unicode</CharacterSet> | |
384 | <PlatformToolset>v120</PlatformToolset> | |
385 | </PropertyGroup> | |
386 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
387 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
388 | + <CharacterSet>Unicode</CharacterSet> | |
389 | + <PlatformToolset>v120</PlatformToolset> | |
390 | + </PropertyGroup> | |
391 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
392 | <ImportGroup Label="ExtensionSettings"> | |
393 | </ImportGroup> | |
394 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | |
395 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
396 | </ImportGroup> | |
397 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
398 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
399 | + </ImportGroup> | |
400 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
401 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
402 | </ImportGroup> | |
403 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
404 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
405 | + </ImportGroup> | |
406 | <PropertyGroup Label="UserMacros" /> | |
407 | <PropertyGroup> | |
408 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
409 | @@ -61,6 +86,22 @@ | |
410 | <OutputFile>$(OutDir)libnetutil.lib</OutputFile> | |
411 | </Lib> | |
412 | </ItemDefinitionGroup> | |
413 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
414 | + <ClCompile> | |
415 | + <Optimization>Disabled</Optimization> | |
416 | + <AdditionalIncludeDirectories>..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
417 | + <PreprocessorDefinitions>WIN32;BPF_MAJOR_VERSION;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
418 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
419 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
420 | + <PrecompiledHeader> | |
421 | + </PrecompiledHeader> | |
422 | + <WarningLevel>Level3</WarningLevel> | |
423 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
424 | + </ClCompile> | |
425 | + <Lib> | |
426 | + <OutputFile>$(OutDir)libnetutil.lib</OutputFile> | |
427 | + </Lib> | |
428 | + </ItemDefinitionGroup> | |
429 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
430 | <ClCompile> | |
431 | <Optimization>MaxSpeed</Optimization> | |
432 | @@ -74,6 +115,19 @@ | |
433 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
434 | </ClCompile> | |
435 | </ItemDefinitionGroup> | |
436 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
437 | + <ClCompile> | |
438 | + <Optimization>MaxSpeed</Optimization> | |
439 | + <IntrinsicFunctions>true</IntrinsicFunctions> | |
440 | + <AdditionalIncludeDirectories>..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
441 | + <PreprocessorDefinitions>WIN32;BPF_MAJOR_VERSION;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
442 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
443 | + <PrecompiledHeader> | |
444 | + </PrecompiledHeader> | |
445 | + <WarningLevel>Level3</WarningLevel> | |
446 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
447 | + </ClCompile> | |
448 | + </ItemDefinitionGroup> | |
449 | <ItemGroup> | |
450 | <ClCompile Include="ARPHeader.cc" /> | |
451 | <ClCompile Include="DestOptsHeader.cc" /> | |
452 | diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln | |
453 | index 3f9fa22..4484bbd 100644 | |
454 | --- a/mswin32/nmap.sln | |
455 | +++ b/mswin32/nmap.sln | |
456 | @@ -5,14 +5,11 @@ MinimumVisualStudioVersion = 10.0.40219.1 | |
457 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcxproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}" | |
458 | ProjectSection(ProjectDependencies) = postProject | |
459 | {99157C3F-39F6-4663-99D7-1D9C1484494E} = {99157C3F-39F6-4663-99D7-1D9C1484494E} | |
460 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} | |
461 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D} = {A7BE3D76-F20C-40C5-8986-DE4028B3B57D} | |
462 | EndProjectSection | |
463 | EndProject | |
464 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcxproj", "{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}" | |
465 | EndProject | |
466 | -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcxproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}" | |
467 | -EndProject | |
468 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcxproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}" | |
469 | EndProject | |
470 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdnet-stripped", "..\libdnet-stripped\libdnet-stripped.vcxproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}" | |
471 | @@ -27,14 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil | |
472 | EndProject | |
473 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinear", "..\liblinear\liblinear.vcxproj", "{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}" | |
474 | EndProject | |
475 | -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap-update", "..\nmap-update\nmap-update.vcxproj", "{BBF27339-C7B6-4F52-B742-897796C1F13B}" | |
476 | -EndProject | |
477 | -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libz", "..\libz\contrib\vstudio\vc11\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" | |
478 | -EndProject | |
479 | -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\libssh2\win32\libssh2.vcxproj", "{ED957342-E43B-496E-92D9-4C76B525BDF5}" | |
480 | -EndProject | |
481 | -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\libz\contrib\vstudio\vc11\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | |
482 | -EndProject | |
483 | Global | |
484 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | |
485 | Debug|Win32 = Debug|Win32 | |
486 | @@ -49,176 +38,148 @@ Global | |
487 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | |
488 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.ActiveCfg = Debug|Win32 | |
489 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.Build.0 = Debug|Win32 | |
490 | - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.ActiveCfg = Debug|Win32 | |
491 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.ActiveCfg = Debug|x64 | |
492 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.Build.0 = Debug|x64 | |
493 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
494 | - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
495 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.ActiveCfg = Release|x64 | |
496 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.Build.0 = Release|x64 | |
497 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32 | |
498 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32 | |
499 | - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|Win32 | |
500 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|x64 | |
501 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.Build.0 = Release|x64 | |
502 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
503 | {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
504 | - {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
505 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
506 | + {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
507 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.ActiveCfg = Debug|Win32 | |
508 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.Build.0 = Debug|Win32 | |
509 | - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.ActiveCfg = Debug|Win32 | |
510 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.ActiveCfg = Debug|x64 | |
511 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.Build.0 = Debug|x64 | |
512 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.ActiveCfg = Static|Win32 | |
513 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.Build.0 = Static|Win32 | |
514 | - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.ActiveCfg = Static|Win32 | |
515 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.ActiveCfg = Static|x64 | |
516 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.Build.0 = Static|x64 | |
517 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32 | |
518 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32 | |
519 | - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|Win32 | |
520 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|x64 | |
521 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.Build.0 = Release|x64 | |
522 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseNoPcap|Win32 | |
523 | {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseNoPcap|Win32 | |
524 | - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|Win32 | |
525 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.ActiveCfg = Debug|Win32 | |
526 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.Build.0 = Debug|Win32 | |
527 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|x64.ActiveCfg = Debug|Win32 | |
528 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
529 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
530 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32 | |
531 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32 | |
532 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|x64.ActiveCfg = Release|Win32 | |
533 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
534 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
535 | - {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
536 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|x64 | |
537 | + {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.Build.0 = ReleaseNoPcap|x64 | |
538 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.ActiveCfg = Debug|Win32 | |
539 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.Build.0 = Debug|Win32 | |
540 | - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.ActiveCfg = Debug|Win32 | |
541 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.ActiveCfg = Debug|x64 | |
542 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.Build.0 = Debug|x64 | |
543 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.ActiveCfg = Static|Win32 | |
544 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.Build.0 = Static|Win32 | |
545 | - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.ActiveCfg = Static|Win32 | |
546 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.ActiveCfg = Static|x64 | |
547 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.Build.0 = Static|x64 | |
548 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32 | |
549 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32 | |
550 | - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|Win32 | |
551 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|x64 | |
552 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.Build.0 = Release|x64 | |
553 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
554 | {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
555 | - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
556 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
557 | + {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
558 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.ActiveCfg = Debug|Win32 | |
559 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.Build.0 = Debug|Win32 | |
560 | - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.ActiveCfg = Debug|Win32 | |
561 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.ActiveCfg = Debug|x64 | |
562 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.Build.0 = Debug|x64 | |
563 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
564 | - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
565 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.ActiveCfg = Release|x64 | |
566 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.Build.0 = Release|x64 | |
567 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32 | |
568 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32 | |
569 | - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|Win32 | |
570 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|x64 | |
571 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.Build.0 = Release|x64 | |
572 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
573 | {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
574 | - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
575 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
576 | + {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
577 | {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.ActiveCfg = Debug|Win32 | |
578 | {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.Build.0 = Debug|Win32 | |
579 | - {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.ActiveCfg = Debug|Win32 | |
580 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.ActiveCfg = Debug|x64 | |
581 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.Build.0 = Debug|x64 | |
582 | {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
583 | - {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
584 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.ActiveCfg = Release|x64 | |
585 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.Build.0 = Release|x64 | |
586 | {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.ActiveCfg = Release|Win32 | |
587 | {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.Build.0 = Release|Win32 | |
588 | - {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|Win32 | |
589 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|x64 | |
590 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.Build.0 = Release|x64 | |
591 | {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
592 | {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
593 | - {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
594 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
595 | + {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
596 | {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.ActiveCfg = Debug|Win32 | |
597 | {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.Build.0 = Debug|Win32 | |
598 | - {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.ActiveCfg = Debug|Win32 | |
599 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.ActiveCfg = Debug|x64 | |
600 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.Build.0 = Debug|x64 | |
601 | {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.ActiveCfg = Static|Win32 | |
602 | {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.Build.0 = Static|Win32 | |
603 | - {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.ActiveCfg = Static|Win32 | |
604 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.ActiveCfg = Static|x64 | |
605 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.Build.0 = Static|x64 | |
606 | {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.ActiveCfg = Release|Win32 | |
607 | {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.Build.0 = Release|Win32 | |
608 | - {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|Win32 | |
609 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|x64 | |
610 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.Build.0 = Release|x64 | |
611 | {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
612 | {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
613 | - {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
614 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
615 | + {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
616 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.ActiveCfg = Debug|Win32 | |
617 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.Build.0 = Debug|Win32 | |
618 | - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.ActiveCfg = Debug|Win32 | |
619 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.ActiveCfg = Debug|x64 | |
620 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.Build.0 = Debug|x64 | |
621 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
622 | - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
623 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.ActiveCfg = Release|x64 | |
624 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.Build.0 = Release|x64 | |
625 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.ActiveCfg = Release|Win32 | |
626 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.Build.0 = Release|Win32 | |
627 | - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|Win32 | |
628 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|x64 | |
629 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.Build.0 = Release|x64 | |
630 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
631 | {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
632 | - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
633 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
634 | + {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
635 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.ActiveCfg = Debug|Win32 | |
636 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.Build.0 = Debug|Win32 | |
637 | - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.ActiveCfg = Debug|Win32 | |
638 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.ActiveCfg = Debug|x64 | |
639 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.Build.0 = Debug|x64 | |
640 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
641 | - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
642 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.ActiveCfg = Release|x64 | |
643 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.Build.0 = Release|x64 | |
644 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.ActiveCfg = Release|Win32 | |
645 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.Build.0 = Release|Win32 | |
646 | - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|Win32 | |
647 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|x64 | |
648 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.Build.0 = Release|x64 | |
649 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
650 | {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
651 | - {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
652 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
653 | + {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
654 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.ActiveCfg = Debug|Win32 | |
655 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.Build.0 = Debug|Win32 | |
656 | - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.ActiveCfg = Debug|Win32 | |
657 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.ActiveCfg = Debug|x64 | |
658 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.Build.0 = Debug|x64 | |
659 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
660 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.Build.0 = Release|Win32 | |
661 | - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
662 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.ActiveCfg = Release|x64 | |
663 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.Build.0 = Release|x64 | |
664 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.ActiveCfg = Release|Win32 | |
665 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.Build.0 = Release|Win32 | |
666 | - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|Win32 | |
667 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|x64 | |
668 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.Build.0 = Release|x64 | |
669 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
670 | {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
671 | - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
672 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.ActiveCfg = Debug|Win32 | |
673 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.Build.0 = Debug|Win32 | |
674 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|x64.ActiveCfg = Debug|Win32 | |
675 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
676 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.Build.0 = Release|Win32 | |
677 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
678 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.ActiveCfg = Release|Win32 | |
679 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.Build.0 = Release|Win32 | |
680 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|x64.ActiveCfg = Release|Win32 | |
681 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
682 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
683 | - {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
684 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 | |
685 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 | |
686 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64 | |
687 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64 | |
688 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
689 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|Win32.Build.0 = Release|Win32 | |
690 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|x64.ActiveCfg = Release|x64 | |
691 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|x64.Build.0 = Release|x64 | |
692 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 | |
693 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 | |
694 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64 | |
695 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64 | |
696 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | |
697 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 | |
698 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 | |
699 | - {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 | |
700 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|Win32.ActiveCfg = Debug|Win32 | |
701 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|Win32.Build.0 = Debug|Win32 | |
702 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|x64.ActiveCfg = Debug|Win32 | |
703 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|Win32.ActiveCfg = Debug|Win32 | |
704 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|Win32.Build.0 = Debug|Win32 | |
705 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|x64.ActiveCfg = Release|Win32 | |
706 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.ActiveCfg = Release|Win32 | |
707 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.Build.0 = Release|Win32 | |
708 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|x64.ActiveCfg = Release|Win32 | |
709 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 | |
710 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 | |
711 | - {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 | |
712 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 | |
713 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 | |
714 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64 | |
715 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64 | |
716 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|Win32.ActiveCfg = Release|Win32 | |
717 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|Win32.Build.0 = Release|Win32 | |
718 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|x64.ActiveCfg = Release|x64 | |
719 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|x64.Build.0 = Release|x64 | |
720 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 | |
721 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 | |
722 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 | |
723 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 | |
724 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | |
725 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 | |
726 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 | |
727 | - {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 | |
728 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 | |
729 | + {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 | |
730 | EndGlobalSection | |
731 | GlobalSection(SolutionProperties) = preSolution | |
732 | HideSolutionNode = FALSE | |
733 | EndGlobalSection | |
734 | + GlobalSection(ExtensibilityGlobals) = postSolution | |
735 | + SolutionGuid = {DAA6BF7B-6F78-4BE7-A3FC-3B1BD73676C3} | |
736 | + EndGlobalSection | |
737 | EndGlobal | |
738 | diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj | |
739 | index a3abbc6..d5e1977 100644 | |
740 | --- a/mswin32/nmap.vcxproj | |
741 | +++ b/mswin32/nmap.vcxproj | |
742 | @@ -5,10 +5,18 @@ | |
743 | <Configuration>Debug</Configuration> | |
744 | <Platform>Win32</Platform> | |
745 | </ProjectConfiguration> | |
746 | + <ProjectConfiguration Include="Debug|x64"> | |
747 | + <Configuration>Debug</Configuration> | |
748 | + <Platform>x64</Platform> | |
749 | + </ProjectConfiguration> | |
750 | <ProjectConfiguration Include="Release|Win32"> | |
751 | <Configuration>Release</Configuration> | |
752 | <Platform>Win32</Platform> | |
753 | </ProjectConfiguration> | |
754 | + <ProjectConfiguration Include="Release|x64"> | |
755 | + <Configuration>Release</Configuration> | |
756 | + <Platform>x64</Platform> | |
757 | + </ProjectConfiguration> | |
758 | </ItemGroup> | |
759 | <PropertyGroup Label="Globals"> | |
760 | <ProjectGuid>{361719F0-AB42-4C93-9DE8-7D2144B96625}</ProjectGuid> | |
761 | @@ -21,12 +29,24 @@ | |
762 | <CharacterSet>MultiByte</CharacterSet> | |
763 | <PlatformToolset>v120</PlatformToolset> | |
764 | </PropertyGroup> | |
765 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
766 | + <ConfigurationType>Application</ConfigurationType> | |
767 | + <UseOfMfc>false</UseOfMfc> | |
768 | + <CharacterSet>MultiByte</CharacterSet> | |
769 | + <PlatformToolset>v120</PlatformToolset> | |
770 | + </PropertyGroup> | |
771 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
772 | <ConfigurationType>Application</ConfigurationType> | |
773 | <UseOfMfc>false</UseOfMfc> | |
774 | <CharacterSet>MultiByte</CharacterSet> | |
775 | <PlatformToolset>v120</PlatformToolset> | |
776 | </PropertyGroup> | |
777 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
778 | + <ConfigurationType>Application</ConfigurationType> | |
779 | + <UseOfMfc>false</UseOfMfc> | |
780 | + <CharacterSet>MultiByte</CharacterSet> | |
781 | + <PlatformToolset>v120</PlatformToolset> | |
782 | + </PropertyGroup> | |
783 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
784 | <ImportGroup Label="ExtensionSettings"> | |
785 | </ImportGroup> | |
786 | @@ -34,10 +54,18 @@ | |
787 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
788 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
789 | </ImportGroup> | |
790 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
791 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
792 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
793 | + </ImportGroup> | |
794 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
795 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
796 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
797 | </ImportGroup> | |
798 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
799 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
800 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
801 | + </ImportGroup> | |
802 | <PropertyGroup Label="UserMacros" /> | |
803 | <PropertyGroup> | |
804 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
805 | @@ -76,7 +104,7 @@ | |
806 | <ShowIncludes>false</ShowIncludes> | |
807 | </ClCompile> | |
808 | <Link> | |
809 | - <AdditionalDependencies>liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
810 | + <AdditionalDependencies>liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
811 | <OutputFile>.\Debug\nmap.exe</OutputFile> | |
812 | <SuppressStartupBanner>true</SuppressStartupBanner> | |
813 | <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
814 | @@ -91,8 +119,57 @@ | |
815 | <TargetMachine>MachineX86</TargetMachine> | |
816 | </Link> | |
817 | <PostBuildEvent> | |
818 | - <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y | |
819 | -xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)"</Command> | |
820 | + <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y</Command> | |
821 | + </PostBuildEvent> | |
822 | + <ResourceCompile> | |
823 | + <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName> | |
824 | + </ResourceCompile> | |
825 | + </ItemDefinitionGroup> | |
826 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
827 | + <Midl> | |
828 | + <TypeLibraryName>.\Debug/nmap.tlb</TypeLibraryName> | |
829 | + <HeaderFileName> | |
830 | + </HeaderFileName> | |
831 | + </Midl> | |
832 | + <ClCompile> | |
833 | + <Optimization>Disabled</Optimization> | |
834 | + <AdditionalIncludeDirectories>.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;..\libssh2\include;..\libz;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
835 | + <PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
836 | + <AdditionalIncludeDirectories>..\libssh2\include;.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
837 | + <PreprocessorDefinitions>WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
838 | + <PreprocessToFile>false</PreprocessToFile> | |
839 | + <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> | |
840 | + <PreprocessKeepComments>false</PreprocessKeepComments> | |
841 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
842 | + <PrecompiledHeader> | |
843 | + </PrecompiledHeader> | |
844 | + <PrecompiledHeaderOutputFile>.\Debug/nmap.pch</PrecompiledHeaderOutputFile> | |
845 | + <AssemblerListingLocation>.\Debug/</AssemblerListingLocation> | |
846 | + <ObjectFileName>.\Debug/</ObjectFileName> | |
847 | + <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> | |
848 | + <WarningLevel>Level2</WarningLevel> | |
849 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
850 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
851 | + <CompileAs>CompileAsCpp</CompileAs> | |
852 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
853 | + <ShowIncludes>false</ShowIncludes> | |
854 | + </ClCompile> | |
855 | + <Link> | |
856 | + <AdditionalDependencies>liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
857 | + <OutputFile>.\Debug\nmap.exe</OutputFile> | |
858 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
859 | + <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua\x64\Debug;..\libpcre\x64\Debug;..\nsock\x64\Debug;..\nbase\x64\Debug;..\libdnet-stripped\x64\Debug;..\libnetutil\x64\Debug;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Debug;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
860 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
861 | + <DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs> | |
862 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
863 | + <ProgramDatabaseFile>.\Debug/nmap.pdb</ProgramDatabaseFile> | |
864 | + <SubSystem>Console</SubSystem> | |
865 | + <RandomizedBaseAddress>false</RandomizedBaseAddress> | |
866 | + <DataExecutionPrevention> | |
867 | + </DataExecutionPrevention> | |
868 | + </Link> | |
869 | + <PostBuildEvent> | |
870 | + <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y</Command> | |
871 | </PostBuildEvent> | |
872 | <ResourceCompile> | |
873 | <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName> | |
874 | @@ -121,7 +198,7 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje | |
875 | <CompileAs>CompileAsCpp</CompileAs> | |
876 | </ClCompile> | |
877 | <Link> | |
878 | - <AdditionalDependencies>liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
879 | + <AdditionalDependencies>liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
880 | <OutputFile>.\Release/nmap.exe</OutputFile> | |
881 | <SuppressStartupBanner>true</SuppressStartupBanner> | |
882 | <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
883 | @@ -135,8 +212,46 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje | |
884 | <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> | |
885 | </Link> | |
886 | <PostBuildEvent> | |
887 | - <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y | |
888 | -xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)"</Command> | |
889 | + <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y</Command> | |
890 | + </PostBuildEvent> | |
891 | + </ItemDefinitionGroup> | |
892 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
893 | + <Midl> | |
894 | + <TypeLibraryName>.\Release/nmap.tlb</TypeLibraryName> | |
895 | + <HeaderFileName> | |
896 | + </HeaderFileName> | |
897 | + </Midl> | |
898 | + <ClCompile> | |
899 | + <Optimization>MaxSpeed</Optimization> | |
900 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
901 | + <AdditionalIncludeDirectories>.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;..\libssh2\include;..\libz;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
902 | + <PreprocessorDefinitions>WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
903 | + <StringPooling>true</StringPooling> | |
904 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
905 | + <PrecompiledHeader> | |
906 | + </PrecompiledHeader> | |
907 | + <PrecompiledHeaderOutputFile>.\Release/nmap.pch</PrecompiledHeaderOutputFile> | |
908 | + <AssemblerListingLocation>.\Release/</AssemblerListingLocation> | |
909 | + <ObjectFileName>.\Release/</ObjectFileName> | |
910 | + <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> | |
911 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
912 | + <CompileAs>CompileAsCpp</CompileAs> | |
913 | + </ClCompile> | |
914 | + <Link> | |
915 | + <AdditionalDependencies>liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
916 | + <OutputFile>.\Release/nmap.exe</OutputFile> | |
917 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
918 | + <AdditionalLibraryDirectories>..\libssh2\win32\Release_dll;lib;..\liblua\x64\Release;..\libpcre;..\nsock\x64\Release;..\nbase\x64\Release;..\libdnet-stripped\x64\Release;..\libnetutil\x64\Release;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Release;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
919 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
920 | + <DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs> | |
921 | + <ProgramDatabaseFile>.\Release/nmap.pdb</ProgramDatabaseFile> | |
922 | + <SubSystem>Console</SubSystem> | |
923 | + <RandomizedBaseAddress>true</RandomizedBaseAddress> | |
924 | + <DataExecutionPrevention>true</DataExecutionPrevention> | |
925 | + <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> | |
926 | + </Link> | |
927 | + <PostBuildEvent> | |
928 | + <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y</Command> | |
929 | </PostBuildEvent> | |
930 | </ItemDefinitionGroup> | |
931 | <ItemGroup> | |
932 | @@ -191,7 +306,9 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje | |
933 | <ClCompile Include="..\xml.cc" /> | |
934 | <ClCompile Include="winfix.cc"> | |
935 | <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Sync</ExceptionHandling> | |
936 | + <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Sync</ExceptionHandling> | |
937 | <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Sync</ExceptionHandling> | |
938 | + <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Sync</ExceptionHandling> | |
939 | </ClCompile> | |
940 | </ItemGroup> | |
941 | <ItemGroup> | |
942 | @@ -251,83 +368,147 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje | |
943 | <None Include="icon1.ico" /> | |
944 | <CustomBuild Include="..\nmap-mac-prefixes"> | |
945 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
946 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
947 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
948 | +</Command> | |
949 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
950 | </Command> | |
951 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
952 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
953 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
954 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
955 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
956 | +</Command> | |
957 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
958 | </Command> | |
959 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
960 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
961 | </CustomBuild> | |
962 | <CustomBuild Include="..\nmap-os-db"> | |
963 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
964 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
965 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
966 | +</Command> | |
967 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
968 | </Command> | |
969 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
970 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
971 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
972 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
973 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
974 | +</Command> | |
975 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
976 | </Command> | |
977 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
978 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
979 | </CustomBuild> | |
980 | <CustomBuild Include="..\nmap-payloads"> | |
981 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
982 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
983 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
984 | +</Command> | |
985 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
986 | </Command> | |
987 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
988 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
989 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
990 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
991 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
992 | +</Command> | |
993 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
994 | </Command> | |
995 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
996 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
997 | </CustomBuild> | |
998 | <CustomBuild Include="..\nmap-protocols"> | |
999 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
1000 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
1001 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1002 | +</Command> | |
1003 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1004 | </Command> | |
1005 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1006 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1007 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
1008 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
1009 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1010 | +</Command> | |
1011 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1012 | </Command> | |
1013 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1014 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1015 | </CustomBuild> | |
1016 | <CustomBuild Include="..\nmap-rpc"> | |
1017 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
1018 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
1019 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1020 | +</Command> | |
1021 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1022 | </Command> | |
1023 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1024 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1025 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
1026 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
1027 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1028 | +</Command> | |
1029 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1030 | </Command> | |
1031 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1032 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1033 | </CustomBuild> | |
1034 | <CustomBuild Include="..\nmap-service-probes"> | |
1035 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
1036 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
1037 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1038 | +</Command> | |
1039 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1040 | </Command> | |
1041 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1042 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1043 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
1044 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
1045 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1046 | +</Command> | |
1047 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1048 | </Command> | |
1049 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1050 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1051 | </CustomBuild> | |
1052 | <CustomBuild Include="..\nmap-services"> | |
1053 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename) to output directory...</Message> | |
1054 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename) to output directory...</Message> | |
1055 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1056 | +</Command> | |
1057 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1058 | </Command> | |
1059 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1060 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1061 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename) to output directory...</Message> | |
1062 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename) to output directory...</Message> | |
1063 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1064 | +</Command> | |
1065 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul | |
1066 | </Command> | |
1067 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1068 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename);%(Outputs)</Outputs> | |
1069 | </CustomBuild> | |
1070 | <CustomBuild Include="..\docs\nmap.xsl"> | |
1071 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename).xsl to output directory...</Message> | |
1072 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename).xsl to output directory...</Message> | |
1073 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul | |
1074 | +</Command> | |
1075 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul | |
1076 | </Command> | |
1077 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename).xsl;%(Outputs)</Outputs> | |
1078 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename).xsl;%(Outputs)</Outputs> | |
1079 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename).xsl to output directory...</Message> | |
1080 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename).xsl to output directory...</Message> | |
1081 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul | |
1082 | +</Command> | |
1083 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul | |
1084 | </Command> | |
1085 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename).xsl;%(Outputs)</Outputs> | |
1086 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename).xsl;%(Outputs)</Outputs> | |
1087 | </CustomBuild> | |
1088 | </ItemGroup> | |
1089 | <ItemGroup> | |
1090 | @@ -339,18 +520,6 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje | |
1091 | <Project>{31fb0767-a71f-4575-8379-002d72b8af86}</Project> | |
1092 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | |
1093 | </ProjectReference> | |
1094 | - <ProjectReference Include="..\libpcre\libpcre.vcxproj"> | |
1095 | - <Project>{5de86c7a-de72-4265-8807-4ca38f94f22a}</Project> | |
1096 | - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | |
1097 | - </ProjectReference> | |
1098 | - <ProjectReference Include="..\libssh2\win32\libssh2.vcxproj"> | |
1099 | - <Project>{ed957342-e43b-496e-92d9-4c76b525bdf5}</Project> | |
1100 | - <Private>false</Private> | |
1101 | - <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | |
1102 | - <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> | |
1103 | - <LinkLibraryDependencies>true</LinkLibraryDependencies> | |
1104 | - <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> | |
1105 | - </ProjectReference> | |
1106 | <ProjectReference Include="..\nbase\nbase.vcxproj"> | |
1107 | <Project>{b630c8f7-3138-43e8-89ed-78742fa2ac5f}</Project> | |
1108 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | |
1109 | diff --git a/nbase/nbase.vcxproj b/nbase/nbase.vcxproj | |
1110 | index 948d7c8..b600c7b 100644 | |
1111 | --- a/nbase/nbase.vcxproj | |
1112 | +++ b/nbase/nbase.vcxproj | |
1113 | @@ -5,14 +5,26 @@ | |
1114 | <Configuration>Debug</Configuration> | |
1115 | <Platform>Win32</Platform> | |
1116 | </ProjectConfiguration> | |
1117 | + <ProjectConfiguration Include="Debug|x64"> | |
1118 | + <Configuration>Debug</Configuration> | |
1119 | + <Platform>x64</Platform> | |
1120 | + </ProjectConfiguration> | |
1121 | <ProjectConfiguration Include="Release|Win32"> | |
1122 | <Configuration>Release</Configuration> | |
1123 | <Platform>Win32</Platform> | |
1124 | </ProjectConfiguration> | |
1125 | + <ProjectConfiguration Include="Release|x64"> | |
1126 | + <Configuration>Release</Configuration> | |
1127 | + <Platform>x64</Platform> | |
1128 | + </ProjectConfiguration> | |
1129 | <ProjectConfiguration Include="Static|Win32"> | |
1130 | <Configuration>Static</Configuration> | |
1131 | <Platform>Win32</Platform> | |
1132 | </ProjectConfiguration> | |
1133 | + <ProjectConfiguration Include="Static|x64"> | |
1134 | + <Configuration>Static</Configuration> | |
1135 | + <Platform>x64</Platform> | |
1136 | + </ProjectConfiguration> | |
1137 | </ItemGroup> | |
1138 | <PropertyGroup Label="Globals"> | |
1139 | <ProjectGuid>{B630C8F7-3138-43E8-89ED-78742FA2AC5F}</ProjectGuid> | |
1140 | @@ -25,16 +37,31 @@ | |
1141 | <CharacterSet>MultiByte</CharacterSet> | |
1142 | <PlatformToolset>v120</PlatformToolset> | |
1143 | </PropertyGroup> | |
1144 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
1145 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1146 | + <CharacterSet>MultiByte</CharacterSet> | |
1147 | + <PlatformToolset>v120</PlatformToolset> | |
1148 | + </PropertyGroup> | |
1149 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration"> | |
1150 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
1151 | <CharacterSet>MultiByte</CharacterSet> | |
1152 | <PlatformToolset>v120</PlatformToolset> | |
1153 | </PropertyGroup> | |
1154 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration"> | |
1155 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1156 | + <CharacterSet>MultiByte</CharacterSet> | |
1157 | + <PlatformToolset>v120</PlatformToolset> | |
1158 | + </PropertyGroup> | |
1159 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
1160 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
1161 | <CharacterSet>MultiByte</CharacterSet> | |
1162 | <PlatformToolset>v120</PlatformToolset> | |
1163 | </PropertyGroup> | |
1164 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
1165 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1166 | + <CharacterSet>MultiByte</CharacterSet> | |
1167 | + <PlatformToolset>v120</PlatformToolset> | |
1168 | + </PropertyGroup> | |
1169 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
1170 | <ImportGroup Label="ExtensionSettings"> | |
1171 | </ImportGroup> | |
1172 | @@ -42,14 +69,26 @@ | |
1173 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1174 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1175 | </ImportGroup> | |
1176 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
1177 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1178 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1179 | + </ImportGroup> | |
1180 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets"> | |
1181 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1182 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1183 | </ImportGroup> | |
1184 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets"> | |
1185 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1186 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1187 | + </ImportGroup> | |
1188 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
1189 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1190 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1191 | </ImportGroup> | |
1192 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
1193 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1194 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1195 | + </ImportGroup> | |
1196 | <PropertyGroup Label="UserMacros" /> | |
1197 | <PropertyGroup> | |
1198 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
1199 | @@ -76,6 +115,21 @@ | |
1200 | <OutputFile>$(OutDir)nbase.lib</OutputFile> | |
1201 | </Lib> | |
1202 | </ItemDefinitionGroup> | |
1203 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
1204 | + <ClCompile> | |
1205 | + <Optimization>Disabled</Optimization> | |
1206 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1207 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
1208 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
1209 | + <PrecompiledHeader> | |
1210 | + </PrecompiledHeader> | |
1211 | + <WarningLevel>Level3</WarningLevel> | |
1212 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1213 | + </ClCompile> | |
1214 | + <Lib> | |
1215 | + <OutputFile>$(OutDir)nbase.lib</OutputFile> | |
1216 | + </Lib> | |
1217 | + </ItemDefinitionGroup> | |
1218 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
1219 | <ClCompile> | |
1220 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1221 | @@ -89,6 +143,19 @@ | |
1222 | <OutputFile>$(OutDir)nbase.lib</OutputFile> | |
1223 | </Lib> | |
1224 | </ItemDefinitionGroup> | |
1225 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
1226 | + <ClCompile> | |
1227 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1228 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1229 | + <PrecompiledHeader> | |
1230 | + </PrecompiledHeader> | |
1231 | + <WarningLevel>Level3</WarningLevel> | |
1232 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1233 | + </ClCompile> | |
1234 | + <Lib> | |
1235 | + <OutputFile>$(OutDir)nbase.lib</OutputFile> | |
1236 | + </Lib> | |
1237 | + </ItemDefinitionGroup> | |
1238 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'"> | |
1239 | <ClCompile> | |
1240 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1241 | @@ -103,6 +170,20 @@ | |
1242 | <OutputFile>$(OutDir)nbase.lib</OutputFile> | |
1243 | </Lib> | |
1244 | </ItemDefinitionGroup> | |
1245 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'"> | |
1246 | + <ClCompile> | |
1247 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1248 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1249 | + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
1250 | + <PrecompiledHeader> | |
1251 | + </PrecompiledHeader> | |
1252 | + <WarningLevel>Level3</WarningLevel> | |
1253 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1254 | + </ClCompile> | |
1255 | + <Lib> | |
1256 | + <OutputFile>$(OutDir)nbase.lib</OutputFile> | |
1257 | + </Lib> | |
1258 | + </ItemDefinitionGroup> | |
1259 | <ItemGroup> | |
1260 | <ClCompile Include="getopt.c" /> | |
1261 | <ClCompile Include="inet_ntop.c" /> | |
1262 | diff --git a/ncat/ncat.vcxproj b/ncat/ncat.vcxproj | |
1263 | index fc44dfa..e066b29 100644 | |
1264 | --- a/ncat/ncat.vcxproj | |
1265 | +++ b/ncat/ncat.vcxproj | |
1266 | @@ -5,14 +5,26 @@ | |
1267 | <Configuration>Debug</Configuration> | |
1268 | <Platform>Win32</Platform> | |
1269 | </ProjectConfiguration> | |
1270 | + <ProjectConfiguration Include="Debug|x64"> | |
1271 | + <Configuration>Debug</Configuration> | |
1272 | + <Platform>x64</Platform> | |
1273 | + </ProjectConfiguration> | |
1274 | <ProjectConfiguration Include="Release|Win32"> | |
1275 | <Configuration>Release</Configuration> | |
1276 | <Platform>Win32</Platform> | |
1277 | </ProjectConfiguration> | |
1278 | + <ProjectConfiguration Include="Release|x64"> | |
1279 | + <Configuration>Release</Configuration> | |
1280 | + <Platform>x64</Platform> | |
1281 | + </ProjectConfiguration> | |
1282 | <ProjectConfiguration Include="Static|Win32"> | |
1283 | <Configuration>Static</Configuration> | |
1284 | <Platform>Win32</Platform> | |
1285 | </ProjectConfiguration> | |
1286 | + <ProjectConfiguration Include="Static|x64"> | |
1287 | + <Configuration>Static</Configuration> | |
1288 | + <Platform>x64</Platform> | |
1289 | + </ProjectConfiguration> | |
1290 | </ItemGroup> | |
1291 | <PropertyGroup Label="Globals"> | |
1292 | <ProjectGuid>{C1E04411-E021-468B-83F1-CB624BBA7589}</ProjectGuid> | |
1293 | @@ -25,18 +37,36 @@ | |
1294 | <CharacterSet>MultiByte</CharacterSet> | |
1295 | <PlatformToolset>v120</PlatformToolset> | |
1296 | </PropertyGroup> | |
1297 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
1298 | + <ConfigurationType>Application</ConfigurationType> | |
1299 | + <UseOfMfc>false</UseOfMfc> | |
1300 | + <CharacterSet>MultiByte</CharacterSet> | |
1301 | + <PlatformToolset>v120</PlatformToolset> | |
1302 | + </PropertyGroup> | |
1303 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration"> | |
1304 | <ConfigurationType>Application</ConfigurationType> | |
1305 | <UseOfMfc>false</UseOfMfc> | |
1306 | <CharacterSet>MultiByte</CharacterSet> | |
1307 | <PlatformToolset>v120</PlatformToolset> | |
1308 | </PropertyGroup> | |
1309 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration"> | |
1310 | + <ConfigurationType>Application</ConfigurationType> | |
1311 | + <UseOfMfc>false</UseOfMfc> | |
1312 | + <CharacterSet>MultiByte</CharacterSet> | |
1313 | + <PlatformToolset>v120</PlatformToolset> | |
1314 | + </PropertyGroup> | |
1315 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
1316 | <ConfigurationType>Application</ConfigurationType> | |
1317 | <UseOfMfc>false</UseOfMfc> | |
1318 | <CharacterSet>MultiByte</CharacterSet> | |
1319 | <PlatformToolset>v120</PlatformToolset> | |
1320 | </PropertyGroup> | |
1321 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
1322 | + <ConfigurationType>Application</ConfigurationType> | |
1323 | + <UseOfMfc>false</UseOfMfc> | |
1324 | + <CharacterSet>MultiByte</CharacterSet> | |
1325 | + <PlatformToolset>v120</PlatformToolset> | |
1326 | + </PropertyGroup> | |
1327 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
1328 | <ImportGroup Label="ExtensionSettings"> | |
1329 | </ImportGroup> | |
1330 | @@ -44,26 +74,41 @@ | |
1331 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1332 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1333 | </ImportGroup> | |
1334 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
1335 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1336 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1337 | + </ImportGroup> | |
1338 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets"> | |
1339 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1340 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1341 | </ImportGroup> | |
1342 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets"> | |
1343 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1344 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1345 | + </ImportGroup> | |
1346 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
1347 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1348 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1349 | </ImportGroup> | |
1350 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
1351 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1352 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1353 | + </ImportGroup> | |
1354 | <PropertyGroup Label="UserMacros" /> | |
1355 | <PropertyGroup> | |
1356 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
1357 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(Configuration)\</OutDir> | |
1358 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(Configuration)\</IntDir> | |
1359 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | |
1360 | + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> | |
1361 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir> | |
1362 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">.\Release\</OutDir> | |
1363 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir> | |
1364 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">.\Release\</IntDir> | |
1365 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental> | |
1366 | + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental> | |
1367 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">true</LinkIncremental> | |
1368 | + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Static|x64'">true</LinkIncremental> | |
1369 | </PropertyGroup> | |
1370 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |
1371 | <Midl> | |
1372 | @@ -111,6 +156,51 @@ | |
1373 | <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y</Command> | |
1374 | </PostBuildEvent> | |
1375 | </ItemDefinitionGroup> | |
1376 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
1377 | + <Midl> | |
1378 | + <TypeLibraryName>.\Debug/ncat.tlb</TypeLibraryName> | |
1379 | + <HeaderFileName> | |
1380 | + </HeaderFileName> | |
1381 | + </Midl> | |
1382 | + <ClCompile> | |
1383 | + <Optimization>Disabled</Optimization> | |
1384 | + <AdditionalIncludeDirectories>.;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1385 | + <PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1386 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
1387 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
1388 | + <PrecompiledHeader> | |
1389 | + </PrecompiledHeader> | |
1390 | + <PrecompiledHeaderOutputFile>.\Debug/ncat.pch</PrecompiledHeaderOutputFile> | |
1391 | + <AssemblerListingLocation>.\Debug/</AssemblerListingLocation> | |
1392 | + <ObjectFileName>.\Debug/</ObjectFileName> | |
1393 | + <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> | |
1394 | + <WarningLevel>Level2</WarningLevel> | |
1395 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1396 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1397 | + <CompileAs>CompileAsCpp</CompileAs> | |
1398 | + </ClCompile> | |
1399 | + <ResourceCompile> | |
1400 | + <ResourceOutputFileName> | |
1401 | + </ResourceOutputFileName> | |
1402 | + </ResourceCompile> | |
1403 | + <Link> | |
1404 | + <AdditionalDependencies>nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;nsock.lib;advapi32.lib;libcrypto.lib;libssl.lib;liblua.lib</AdditionalDependencies> | |
1405 | + <OutputFile>.\Debug\ncat.exe</OutputFile> | |
1406 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1407 | + <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblua;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
1408 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
1409 | + <DelayLoadDLLs>wpcap.dll;%(DelayLoadDLLs)</DelayLoadDLLs> | |
1410 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
1411 | + <ProgramDatabaseFile>.\Debug/ncat.pdb</ProgramDatabaseFile> | |
1412 | + <SubSystem>Console</SubSystem> | |
1413 | + <RandomizedBaseAddress>false</RandomizedBaseAddress> | |
1414 | + <DataExecutionPrevention> | |
1415 | + </DataExecutionPrevention> | |
1416 | + </Link> | |
1417 | + <PostBuildEvent> | |
1418 | + <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y</Command> | |
1419 | + </PostBuildEvent> | |
1420 | + </ItemDefinitionGroup> | |
1421 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
1422 | <Midl> | |
1423 | <TypeLibraryName>.\Release/ncat.tlb</TypeLibraryName> | |
1424 | @@ -151,6 +241,45 @@ | |
1425 | <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y</Command> | |
1426 | </PostBuildEvent> | |
1427 | </ItemDefinitionGroup> | |
1428 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
1429 | + <Midl> | |
1430 | + <TypeLibraryName>.\Release/ncat.tlb</TypeLibraryName> | |
1431 | + <HeaderFileName> | |
1432 | + </HeaderFileName> | |
1433 | + </Midl> | |
1434 | + <ClCompile> | |
1435 | + <Optimization>MaxSpeed</Optimization> | |
1436 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
1437 | + <AdditionalIncludeDirectories>.;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1438 | + <PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1439 | + <StringPooling>true</StringPooling> | |
1440 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
1441 | + <PrecompiledHeader> | |
1442 | + </PrecompiledHeader> | |
1443 | + <PrecompiledHeaderOutputFile>.\Release/ncat.pch</PrecompiledHeaderOutputFile> | |
1444 | + <AssemblerListingLocation>.\Release/</AssemblerListingLocation> | |
1445 | + <ObjectFileName>.\Release/</ObjectFileName> | |
1446 | + <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> | |
1447 | + <WarningLevel>Level2</WarningLevel> | |
1448 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1449 | + <CompileAs>CompileAsCpp</CompileAs> | |
1450 | + </ClCompile> | |
1451 | + <Link> | |
1452 | + <AdditionalDependencies>nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;advapi32.lib;libcrypto.lib;libssl.lib</AdditionalDependencies> | |
1453 | + <OutputFile>.\Release/ncat.exe</OutputFile> | |
1454 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1455 | + <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
1456 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
1457 | + <DelayLoadDLLs>wpcap.dll;%(DelayLoadDLLs)</DelayLoadDLLs> | |
1458 | + <ProgramDatabaseFile>.\Release/ncat.pdb</ProgramDatabaseFile> | |
1459 | + <SubSystem>Console</SubSystem> | |
1460 | + <RandomizedBaseAddress>true</RandomizedBaseAddress> | |
1461 | + <DataExecutionPrevention>true</DataExecutionPrevention> | |
1462 | + </Link> | |
1463 | + <PostBuildEvent> | |
1464 | + <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y</Command> | |
1465 | + </PostBuildEvent> | |
1466 | + </ItemDefinitionGroup> | |
1467 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'"> | |
1468 | <Midl> | |
1469 | <TypeLibraryName>.\Release/ncat.tlb</TypeLibraryName> | |
1470 | @@ -193,6 +322,47 @@ | |
1471 | </Command> | |
1472 | </PostBuildEvent> | |
1473 | </ItemDefinitionGroup> | |
1474 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'"> | |
1475 | + <Midl> | |
1476 | + <TypeLibraryName>.\Release/ncat.tlb</TypeLibraryName> | |
1477 | + <HeaderFileName> | |
1478 | + </HeaderFileName> | |
1479 | + </Midl> | |
1480 | + <ClCompile> | |
1481 | + <Optimization>MaxSpeed</Optimization> | |
1482 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
1483 | + <AdditionalIncludeDirectories>.;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1484 | + <PreprocessorDefinitions>WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1485 | + <StringPooling>true</StringPooling> | |
1486 | + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
1487 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
1488 | + <PrecompiledHeader> | |
1489 | + </PrecompiledHeader> | |
1490 | + <PrecompiledHeaderOutputFile>.\Release/ncat.pch</PrecompiledHeaderOutputFile> | |
1491 | + <AssemblerListingLocation>.\Release/</AssemblerListingLocation> | |
1492 | + <ObjectFileName>.\Release/</ObjectFileName> | |
1493 | + <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> | |
1494 | + <WarningLevel>Level2</WarningLevel> | |
1495 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1496 | + <CompileAs>CompileAsCpp</CompileAs> | |
1497 | + </ClCompile> | |
1498 | + <Link> | |
1499 | + <AdditionalDependencies>nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;advapi32.lib;libssl.lib;libcrypto.lib;user32.lib;gdi32.lib</AdditionalDependencies> | |
1500 | + <OutputFile>.\Release/ncat.exe</OutputFile> | |
1501 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1502 | + <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
1503 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
1504 | + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> | |
1505 | + <ProgramDatabaseFile>.\Release/ncat.pdb</ProgramDatabaseFile> | |
1506 | + <SubSystem>Console</SubSystem> | |
1507 | + <RandomizedBaseAddress>true</RandomizedBaseAddress> | |
1508 | + <DataExecutionPrevention>true</DataExecutionPrevention> | |
1509 | + </Link> | |
1510 | + <PostBuildEvent> | |
1511 | + <Command> | |
1512 | + </Command> | |
1513 | + </PostBuildEvent> | |
1514 | + </ItemDefinitionGroup> | |
1515 | <ItemGroup> | |
1516 | <ClCompile Include="base64.c" /> | |
1517 | <ClCompile Include="http.c" /> | |
1518 | @@ -230,17 +400,29 @@ | |
1519 | <ItemGroup> | |
1520 | <CustomBuild Include="certs\ca-bundle.crt"> | |
1521 | <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename).crt to output directory...</Message> | |
1522 | + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying %(Filename).crt to output directory...</Message> | |
1523 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul | |
1524 | +</Command> | |
1525 | + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul | |
1526 | </Command> | |
1527 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(TargetDir)%(Filename).crt;%(Outputs)</Outputs> | |
1528 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)%(Filename).crt;%(Outputs)</Outputs> | |
1529 | <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying %(Filename).crt to output directory...</Message> | |
1530 | + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying %(Filename).crt to output directory...</Message> | |
1531 | <Message Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">Copying %(Filename).crt to output directory...</Message> | |
1532 | + <Message Condition="'$(Configuration)|$(Platform)'=='Static|x64'">Copying %(Filename).crt to output directory...</Message> | |
1533 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul | |
1534 | +</Command> | |
1535 | + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul | |
1536 | </Command> | |
1537 | <Command Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul | |
1538 | +</Command> | |
1539 | + <Command Condition="'$(Configuration)|$(Platform)'=='Static|x64'">copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul | |
1540 | </Command> | |
1541 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(TargetDir)%(Filename).crt;%(Outputs)</Outputs> | |
1542 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)%(Filename).crt;%(Outputs)</Outputs> | |
1543 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Static|Win32'">$(TargetDir)%(Filename).crt;%(Outputs)</Outputs> | |
1544 | + <Outputs Condition="'$(Configuration)|$(Platform)'=='Static|x64'">$(TargetDir)%(Filename).crt;%(Outputs)</Outputs> | |
1545 | </CustomBuild> | |
1546 | </ItemGroup> | |
1547 | <ItemGroup> | |
1548 | diff --git a/nping/nping.vcxproj b/nping/nping.vcxproj | |
1549 | index 57bd4ed..fa7a604 100644 | |
1550 | --- a/nping/nping.vcxproj | |
1551 | +++ b/nping/nping.vcxproj | |
1552 | @@ -5,10 +5,18 @@ | |
1553 | <Configuration>Debug</Configuration> | |
1554 | <Platform>Win32</Platform> | |
1555 | </ProjectConfiguration> | |
1556 | + <ProjectConfiguration Include="Debug|x64"> | |
1557 | + <Configuration>Debug</Configuration> | |
1558 | + <Platform>x64</Platform> | |
1559 | + </ProjectConfiguration> | |
1560 | <ProjectConfiguration Include="Release|Win32"> | |
1561 | <Configuration>Release</Configuration> | |
1562 | <Platform>Win32</Platform> | |
1563 | </ProjectConfiguration> | |
1564 | + <ProjectConfiguration Include="Release|x64"> | |
1565 | + <Configuration>Release</Configuration> | |
1566 | + <Platform>x64</Platform> | |
1567 | + </ProjectConfiguration> | |
1568 | </ItemGroup> | |
1569 | <PropertyGroup Label="Globals"> | |
1570 | <ProjectGuid>{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}</ProjectGuid> | |
1571 | @@ -21,12 +29,24 @@ | |
1572 | <CharacterSet>MultiByte</CharacterSet> | |
1573 | <PlatformToolset>v120</PlatformToolset> | |
1574 | </PropertyGroup> | |
1575 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
1576 | + <ConfigurationType>Application</ConfigurationType> | |
1577 | + <UseOfMfc>false</UseOfMfc> | |
1578 | + <CharacterSet>MultiByte</CharacterSet> | |
1579 | + <PlatformToolset>v120</PlatformToolset> | |
1580 | + </PropertyGroup> | |
1581 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
1582 | <ConfigurationType>Application</ConfigurationType> | |
1583 | <UseOfMfc>false</UseOfMfc> | |
1584 | <CharacterSet>MultiByte</CharacterSet> | |
1585 | <PlatformToolset>v120</PlatformToolset> | |
1586 | </PropertyGroup> | |
1587 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
1588 | + <ConfigurationType>Application</ConfigurationType> | |
1589 | + <UseOfMfc>false</UseOfMfc> | |
1590 | + <CharacterSet>MultiByte</CharacterSet> | |
1591 | + <PlatformToolset>v120</PlatformToolset> | |
1592 | + </PropertyGroup> | |
1593 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
1594 | <ImportGroup Label="ExtensionSettings"> | |
1595 | </ImportGroup> | |
1596 | @@ -34,19 +54,29 @@ | |
1597 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1598 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1599 | </ImportGroup> | |
1600 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
1601 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1602 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1603 | + </ImportGroup> | |
1604 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
1605 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1606 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1607 | </ImportGroup> | |
1608 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
1609 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1610 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1611 | + </ImportGroup> | |
1612 | <PropertyGroup Label="UserMacros" /> | |
1613 | <PropertyGroup> | |
1614 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
1615 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(Configuration)\</OutDir> | |
1616 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\$(Configuration)\</IntDir> | |
1617 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | |
1618 | + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> | |
1619 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir> | |
1620 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir> | |
1621 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental> | |
1622 | + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental> | |
1623 | </PropertyGroup> | |
1624 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | |
1625 | <Midl> | |
1626 | @@ -93,6 +123,50 @@ | |
1627 | <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y </Command> | |
1628 | </PostBuildEvent> | |
1629 | </ItemDefinitionGroup> | |
1630 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
1631 | + <Midl> | |
1632 | + <TypeLibraryName>.\Debug/nmap.tlb</TypeLibraryName> | |
1633 | + <HeaderFileName> | |
1634 | + </HeaderFileName> | |
1635 | + </Midl> | |
1636 | + <ClCompile> | |
1637 | + <Optimization>Disabled</Optimization> | |
1638 | + <AdditionalIncludeDirectories>.;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1639 | + <PreprocessorDefinitions>WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1640 | + <PreprocessToFile>false</PreprocessToFile> | |
1641 | + <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers> | |
1642 | + <PreprocessKeepComments>false</PreprocessKeepComments> | |
1643 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
1644 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
1645 | + <PrecompiledHeader> | |
1646 | + </PrecompiledHeader> | |
1647 | + <PrecompiledHeaderOutputFile>.\Debug/nmap.pch</PrecompiledHeaderOutputFile> | |
1648 | + <AssemblerListingLocation>.\Debug/</AssemblerListingLocation> | |
1649 | + <ObjectFileName>.\Debug/</ObjectFileName> | |
1650 | + <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName> | |
1651 | + <WarningLevel>Level2</WarningLevel> | |
1652 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1653 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1654 | + <CompileAs>CompileAsCpp</CompileAs> | |
1655 | + </ClCompile> | |
1656 | + <Link> | |
1657 | + <AdditionalDependencies>nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
1658 | + <OutputFile>.\Debug\nping.exe</OutputFile> | |
1659 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1660 | + <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
1661 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
1662 | + <DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs> | |
1663 | + <GenerateDebugInformation>true</GenerateDebugInformation> | |
1664 | + <ProgramDatabaseFile>.\Debug/nmap.pdb</ProgramDatabaseFile> | |
1665 | + <SubSystem>Console</SubSystem> | |
1666 | + <RandomizedBaseAddress>false</RandomizedBaseAddress> | |
1667 | + <DataExecutionPrevention> | |
1668 | + </DataExecutionPrevention> | |
1669 | + </Link> | |
1670 | + <PostBuildEvent> | |
1671 | + <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y </Command> | |
1672 | + </PostBuildEvent> | |
1673 | + </ItemDefinitionGroup> | |
1674 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
1675 | <Midl> | |
1676 | <TypeLibraryName>.\Release/nmap.tlb</TypeLibraryName> | |
1677 | @@ -132,6 +206,44 @@ | |
1678 | <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y </Command> | |
1679 | </PostBuildEvent> | |
1680 | </ItemDefinitionGroup> | |
1681 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
1682 | + <Midl> | |
1683 | + <TypeLibraryName>.\Release/nmap.tlb</TypeLibraryName> | |
1684 | + <HeaderFileName> | |
1685 | + </HeaderFileName> | |
1686 | + </Midl> | |
1687 | + <ClCompile> | |
1688 | + <Optimization>MaxSpeed</Optimization> | |
1689 | + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | |
1690 | + <AdditionalIncludeDirectories>.;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1691 | + <PreprocessorDefinitions>WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1692 | + <StringPooling>true</StringPooling> | |
1693 | + <FunctionLevelLinking>true</FunctionLevelLinking> | |
1694 | + <PrecompiledHeader> | |
1695 | + </PrecompiledHeader> | |
1696 | + <PrecompiledHeaderOutputFile>.\Release/nping.pch</PrecompiledHeaderOutputFile> | |
1697 | + <AssemblerListingLocation>.\Release/</AssemblerListingLocation> | |
1698 | + <ObjectFileName>.\Release/</ObjectFileName> | |
1699 | + <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName> | |
1700 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1701 | + <CompileAs>CompileAsCpp</CompileAs> | |
1702 | + </ClCompile> | |
1703 | + <Link> | |
1704 | + <AdditionalDependencies>nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib</AdditionalDependencies> | |
1705 | + <OutputFile>.\Release/nping.exe</OutputFile> | |
1706 | + <SuppressStartupBanner>true</SuppressStartupBanner> | |
1707 | + <AdditionalLibraryDirectories>..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | |
1708 | + <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> | |
1709 | + <DelayLoadDLLs>packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs)</DelayLoadDLLs> | |
1710 | + <ProgramDatabaseFile>.\Release/nping.pdb</ProgramDatabaseFile> | |
1711 | + <SubSystem>Console</SubSystem> | |
1712 | + <RandomizedBaseAddress>true</RandomizedBaseAddress> | |
1713 | + <DataExecutionPrevention>true</DataExecutionPrevention> | |
1714 | + </Link> | |
1715 | + <PostBuildEvent> | |
1716 | + <Command>xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y </Command> | |
1717 | + </PostBuildEvent> | |
1718 | + </ItemDefinitionGroup> | |
1719 | <ItemGroup> | |
1720 | <ClCompile Include="ArgParser.cc" /> | |
1721 | <ClCompile Include="common.cc" /> | |
1722 | diff --git a/nsock/nsock.vcxproj b/nsock/nsock.vcxproj | |
1723 | index 36feb48..f720258 100644 | |
1724 | --- a/nsock/nsock.vcxproj | |
1725 | +++ b/nsock/nsock.vcxproj | |
1726 | @@ -5,22 +5,42 @@ | |
1727 | <Configuration>DebugNoPcap</Configuration> | |
1728 | <Platform>Win32</Platform> | |
1729 | </ProjectConfiguration> | |
1730 | + <ProjectConfiguration Include="DebugNoPcap|x64"> | |
1731 | + <Configuration>DebugNoPcap</Configuration> | |
1732 | + <Platform>x64</Platform> | |
1733 | + </ProjectConfiguration> | |
1734 | <ProjectConfiguration Include="Debug|Win32"> | |
1735 | <Configuration>Debug</Configuration> | |
1736 | <Platform>Win32</Platform> | |
1737 | </ProjectConfiguration> | |
1738 | + <ProjectConfiguration Include="Debug|x64"> | |
1739 | + <Configuration>Debug</Configuration> | |
1740 | + <Platform>x64</Platform> | |
1741 | + </ProjectConfiguration> | |
1742 | <ProjectConfiguration Include="ReleaseNoPcap|Win32"> | |
1743 | <Configuration>ReleaseNoPcap</Configuration> | |
1744 | <Platform>Win32</Platform> | |
1745 | </ProjectConfiguration> | |
1746 | + <ProjectConfiguration Include="ReleaseNoPcap|x64"> | |
1747 | + <Configuration>ReleaseNoPcap</Configuration> | |
1748 | + <Platform>x64</Platform> | |
1749 | + </ProjectConfiguration> | |
1750 | <ProjectConfiguration Include="Release|Win32"> | |
1751 | <Configuration>Release</Configuration> | |
1752 | <Platform>Win32</Platform> | |
1753 | </ProjectConfiguration> | |
1754 | + <ProjectConfiguration Include="Release|x64"> | |
1755 | + <Configuration>Release</Configuration> | |
1756 | + <Platform>x64</Platform> | |
1757 | + </ProjectConfiguration> | |
1758 | <ProjectConfiguration Include="Static|Win32"> | |
1759 | <Configuration>Static</Configuration> | |
1760 | <Platform>Win32</Platform> | |
1761 | </ProjectConfiguration> | |
1762 | + <ProjectConfiguration Include="Static|x64"> | |
1763 | + <Configuration>Static</Configuration> | |
1764 | + <Platform>x64</Platform> | |
1765 | + </ProjectConfiguration> | |
1766 | </ItemGroup> | |
1767 | <PropertyGroup Label="Globals"> | |
1768 | <ProjectGuid>{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}</ProjectGuid> | |
1769 | @@ -33,26 +53,51 @@ | |
1770 | <CharacterSet>MultiByte</CharacterSet> | |
1771 | <PlatformToolset>v120</PlatformToolset> | |
1772 | </PropertyGroup> | |
1773 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|x64'" Label="Configuration"> | |
1774 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1775 | + <CharacterSet>MultiByte</CharacterSet> | |
1776 | + <PlatformToolset>v120</PlatformToolset> | |
1777 | + </PropertyGroup> | |
1778 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'" Label="Configuration"> | |
1779 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
1780 | <CharacterSet>MultiByte</CharacterSet> | |
1781 | <PlatformToolset>v120</PlatformToolset> | |
1782 | </PropertyGroup> | |
1783 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|x64'" Label="Configuration"> | |
1784 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1785 | + <CharacterSet>MultiByte</CharacterSet> | |
1786 | + <PlatformToolset>v120</PlatformToolset> | |
1787 | + </PropertyGroup> | |
1788 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | |
1789 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
1790 | <CharacterSet>MultiByte</CharacterSet> | |
1791 | <PlatformToolset>v120</PlatformToolset> | |
1792 | </PropertyGroup> | |
1793 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | |
1794 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1795 | + <CharacterSet>MultiByte</CharacterSet> | |
1796 | + <PlatformToolset>v120</PlatformToolset> | |
1797 | + </PropertyGroup> | |
1798 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="Configuration"> | |
1799 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
1800 | <CharacterSet>MultiByte</CharacterSet> | |
1801 | <PlatformToolset>v120</PlatformToolset> | |
1802 | </PropertyGroup> | |
1803 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="Configuration"> | |
1804 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1805 | + <CharacterSet>MultiByte</CharacterSet> | |
1806 | + <PlatformToolset>v120</PlatformToolset> | |
1807 | + </PropertyGroup> | |
1808 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | |
1809 | <ConfigurationType>StaticLibrary</ConfigurationType> | |
1810 | <CharacterSet>MultiByte</CharacterSet> | |
1811 | <PlatformToolset>v120</PlatformToolset> | |
1812 | </PropertyGroup> | |
1813 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | |
1814 | + <ConfigurationType>StaticLibrary</ConfigurationType> | |
1815 | + <CharacterSet>MultiByte</CharacterSet> | |
1816 | + <PlatformToolset>v120</PlatformToolset> | |
1817 | + </PropertyGroup> | |
1818 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | |
1819 | <ImportGroup Label="ExtensionSettings"> | |
1820 | </ImportGroup> | |
1821 | @@ -60,22 +105,42 @@ | |
1822 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1823 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1824 | </ImportGroup> | |
1825 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|x64'" Label="PropertySheets"> | |
1826 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1827 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1828 | + </ImportGroup> | |
1829 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'" Label="PropertySheets"> | |
1830 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1831 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1832 | </ImportGroup> | |
1833 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|x64'" Label="PropertySheets"> | |
1834 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1835 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1836 | + </ImportGroup> | |
1837 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | |
1838 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1839 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1840 | </ImportGroup> | |
1841 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | |
1842 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1843 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1844 | + </ImportGroup> | |
1845 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'" Label="PropertySheets"> | |
1846 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1847 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1848 | </ImportGroup> | |
1849 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'" Label="PropertySheets"> | |
1850 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1851 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1852 | + </ImportGroup> | |
1853 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | |
1854 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1855 | <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1856 | </ImportGroup> | |
1857 | + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | |
1858 | + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | |
1859 | + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> | |
1860 | + </ImportGroup> | |
1861 | <PropertyGroup Label="UserMacros" /> | |
1862 | <PropertyGroup> | |
1863 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | |
1864 | @@ -110,6 +175,25 @@ | |
1865 | <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1866 | </Lib> | |
1867 | </ItemDefinitionGroup> | |
1868 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | |
1869 | + <ClCompile> | |
1870 | + <Optimization>Disabled</Optimization> | |
1871 | + <AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1872 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1873 | + <ExceptionHandling> | |
1874 | + </ExceptionHandling> | |
1875 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
1876 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
1877 | + <PrecompiledHeader> | |
1878 | + </PrecompiledHeader> | |
1879 | + <WarningLevel>Level3</WarningLevel> | |
1880 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1881 | + <CompileAs>CompileAsCpp</CompileAs> | |
1882 | + </ClCompile> | |
1883 | + <Lib> | |
1884 | + <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1885 | + </Lib> | |
1886 | + </ItemDefinitionGroup> | |
1887 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | |
1888 | <ClCompile> | |
1889 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1890 | @@ -127,6 +211,23 @@ | |
1891 | <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1892 | </Lib> | |
1893 | </ItemDefinitionGroup> | |
1894 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | |
1895 | + <ClCompile> | |
1896 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1897 | + <AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1898 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1899 | + <ExceptionHandling> | |
1900 | + </ExceptionHandling> | |
1901 | + <PrecompiledHeader> | |
1902 | + </PrecompiledHeader> | |
1903 | + <WarningLevel>Level3</WarningLevel> | |
1904 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1905 | + <CompileAs>CompileAsCpp</CompileAs> | |
1906 | + </ClCompile> | |
1907 | + <Lib> | |
1908 | + <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1909 | + </Lib> | |
1910 | + </ItemDefinitionGroup> | |
1911 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|Win32'"> | |
1912 | <ClCompile> | |
1913 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1914 | @@ -145,6 +246,24 @@ | |
1915 | <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1916 | </Lib> | |
1917 | </ItemDefinitionGroup> | |
1918 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Static|x64'"> | |
1919 | + <ClCompile> | |
1920 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> | |
1921 | + <AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1922 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions);DISABLE_NSOCK_PCAP</PreprocessorDefinitions> | |
1923 | + <ExceptionHandling> | |
1924 | + </ExceptionHandling> | |
1925 | + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
1926 | + <PrecompiledHeader> | |
1927 | + </PrecompiledHeader> | |
1928 | + <WarningLevel>Level3</WarningLevel> | |
1929 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1930 | + <CompileAs>CompileAsCpp</CompileAs> | |
1931 | + </ClCompile> | |
1932 | + <Lib> | |
1933 | + <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1934 | + </Lib> | |
1935 | + </ItemDefinitionGroup> | |
1936 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|Win32'"> | |
1937 | <ClCompile> | |
1938 | <AdditionalOptions>/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions)</AdditionalOptions> | |
1939 | @@ -166,9 +285,47 @@ | |
1940 | <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1941 | </Lib> | |
1942 | </ItemDefinitionGroup> | |
1943 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoPcap|x64'"> | |
1944 | + <ClCompile> | |
1945 | + <AdditionalOptions>/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions)</AdditionalOptions> | |
1946 | + <Optimization>Disabled</Optimization> | |
1947 | + <AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1948 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1949 | + <ExceptionHandling> | |
1950 | + </ExceptionHandling> | |
1951 | + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | |
1952 | + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | |
1953 | + <PrecompiledHeader> | |
1954 | + </PrecompiledHeader> | |
1955 | + <WarningLevel>Level3</WarningLevel> | |
1956 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1957 | + <CompileAs>CompileAsCpp</CompileAs> | |
1958 | + </ClCompile> | |
1959 | + <Lib> | |
1960 | + <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1961 | + </Lib> | |
1962 | + </ItemDefinitionGroup> | |
1963 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|Win32'"> | |
1964 | <ClCompile> | |
1965 | <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" | |
1966 | +/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions)</AdditionalOptions> | |
1967 | + <AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1968 | + <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | |
1969 | + <ExceptionHandling> | |
1970 | + </ExceptionHandling> | |
1971 | + <PrecompiledHeader> | |
1972 | + </PrecompiledHeader> | |
1973 | + <WarningLevel>Level3</WarningLevel> | |
1974 | + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | |
1975 | + <CompileAs>CompileAsCpp</CompileAs> | |
1976 | + </ClCompile> | |
1977 | + <Lib> | |
1978 | + <OutputFile>$(OutDir)nsock.lib</OutputFile> | |
1979 | + </Lib> | |
1980 | + </ItemDefinitionGroup> | |
1981 | + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoPcap|x64'"> | |
1982 | + <ClCompile> | |
1983 | + <AdditionalOptions>/D "_CRT_SECURE_NO_DEPRECATE" | |
1984 | /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions)</AdditionalOptions> | |
1985 | <AdditionalIncludeDirectories>..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | |
1986 | <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |