projects / platform / upstream / zlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63ba758)
Simplify contrib/vstudio/vc10 with 'd' suffix.
authorFredrik Orderud <forderud@gmail.com>
Tue, 11 Dec 2012 20:44:56 +0000 (21:44 +0100)
committerMark Adler <madler@alumni.caltech.edu>
Sun, 24 Feb 2013 07:44:00 +0000 (23:44 -0800)
contrib/vstudio/vc10/zlibvc.vcxproj patch | blob | history

diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 97016a5..6ff9ddb 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -180,10 +180,10 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapid</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapid</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>\r
   </PropertyGroup>\r
@@ -220,18 +220,14 @@
     <Link>\r
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
     </Link>\r
     <PreBuildEvent>\r
       <Command>cd ..\..\masmx86\r
@@ -272,18 +268,14 @@ bld_ml32.bat</Command>
     </ResourceCompile>\r
     <Link>\r
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>\r
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -321,18 +313,14 @@ bld_ml32.bat</Command>
     <Link>\r
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
     </Link>\r
     <PreBuildEvent>\r
       <Command>cd ..\..\masmx86\r
@@ -371,15 +359,11 @@ bld_ml32.bat</Command>
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>\r
       <SubSystem>Windows</SubSystem>\r
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
     <PreBuildEvent>\r
@@ -463,15 +447,11 @@ bld_ml64.bat</Command>
       <Culture>0x040c</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>\r
       <SubSystem>Windows</SubSystem>\r
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -554,15 +534,11 @@ bld_ml64.bat</Command>
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
       <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>\r
       <GenerateMapFile>true</GenerateMapFile>\r
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>\r
       <SubSystem>Windows</SubSystem>\r
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
     <PreBuildEvent>\r
Domain: System / Base;