From 7630b9f876edb011fdc525a92aca028a13f5d0e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wolfgang=20St=C3=B6ggl?= Date: Tue, 10 Oct 2017 22:58:12 +0200 Subject: [PATCH] Use pcre from Win-builds, enables x64 builds (#833) - Switch to newer version of pcre from Win-builds http://win-builds.org/next/packages/windows_32/ http://win-builds.org/next/packages/windows_64/ - Changed: pcre3.dll -> libpcre-1.dll pcre.lib -> libpcre-1.lib --- WIN32-BUILD-TIPS.txt | 3 +-- win32/Makefile.msc | 2 +- win32/librrd-4.vcxproj | 10 +++++----- win32/rrdtool.vcxproj | 6 +++--- win32/rrdupdate.vcxproj | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/WIN32-BUILD-TIPS.txt b/WIN32-BUILD-TIPS.txt index 5b8ced34..ca7f4e94 100644 --- a/WIN32-BUILD-TIPS.txt +++ b/WIN32-BUILD-TIPS.txt @@ -37,8 +37,7 @@ version 1.4.5 and newer with Microsoft Visual Studio 2013 (12.0.x) and newer. - gettext: http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip - - pcre: https://downloads.sourceforge.net/project/gnuwin32/pcre/7.0/pcre-7.0-bin.zip - https://downloads.sourceforge.net/project/gnuwin32/pcre/7.0/pcre-7.0-lib.zip + - pcre: http://win-builds.org/next/packages/windows_32/pcre-8.38-1-i686-w64-mingw32.txz (3) Extract all of the .zip files into the contrib folder. Do not extract each library into it's own directory. We want all of the files merged into a structure consisting of "bin, include, lib..." diff --git a/win32/Makefile.msc b/win32/Makefile.msc index 1728736f..0c5b0073 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -35,7 +35,7 @@ THIRD_PARTY_LIB = /LIBPATH:$(ARCH_PATH)\lib \ libpng.lib libxml2.lib \ glib-2.0.lib gobject-2.0.lib \ pango-1.0.lib pangocairo-1.0.lib cairo.lib \ - Ws2_32.lib zdll.lib gthread-2.0.lib pcre.lib + Ws2_32.lib zdll.lib gthread-2.0.lib libpcre-1.lib RRD_LIB_OBJ_LIST = \ $(TOP)/src/hash_32.obj \ diff --git a/win32/librrd-4.vcxproj b/win32/librrd-4.vcxproj index d4888f21..bc256c47 100644 --- a/win32/librrd-4.vcxproj +++ b/win32/librrd-4.vcxproj @@ -114,7 +114,7 @@ 4996;%(DisableSpecificWarnings) - cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;pcre.lib;%(AdditionalDependencies) + cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;libpcre-1.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) @@ -136,7 +136,7 @@ 4996;%(DisableSpecificWarnings) - cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;pcre.lib;%(AdditionalDependencies) + cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;libpcre-1.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) @@ -157,7 +157,7 @@ 4996;%(DisableSpecificWarnings) - cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;pangocairo-1.0.lib;gthread-2.0.lib;pcre.lib;%(AdditionalDependencies) + cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;pangocairo-1.0.lib;gthread-2.0.lib;libpcre-1.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) librrd-4.def true @@ -180,7 +180,7 @@ $(IntDir)librrd-4.pdb - cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;pcre.lib;%(AdditionalDependencies) + cairo.lib;pango-1.0.lib;pangocairo-1.0.lib;libpng.lib;zdll.lib;glib-2.0.lib;gobject-2.0.lib;libxml2.lib;gthread-2.0.lib;libpcre-1.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries) @@ -203,7 +203,7 @@ false - cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;ws2_32.lib;pangocairo-1.0.lib;gthread-2.0.lib;pcre.lib;%(AdditionalDependencies) + cairo.lib;glib-2.0.lib;gobject-2.0.lib;libpng.lib;libxml2.lib;pango-1.0.lib;ws2_32.lib;pangocairo-1.0.lib;gthread-2.0.lib;libpcre-1.lib;%(AdditionalDependencies) ../contrib/lib;%(AdditionalLibraryDirectories) librrd-4.def diff --git a/win32/rrdtool.vcxproj b/win32/rrdtool.vcxproj index a75b866b..bd05ce3c 100644 --- a/win32/rrdtool.vcxproj +++ b/win32/rrdtool.vcxproj @@ -102,7 +102,7 @@ copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\ -copy $(ProjectDir)\..\contrib\bin\pcre3.dll $(TargetDir)\ +copy $(ProjectDir)\..\contrib\bin\libpcre-1.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ @@ -144,7 +144,7 @@ copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\ -copy $(ProjectDir)\..\contrib\bin\pcre3.dll $(TargetDir)\ +copy $(ProjectDir)\..\contrib\bin\libpcre-1.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ @@ -187,7 +187,7 @@ copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\ -copy $(ProjectDir)\..\contrib\bin\pcre3.dll $(TargetDir)\ +copy $(ProjectDir)\..\contrib\bin\libpcre-1.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ diff --git a/win32/rrdupdate.vcxproj b/win32/rrdupdate.vcxproj index 21197dd5..89d47822 100644 --- a/win32/rrdupdate.vcxproj +++ b/win32/rrdupdate.vcxproj @@ -103,7 +103,7 @@ copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\ -copy $(ProjectDir)\..\contrib\bin\pcre3.dll $(TargetDir)\ +copy $(ProjectDir)\..\contrib\bin\libpcre-1.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ @@ -145,7 +145,7 @@ copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\ -copy $(ProjectDir)\..\contrib\bin\pcre3.dll $(TargetDir)\ +copy $(ProjectDir)\..\contrib\bin\libpcre-1.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ @@ -188,7 +188,7 @@ copy $(ProjectDir)\..\contrib\bin\libpangoft2-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpangowin32-1.0-0.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libpng14-14.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\libxml2-2.dll $(TargetDir)\ -copy $(ProjectDir)\..\contrib\bin\pcre3.dll $(TargetDir)\ +copy $(ProjectDir)\..\contrib\bin\libpcre-1.dll $(TargetDir)\ copy $(ProjectDir)\..\contrib\bin\zlib1.dll $(TargetDir)\ -- 2.47.2