[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36391 - libmicrohttpd/w32/VS2013
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36391 - libmicrohttpd/w32/VS2013 |
Date: |
Wed, 30 Sep 2015 23:08:02 +0200 |
Author: Karlson2k
Date: 2015-09-30 23:08:02 +0200 (Wed, 30 Sep 2015)
New Revision: 36391
Modified:
libmicrohttpd/w32/VS2013/libmicrohttpd.sln
libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj
Log:
Fix W32 VS project files
Modified: libmicrohttpd/w32/VS2013/libmicrohttpd.sln
===================================================================
--- libmicrohttpd/w32/VS2013/libmicrohttpd.sln 2015-09-30 21:07:58 UTC (rev
36390)
+++ libmicrohttpd/w32/VS2013/libmicrohttpd.sln 2015-09-30 21:08:02 UTC (rev
36391)
@@ -40,8 +40,8 @@
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-dll-xp|x64.Build.0
= Debug-dll-xp|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.ActiveCfg =
Debug-static|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|Win32.Build.0 =
Debug-static|Win32
-
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.ActiveCfg =
Release-static|x64
- {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.Build.0
= Release-static|x64
+
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.ActiveCfg =
Debug-static|x64
+ {9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static|x64.Build.0
= Debug-static|x64
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.ActiveCfg =
Debug-static-xp|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|Win32.Build.0 =
Debug-static-xp|Win32
{9CFB0342-A9E7-483E-BEE5-A1DE22584C5A}.Debug-static-xp|x64.ActiveCfg =
Debug-static-xp|x64
@@ -72,8 +72,8 @@
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-dll-xp|x64.Build.0
= Debug-dll|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.ActiveCfg =
Debug-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|Win32.Build.0 =
Debug-static|Win32
-
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.ActiveCfg =
Release-static|x64
- {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.Build.0
= Release-static|x64
+
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.ActiveCfg =
Debug-static|x64
+ {310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static|x64.Build.0
= Debug-static|x64
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.ActiveCfg =
Debug-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|Win32.Build.0 =
Debug-static|Win32
{310F39BD-A2D6-44FF-8344-37ADD0524CBD}.Debug-static-xp|x64.ActiveCfg =
Debug-static|x64
Modified: libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj
===================================================================
--- libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj 2015-09-30 21:07:58 UTC
(rev 36390)
+++ libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj 2015-09-30 21:08:02 UTC
(rev 36391)
@@ -244,7 +244,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
-
<PreprocessorDefinitions>WIN32;BUILDING_MHD_LIB;MHD_W32LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>WIN32;BUILDING_MHD_LIB;_UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -273,7 +273,7 @@
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00
%(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp'">
+ <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp' And
'$(Platform)'=='Win32'">
<ClCompile>
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@@ -286,9 +286,22 @@
<AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01
%(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp' And
'$(Platform)'=='x64'">
+ <ClCompile>
+
<PreprocessorDefinitions>_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
+ <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02
%(AdditionalOptions)</AdditionalOptions>
+ </Link>
+ <Lib>
+ <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
+ <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.02
%(AdditionalOptions)</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
<ClCompile>
-
<PreprocessorDefinitions>_LIB;BUILDING_MHD_LIB;MHD_W32LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>_LIB;MHD_W32LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Lib>
<AdditionalDependencies>Ws2_32.lib</AdditionalDependencies>
@@ -300,7 +313,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'">
<ClCompile>
-
<PreprocessorDefinitions>_USRDLL;BUILDING_MHD_LIB;MHD_W32DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>_USRDLL;MHD_W32DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -312,7 +325,7 @@
<SmallerTypeCheck>true</SmallerTypeCheck>
</ClCompile>
<ResourceCompile>
-
<PreprocessorDefinitions>_DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(UseDebugLibraries)'!='true'">
@@ -330,7 +343,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<ResourceCompile>
-
<PreprocessorDefinitions>NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static'">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36391 - libmicrohttpd/w32/VS2013,
gnunet <=