Add zlib to libcups on Windows.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10838 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/vcnet/config.h b/vcnet/config.h
index bd73518e2d6fc3d8aa24a253318869993d6089b9..80d7f5707405772065898fb26db5e02daa53cbe8 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -200,7 +200,7 @@
  * Do we have ZLIB?
  */
 
-/* #undef HAVE_LIBZ */
+#define HAVE_LIBZ 1
 
 
 /*

diff --git a/vcnet/libcups2.vcproj b/vcnet/libcups2.vcproj
index 6e12bdad8c601dfbf891692f2eb07452c40eda5b..b20812256ec965c84262327f1805a9eddaf3d763 100644 (file)
--- a/vcnet/libcups2.vcproj
+++ b/vcnet/libcups2.vcproj
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"\r
-                               PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -67,7 +67,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/NODEFAULTLIB:libcmt"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="..\cups\libcups2.def"\r
@@ -129,7 +129,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -150,7 +150,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="..\cups\libcups2.def"\r
@@ -209,7 +209,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories="..\vcnet;..;..\vcnet\regex"\r
-                               PreprocessorDefinitions="WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -228,7 +228,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/NODEFAULTLIB:libcmt"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="..\cups\libcups2.def"\r
@@ -293,7 +293,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="1"\r
                                AdditionalIncludeDirectories="..\vcnet,.."\r
-                               PreprocessorDefinitions="WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="ZLIB_WINAPI;WIN32;DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -311,7 +311,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib advapi32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib zlibwapi.lib"\r
                                OutputFile="$(OutDir)\libcups2.dll"\r
                                LinkIncremental="1"\r
                                ModuleDefinitionFile="..\cups\libcups2.def"\r