FS-11087: [Build-System] Use shared zlib library on Windows.

diff --git a/libs/win32/libpng/libpng.vcxproj b/libs/win32/libpng/libpng.vcxproj
index 0fcf409fab78589ff4548c0c803a10345d99ea9d..a14b4b3dd9a8244b6b1fcafcd86a61ddd2b7f4b1 100644 (file)
--- a/libs/win32/libpng/libpng.vcxproj
+++ b/libs/win32/libpng/libpng.vcxproj
@@ -24,8 +24,8 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libpng</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(ProjectDir)..\..\..\w32\zlib.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)w32\zlib.props" Condition=" '$(zlibImported)' == '' "/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>

diff --git a/w32/curl.props b/w32/curl.props
index 791d967adafb1b03ae355f8c4a938ea6420cce89..2b2d7b0efc754f79cbc77cedaf80168a8ed7a6b5 100644 (file)
--- a/w32/curl.props
+++ b/w32/curl.props
@@ -4,7 +4,7 @@
     <Import Project="curl-version.props" Condition=" '$(curlVersionImported)' == '' "/>\r
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />\r
     <Import Project="openssl.props" />\r
-    <Import Project="zlib.props" />\r
+    <Import Project="zlib.props" Condition=" '$(zlibImported)' == '' "/>\r
   </ImportGroup>\r
   <PropertyGroup>\r
     <CurlPropsImported>true</CurlPropsImported>\r

diff --git a/w32/zlib.props b/w32/zlib.props
index 47d64d27a1e64f6ad9988c8b1170047c52377d79..0c50ebb96f8bcee8614be312ece981797ce3b525 100644 (file)
--- a/w32/zlib.props
+++ b/w32/zlib.props
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <zlibImported>true</zlibImported>
+  </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="zlib-version.props" Condition=" '$(zlibVersionImported)' == '' "/>
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
@@ -8,10 +11,12 @@
   <PropertyGroup>
     <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>
     <LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>
+    <LibraryFileName Condition=" '$(LibraryConfiguration)' == 'Debug' ">zlibd</LibraryFileName> 
+    <LibraryFileName Condition=" '$(LibraryConfiguration)' == 'Release' ">zlib</LibraryFileName> 
   </PropertyGroup>
 
   <PropertyGroup Label="UserMacros">
-    <zliblibDir>$(BaseDir)libs\zlib-$(zlibVersion)</zliblibDir>
+    <zlibLibDir>$(BaseDir)libs\zlib-$(zlibVersion)</zlibLibDir>
   </PropertyGroup>
 
   <!-- 
@@ -37,7 +42,7 @@
   <Target Name="zlibBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
            package="http://files.freeswitch.org/windows/packages/zlib/$(zlibVersion)/zlib-$(zlibVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
-           expectfileordirectory="$(zliblibDir)\binaries\$(Platform)\$(LibraryConfiguration)\zlib.lib"
+           expectfileordirectory="$(zlibLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib\$(LibraryFileName).lib"
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs\"
@@ -46,21 +51,31 @@
   <Target Name="zlibHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
            package="http://files.freeswitch.org/windows/packages/zlib/$(zlibVersion)/zlib-$(zlibVersion)-headers.zip"
-           expectfileordirectory="$(zliblibDir)\include\zlib.h" 
+           expectfileordirectory="$(zlibLibDir)\include\zlib.h" 
            outputfolder=""
            outputfilename="" 
            extractto="$(BaseDir)libs\"
       />
   </Target> 
 
+  <Target Name="zlibcopyTarget" BeforeTargets="CustomBuild" DependsOnTargets="zlibBinariesDownloadTarget">  
+      <ItemGroup>  
+          <zlibFiles Include="$(zlibLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\bin\*.dll" />
+      </ItemGroup>  
+      <Copy Condition="!exists('$(BaseDir)$(Platform)\$(LibraryConfiguration)\$(LibraryFileName).dll')"
+          SourceFiles="@(zlibFiles)"  
+          DestinationFiles="@(zlibFiles->'$(BaseDir)$(Platform)\$(LibraryConfiguration)\%(Filename)%(Extension)')"
+      />  
+  </Target>   
+
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_ZLIB;ZLIB_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(LibraryConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(LibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file