Changeset 32232 for gs2-extensions/xpdf-tools/trunk/src/packages

Timestamp:

2018-07-02T21:05:48+12:00 (6 years ago)

Author:

ak19

Message:

Still part of the temporary redoing proper non-static compilation of xpdf-tools. In this 2nd round, just tidying up version numbers with variables, before the next commit (which will commit all the changes for getting static compilation of xpdf-tools to work.)

File:

• gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh (modified) (2 diffs)

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/XPDFTOOLS.sh

@@ -4 +4 @@
 package=xpdf
 version=-4.00
+
+# Suffixes to the final .so files (not the symbolic .so files)
+# generated for zlib and libpng. We're currently up to libpng version 15, lpng15
+zlib_so_version=1.2.7
+libpng_so_version=15.30.0
 
 progname=$0
@@ -54 +59 @@
     cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=$prefix \
-        -DZLIB_LIBRARY=$prefix/lib/libz.so.1.2.7 \
-        -DPNG_LIBRARY=$prefix/lib/libpng15.so.15.30.0 \
-        -DFREETYPE_LIBRARY=$prefix/lib/libfreetype.so.6.3.20 \
+        -DZLIB_LIBRARY=$prefix/lib/libz.so.$zlib_so_version \
+        -DPNG_LIBRARY=$prefix/lib/libpng15.so.$libpng_so_version \
+        -DFREETYPE_DIR=$prefix \
         -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=1 \
         -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=1 \