]> git.lizzy.rs Git - zlib.git/commitdiff
projects / zlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 41a18e1)
Fix contrib/vstudio project link errors [Mohanathas].
authorMark Adler <madler@alumni.caltech.edu>
Sun, 4 Mar 2012 17:46:25 +0000 (09:46 -0800)
committerMark Adler <madler@alumni.caltech.edu>
Sun, 4 Mar 2012 17:46:25 +0000 (09:46 -0800)
contrib/vstudio/readme.txt patch | blob | history
contrib/vstudio/vc10/testzlibdll.vcxproj patch | blob | history
contrib/vstudio/vc10/zlib.rc patch | blob | history
contrib/vstudio/vc10/zlibvc.def patch | blob | history
contrib/vstudio/vc10/zlibvc.vcxproj patch | blob | history
contrib/vstudio/vc9/zlib.rc patch | blob | history
contrib/vstudio/vc9/zlibvc.def patch | blob | history

diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt
index 904888ba3931ff864067ab741dbee58e07827d54..59c8b8b4707104c1e7421d826bd4d1e8e43cd972 100644 (file)
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,8 +1,8 @@
-Building instructions for the DLL versions of Zlib 1.2.4\r
+Building instructions for the DLL versions of Zlib 1.2.7\r
 ========================================================\r
 \r
 This directory contains projects that build zlib and minizip using\r
-Microsoft Visual C++ 9.0/10.0, and Visual C++ .\r
+Microsoft Visual C++ 9.0/10.0.\r
 \r
 You don't need to build these projects yourself. You can download the\r
 binaries from:\r
@@ -10,9 +10,6 @@ binaries from:
 \r
 More information can be found at this site.\r
 \r
-first compile assembly code by running\r
-bld_ml64.bat in contrib\masmx64\r
-bld_ml32.bat in contrib\masmx86\r
 \r
 \r
 \r
@@ -20,13 +17,16 @@ bld_ml32.bat in contrib\masmx86
 Build instructions for Visual Studio 2008 (32 bits or 64 bits)\r
 --------------------------------------------------------------\r
 - Uncompress current zlib, including all contrib/* files\r
-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0\r
+- Compile assembly code (with Visual Studio Command Prompt) by running:\r
+   bld_ml64.bat (in contrib\masmx64)\r
+   bld_ml32.bat (in contrib\masmx86)\r
+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008\r
 - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"\r
 \r
 Build instructions for Visual Studio 2010 (32 bits or 64 bits)\r
 --------------------------------------------------------------\r
 - Uncompress current zlib, including all contrib/* files\r
-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0\r
+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010\r
 \r
 \r
 Important\r
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj b/contrib/vstudio/vc10/testzlibdll.vcxproj
index 2d628158b477c06c12514bb06ec9d88bca81fe69..bcb08ff95d33c3270c4dd821b63ab3f36dcccee4 100644 (file)
--- a/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ b/contrib/vstudio/vc10/testzlibdll.vcxproj
@@ -139,7 +139,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>\r
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>\r
       <SubSystem>Console</SubSystem>\r
@@ -169,7 +169,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>\r
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -200,7 +200,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>\r
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>\r
       <SubSystem>Console</SubSystem>\r
@@ -227,7 +227,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>\r
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>\r
       <SubSystem>Console</SubSystem>\r
@@ -257,7 +257,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>\r
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -288,7 +288,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>\r
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 9c71a6a219ecc3889a38fdee7e1eb6bf8baa60b0..8eca4dbbc1b917c9c6df0c60463ac6e632463542 100644 (file)
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 \r
 #define IDR_VERSION1  1\r
 IDR_VERSION1   VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE\r
-  FILEVERSION   1.2.7,1\r
-  PRODUCTVERSION 1.2.7,1\r
+  FILEVERSION   1.2.7,0\r
+  PRODUCTVERSION 1.2.7,0\r
   FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK\r
   FILEFLAGS    0\r
   FILEOS       VOS_DOS_WINDOWS32\r
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index b4bb8f615cdd76eb935cbdfd04987006a411da0b..d39a1d246410c0f75a7de6305ba87de3cc081e08 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY\r
 ; zlib data compression and ZIP file I/O library\r
 \r
-VERSION                1.24\r
+VERSION                1.2.7\r
 \r
 EXPORTS\r
         adler32                                  @1\r
@@ -132,5 +132,6 @@ EXPORTS
 \r
 ; zlib1 v1.2.6 added:\r
         gzgetc_                                 @161\r
+        gzflags                                 @162\r
         inflateResetKeep                        @163\r
-       deflateResetKeep                        @164
+        deflateResetKeep                        @164\r
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj
index 98623989343e437cec320e767cf023bcc0ce579a..9218fdce92093635415c3bb518141848354f8a3d 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.vcxproj
+++ b/contrib/vstudio/vc10/zlibvc.vcxproj
@@ -180,6 +180,12 @@
     <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)'=='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)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <Midl>\r
@@ -227,6 +233,10 @@
       </DataExecutionPrevention>\r
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
     </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx86\r
+bld_ml32.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">\r
     <Midl>\r
@@ -324,6 +334,10 @@
       </DataExecutionPrevention>\r
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
     </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx86\r
+bld_ml32.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <Midl>\r
@@ -368,6 +382,10 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\contrib\masmx64\r
+bld_ml64.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">\r
     <Midl>\r
@@ -547,6 +565,10 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>\r
       <TargetMachine>MachineX64</TargetMachine>\r
     </Link>\r
+    <PreBuildEvent>\r
+      <Command>cd ..\..\masmx64\r
+bld_ml64.bat</Command>\r
+    </PreBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">\r
     <Midl>\r
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 9c71a6a219ecc3889a38fdee7e1eb6bf8baa60b0..8eca4dbbc1b917c9c6df0c60463ac6e632463542 100644 (file)
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 \r
 #define IDR_VERSION1  1\r
 IDR_VERSION1   VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE\r
-  FILEVERSION   1.2.7,1\r
-  PRODUCTVERSION 1.2.7,1\r
+  FILEVERSION   1.2.7,0\r
+  PRODUCTVERSION 1.2.7,0\r
   FILEFLAGSMASK        VS_FFI_FILEFLAGSMASK\r
   FILEFLAGS    0\r
   FILEOS       VOS_DOS_WINDOWS32\r
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index b4bb8f615cdd76eb935cbdfd04987006a411da0b..0c6d77428ac4863b2a21afa87f5b08bf2c9a59bf 100644 (file)
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -1,7 +1,7 @@
 LIBRARY\r
 ; zlib data compression and ZIP file I/O library\r
 \r
-VERSION                1.24\r
+VERSION                1.2.7\r
 \r
 EXPORTS\r
         adler32                                  @1\r
@@ -132,5 +132,6 @@ EXPORTS
 \r
 ; zlib1 v1.2.6 added:\r
         gzgetc_                                 @161\r
+        gzflags                                 @162\r
         inflateResetKeep                        @163\r
        deflateResetKeep                        @164
A massively spiffy yet delicately unobtrusive compression library.