Use static zlib on Windows build

The windows dependencies submodule now includes the static version of
zlib when building Graphviz. Some third party DLLs might still require a
zlib.dll however, but this will be added when required.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da2f9ed396fab471d26bcca16adcfb33934c8c8c..65642ad57158bea3f2628ede2b6202129c37bc10 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,7 +85,6 @@ if (WIN32)
 
     # Find DLLs on Windows
     find_file(EXPAT_RUNTIME_LIBRARIES NAMES libexpat.dll expat.dll)
-    find_file(ZLIB_RUNTIME_LIBRARIES NAMES zlib1.dll zlib.dll)
 endif()
 
 # ============================ Set Graphviz version ============================

diff --git a/cmake/FindLTDL.cmake b/cmake/FindLTDL.cmake
index ed0ff7f87ee5093e87122866eebc4314d0f28ce1..8c6ff74ecef6ee2b8d7d6075a882b4e6c5909516 100644 (file)
--- a/cmake/FindLTDL.cmake
+++ b/cmake/FindLTDL.cmake
@@ -1,6 +1,6 @@
 find_path(LTDL_INCLUDE_DIR ltdl.h)
 find_library(LTDL_LIBRARY NAMES libtldl ltdl)
-find_file(LTDL_RUNTIME_LIBRARY libltdl3.dll)
+find_file(LTDL_RUNTIME_LIBRARY NAMES libltdl3.dll ltdl.dll)
 
 include(FindPackageHandleStandardArgs)
 if (WIN32)

diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj
index 6c67d00f8c401e5a052a33e00a22f6516e58298e..39d719664ef8ff0d4e2ee105de327ecd47595939 100644 (file)
--- a/cmd/smyrna/smyrna.vcxproj
+++ b/cmd/smyrna/smyrna.vcxproj
@@ -64,7 +64,7 @@
       <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>getopt.lib;ast.lib;atk-1.0.lib;libcairo-2.lib;cdt.lib;cgraph.lib;expr.lib;fontconfig.lib;freetype.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;jpeg.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;sfio.lib;topfish.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;ast.lib;atk-1.0.lib;libcairo-2.lib;cdt.lib;cgraph.lib;expr.lib;fontconfig.lib;freetype.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;jpeg.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;sfio.lib;topfish.lib;vmalloc.lib;xdot.lib;xml2.lib;zlib.lib;gvc.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -76,7 +76,6 @@
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll
@@ -110,7 +109,7 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt;
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>getopt.lib;ast.lib;atk-1.0.lib;libcairo-2.lib;cdt.lib;cgraph.lib;expr.lib;fontconfig.lib;freetype.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;jpeg.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;sfio.lib;topfish.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib</AdditionalDependencies>
+      <AdditionalDependencies>getopt.lib;ast.lib;atk-1.0.lib;libcairo-2.lib;cdt.lib;cgraph.lib;expr.lib;fontconfig.lib;freetype.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;jpeg.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;sfio.lib;topfish.lib;vmalloc.lib;xdot.lib;xml2.lib;zlib.lib;gvc.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>No</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -124,7 +123,6 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt;
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll
@@ -235,4 +233,4 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt;
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index f4d007bd7e10472403ce9985779fd350070799e9..c49065d3bfba47f054c3014d9d62e68f7fe20efc 100644 (file)
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -69,7 +69,7 @@
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
-      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;libexpat.lib;z.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;libexpat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
@@ -85,8 +85,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libltdl3.dll $(OutDir)libltdl3.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\rxspencer.dll $(OutDir)rxspencer.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll</Command>
+copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -108,7 +107,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zli
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
-      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;libexpat.lib;z.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cdt.lib;cgraph.lib;ltdl.lib;xml2.lib;libexpat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
@@ -124,8 +123,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libltdl3.dll $(OutDir)libltdl3.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\rxspencer.dll $(OutDir)rxspencer.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll</Command>
+copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libexpat.dll $(OutDir)libexpat.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -239,4 +237,4 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zli
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 38215ea2e980660f8d5a5149ace07fe5fcc229ed..68f894e6d6682a08bfd632f452924177a94de438 100644 (file)
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -109,7 +109,6 @@ if (WIN32)
             ${EXPAT_RUNTIME_LIBRARIES}
             ${LTDL_RUNTIME_LIBRARIES}
             ${RXSPENCER_RUNTIME_LIBRARIES}
-            ${ZLIB_RUNTIME_LIBRARIES}
         DESTINATION ${BINARY_INSTALL_DIR}
     )
 endif()

diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj
index 778e98df53ddfb79743e68dc199155f061a99528..e56a3cdaa547e321f6d58f091a609875a49cf242 100644 (file)
--- a/plugin/gd/gvplugin_gd.vcxproj
+++ b/plugin/gd/gvplugin_gd.vcxproj
@@ -67,7 +67,7 @@
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;z.lib;pathplan.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;zlib.lib;pathplan.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll
@@ -75,7 +75,6 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDi
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll</Command>
     </PostBuildEvent>
@@ -97,7 +96,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)ico
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;z.lib;pathplan.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;zlib.lib;pathplan.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll
@@ -105,7 +104,6 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDi
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll</Command>
     </PostBuildEvent>
@@ -127,4 +125,4 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)ico
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/plugin/pango/gvplugin_pango.vcxproj b/plugin/pango/gvplugin_pango.vcxproj
index 2262b6b65db1fcda78731799db47e319e0cfa316..920a4ce0a554dbf28a333058b39deb44adc5c60c 100644 (file)
--- a/plugin/pango/gvplugin_pango.vcxproj
+++ b/plugin/pango/gvplugin_pango.vcxproj
@@ -74,7 +74,6 @@
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll
@@ -114,7 +113,6 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe >
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
-copy $(SolutionDir)windows\dependencies\libraries\x86\bin\zlib1.dll $(OutDir)zlib1.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll
 copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll
@@ -149,4 +147,4 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe >
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/windows/dependencies/libraries b/windows/dependencies/libraries
index 7735f606611a3ee07fb15713265465365c19d698..2263df7255f0d8bc80d39f3f5da2c82764c10783 160000 (submodule)
--- a/windows/dependencies/libraries
+++ b/windows/dependencies/libraries
@@ -1 +1 @@
-Subproject commit 7735f606611a3ee07fb15713265465365c19d698
+Subproject commit 2263df7255f0d8bc80d39f3f5da2c82764c10783