diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-09-30 21:08:02 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-09-30 21:08:02 +0000 |
commit | 0cb86aaffa4b05733d07a686829a02b65daaf41b (patch) | |
tree | 3fe46a11b45a15ad9985611afb538762c609b346 /w32 | |
parent | afecad969c74a4346782c4b5e3c01b28ca66542c (diff) | |
download | libmicrohttpd-0cb86aaffa4b05733d07a686829a02b65daaf41b.tar.gz libmicrohttpd-0cb86aaffa4b05733d07a686829a02b65daaf41b.zip |
Fix W32 VS project files
Diffstat (limited to 'w32')
-rw-r--r-- | w32/VS2013/libmicrohttpd.sln | 8 | ||||
-rw-r--r-- | w32/VS2013/libmicrohttpd.vcxproj | 25 |
2 files changed, 23 insertions, 10 deletions
diff --git a/w32/VS2013/libmicrohttpd.sln b/w32/VS2013/libmicrohttpd.sln index 3a18af3d..f1b0f911 100644 --- a/w32/VS2013/libmicrohttpd.sln +++ b/w32/VS2013/libmicrohttpd.sln | |||
@@ -40,8 +40,8 @@ Global | |||
40 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.Build.0 = Debug-dll-xp|x64 | 40 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.Build.0 = Debug-dll-xp|x64 |
41 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.ActiveCfg = Debug-static|Win32 | 41 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.ActiveCfg = Debug-static|Win32 |
42 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.Build.0 = Debug-static|Win32 | 42 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.Build.0 = Debug-static|Win32 |
43 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.ActiveCfg = Release-static|x64 | 43 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.ActiveCfg = Debug-static|x64 |
44 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.Build.0 = Release-static|x64 | 44 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.Build.0 = Debug-static|x64 |
45 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.ActiveCfg = Debug-static-xp|Win32 | 45 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.ActiveCfg = Debug-static-xp|Win32 |
46 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.Build.0 = Debug-static-xp|Win32 | 46 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.Build.0 = Debug-static-xp|Win32 |
47 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.ActiveCfg = Debug-static-xp|x64 | 47 | {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.ActiveCfg = Debug-static-xp|x64 |
@@ -72,8 +72,8 @@ Global | |||
72 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.Build.0 = Debug-dll|x64 | 72 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.Build.0 = Debug-dll|x64 |
73 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.ActiveCfg = Debug-static|Win32 | 73 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.ActiveCfg = Debug-static|Win32 |
74 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.Build.0 = Debug-static|Win32 | 74 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.Build.0 = Debug-static|Win32 |
75 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.ActiveCfg = Release-static|x64 | 75 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.ActiveCfg = Debug-static|x64 |
76 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.Build.0 = Release-static|x64 | 76 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.Build.0 = Debug-static|x64 |
77 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.ActiveCfg = Debug-static|Win32 | 77 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.ActiveCfg = Debug-static|Win32 |
78 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.Build.0 = Debug-static|Win32 | 78 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.Build.0 = Debug-static|Win32 |
79 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.ActiveCfg = Debug-static|x64 | 79 | {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.ActiveCfg = Debug-static|x64 |
diff --git a/w32/VS2013/libmicrohttpd.vcxproj b/w32/VS2013/libmicrohttpd.vcxproj index f15b4b14..e4cd88be 100644 --- a/w32/VS2013/libmicrohttpd.vcxproj +++ b/w32/VS2013/libmicrohttpd.vcxproj | |||
@@ -244,7 +244,7 @@ | |||
244 | <PrecompiledHeader>NotUsing</PrecompiledHeader> | 244 | <PrecompiledHeader>NotUsing</PrecompiledHeader> |
245 | <WarningLevel>Level3</WarningLevel> | 245 | <WarningLevel>Level3</WarningLevel> |
246 | <Optimization>Disabled</Optimization> | 246 | <Optimization>Disabled</Optimization> |
247 | <PreprocessorDefinitions>WIN32;BUILDING_MHD_LIB;MHD_W32LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 247 | <PreprocessorDefinitions>WIN32;BUILDING_MHD_LIB;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
248 | <DisableSpecificWarnings>4996</DisableSpecificWarnings> | 248 | <DisableSpecificWarnings>4996</DisableSpecificWarnings> |
249 | <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors> | 249 | <TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors> |
250 | <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | 250 | <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> |
@@ -273,7 +273,7 @@ | |||
273 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)</AdditionalOptions> | 273 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 %(AdditionalOptions)</AdditionalOptions> |
274 | </Lib> | 274 | </Lib> |
275 | </ItemDefinitionGroup> | 275 | </ItemDefinitionGroup> |
276 | <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp'"> | 276 | <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp' And '$(Platform)'=='Win32'"> |
277 | <ClCompile> | 277 | <ClCompile> |
278 | <PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 278 | <PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
279 | </ClCompile> | 279 | </ClCompile> |
@@ -286,9 +286,22 @@ | |||
286 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> | 286 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 %(AdditionalOptions)</AdditionalOptions> |
287 | </Lib> | 287 | </Lib> |
288 | </ItemDefinitionGroup> | 288 | </ItemDefinitionGroup> |
289 | <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp' And '$(Platform)'=='x64'"> | ||
290 | <ClCompile> | ||
291 | <PreprocessorDefinitions>_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
292 | </ClCompile> | ||
293 | <Link> | ||
294 | <MinimumRequiredVersion>5.02</MinimumRequiredVersion> | ||
295 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> | ||
296 | </Link> | ||
297 | <Lib> | ||
298 | <MinimumRequiredVersion>5.02</MinimumRequiredVersion> | ||
299 | <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02 %(AdditionalOptions)</AdditionalOptions> | ||
300 | </Lib> | ||
301 | </ItemDefinitionGroup> | ||
289 | <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> | 302 | <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'"> |
290 | <ClCompile> | 303 | <ClCompile> |
291 | <PreprocessorDefinitions>_LIB;BUILDING_MHD_LIB;MHD_W32LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 304 | <PreprocessorDefinitions>_LIB;MHD_W32LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
292 | </ClCompile> | 305 | </ClCompile> |
293 | <Lib> | 306 | <Lib> |
294 | <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies> | 307 | <AdditionalDependencies>Ws2_32.lib</AdditionalDependencies> |
@@ -300,7 +313,7 @@ | |||
300 | </ItemDefinitionGroup> | 313 | </ItemDefinitionGroup> |
301 | <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> | 314 | <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'"> |
302 | <ClCompile> | 315 | <ClCompile> |
303 | <PreprocessorDefinitions>_USRDLL;BUILDING_MHD_LIB;MHD_W32DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 316 | <PreprocessorDefinitions>_USRDLL;MHD_W32DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
304 | </ClCompile> | 317 | </ClCompile> |
305 | <Link> | 318 | <Link> |
306 | <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 319 | <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
@@ -312,7 +325,7 @@ | |||
312 | <SmallerTypeCheck>true</SmallerTypeCheck> | 325 | <SmallerTypeCheck>true</SmallerTypeCheck> |
313 | </ClCompile> | 326 | </ClCompile> |
314 | <ResourceCompile> | 327 | <ResourceCompile> |
315 | <PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 328 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
316 | </ResourceCompile> | 329 | </ResourceCompile> |
317 | </ItemDefinitionGroup> | 330 | </ItemDefinitionGroup> |
318 | <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'"> | 331 | <ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'"> |
@@ -330,7 +343,7 @@ | |||
330 | <OptimizeReferences>true</OptimizeReferences> | 343 | <OptimizeReferences>true</OptimizeReferences> |
331 | </Link> | 344 | </Link> |
332 | <ResourceCompile> | 345 | <ResourceCompile> |
333 | <PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 346 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
334 | </ResourceCompile> | 347 | </ResourceCompile> |
335 | </ItemDefinitionGroup> | 348 | </ItemDefinitionGroup> |
336 | <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static'"> | 349 | <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static'"> |