Merge libpng 1.6.2 into the trunk.

[wxWidgets.git] / src / png / projects / vstudio / zlib / zlib.vcxproj

diff --git a/src/png/projects/vstudio/zlib/zlib.vcxproj b/src/png/projects/vstudio/zlib/zlib.vcxproj
index 45dbeb57d2c84a6651e0378536bb8e4cd46fab20..63562556b535424cbfb0db7fda3a488aa33b9a78 100644 (file)
--- a/src/png/projects/vstudio/zlib/zlib.vcxproj
+++ b/src/png/projects/vstudio/zlib/zlib.vcxproj
@@ -32,10 +32,12 @@
     <ClCompile Include="$(ZLibSrcDir)\zutil.c" />\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{60F89955-91C6-3A36-8000-13C592FEC2DF}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
+    <RootNamespace>zlib</RootNamespace>\r
   </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="$(SolutionDir)\zlib.props" />\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
   </PropertyGroup>\r
@@ -84,12 +86,13 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <Optimization>Disabled</Optimization>\r
       <BrowseInformation>true</BrowseInformation>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
     </ClCompile>\r
     <Link>\r
       <TargetMachine>MachineX86</TargetMachine>\r
@@ -99,11 +102,13 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>TurnOffAllWarnings</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <Optimization>Disabled</Optimization>\r
       <BrowseInformation>true</BrowseInformation>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     </ClCompile>\r
     <Link>\r
       <TargetMachine>MachineX86</TargetMachine>\r
@@ -123,6 +128,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
       <TargetMachine>MachineX86</TargetMachine>\r
@@ -144,30 +150,19 @@
       <BrowseInformation>true</BrowseInformation>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
       <TargetMachine>MachineX86</TargetMachine>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <Lib>\r
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>\r
     </Lib>\r
   </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-    </ClCompile>\r
-    <Link>\r
-      <TargetMachine>MachineX86</TargetMachine>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r