[GNUnet-SVN] r36394 - libmicrohttpd/w32/VS2013

[gnunet]

Author: Karlson2k
Date: 2015-10-01 14:37:53 +0200 (Thu, 01 Oct 2015)
New Revision: 36394

Modified:
   libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj
Log:
Clarify and simplify W32 VS project settings

Modified: libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj
===================================================================
--- libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj      2015-09-30 22:23:34 UTC 
(rev 36393)
+++ libmicrohttpd/w32/VS2013/libmicrohttpd.vcxproj      2015-10-01 12:37:53 UTC 
(rev 36394)
@@ -202,7 +202,12 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" 
Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <!-- WinXP = 0; Vista = 1; Win7 = 2; Win8 = 3...
+         Only 0 and 1 are used currently -->
+    <TargetOSLevel 
Condition="'$(PlatformToolset)'=='v120_xp'">0</TargetOSLevel>
+    <TargetOSLevel 
Condition="'$(PlatformToolset)'!='v120_xp'">1</TargetOSLevel>
+  </PropertyGroup>
   <PropertyGroup>
     
<IncludePath>$(SolutionDir)..\..\src\include;$(SolutionDir);$(IncludePath)</IncludePath>
     <CustomBuildBeforeTargets>ResourceCompile</CustomBuildBeforeTargets>
@@ -215,30 +220,14 @@
     <IntDir>$(SolutionDir)$(ProjectName)\$(Configuration)\$(Platform)\</IntDir>
     <OutDir>$(SolutionDir)\Output\$(Platform)\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug-static'">
-    <TargetName>$(ProjectName)_d</TargetName>
+  <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
+    <TargetName 
Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)_d</TargetName>
+    <TargetName 
Condition="'$(UseDebugLibraries)'!='true'">$(ProjectName)</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug-static-xp'">
-    <TargetName>$(ProjectName)_d</TargetName>
+  <PropertyGroup Condition="'$(ConfigurationType)'=='DynamicLibrary'">
+    <TargetName 
Condition="'$(UseDebugLibraries)'=='true'">$(ProjectName)-dll_d</TargetName>
+    <TargetName 
Condition="'$(UseDebugLibraries)'!='true'">$(ProjectName)-dll</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'">
-    <TargetName>$(ProjectName)-dll_d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug-dll-xp'">
-    <TargetName>$(ProjectName)-dll_d</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release-static'">
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release-static-xp'">
-    <TargetName>$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release-dll'">
-    <TargetName>$(ProjectName)-dll</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release-dll-xp'">
-    <TargetName>$(ProjectName)-dll</TargetName>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -260,7 +249,7 @@
       <Inputs>$(SolutionDir)\..\..\src\include\microhttpd.h</Inputs>
     </CustomBuildStep>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(PlatformToolset)'!='v120_xp'">
+  <ItemDefinitionGroup Condition="'$(TargetOSLevel)'&gt;'0'">
     <ClCompile>
       
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -273,7 +262,7 @@
       <AdditionalOptions>/SUBSYSTEM:WINDOWS,6.00 
%(AdditionalOptions)</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp' And 
'$(Platform)'=='Win32'">
+  <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And 
'$(Platform)'=='Win32'">
     <ClCompile>
       
<PreprocessorDefinitions>_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -286,7 +275,7 @@
       <AdditionalOptions>/SUBSYSTEM:WINDOWS,5.01 
%(AdditionalOptions)</AdditionalOptions>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(PlatformToolset)'=='v120_xp' And 
'$(Platform)'=='x64'">
+  <ItemDefinitionGroup Condition="'$(TargetOSLevel)'=='0' And 
'$(Platform)'=='x64'">
     <ClCompile>
       
<PreprocessorDefinitions>_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
@@ -346,56 +335,18 @@
       
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static'">
+  <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary 
Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary 
Condition="'$(UseDebugLibraries)'!='true'">MultiThreaded</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static-xp'">
+  <ItemDefinitionGroup  Condition="'$(ConfigurationType)'=='DynamicLibrary'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary 
Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary 
Condition="'$(UseDebugLibraries)'!='true'">MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-dll'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-dll-xp'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug-static-xp'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release-static'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release-static-xp'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release-dll'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release-dll-xp'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>