Changeset 34351 for gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE.sh

Timestamp:

2020-09-11T15:42:59+12:00 (4 years ago)

Author:

davidb

Message:

Changes to allow gnome-lib extension to compile on Macrocarpa (MacOS)

File:

• gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE.sh (modified) (3 diffs)

gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE.sh

@@ -5 +5 @@
 # The standard list of packages
 # For Mac Yosemite we found that PKG-CONFIG is dependent on GLIB, so we've moved GLIB ahead of PKG-CONFIG in the list
-pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBXSLT LIBFFI LIBGSF"
+pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT LIBFFI GLIB PKG-CONFIG LIBXML LIBXSLT LIBGSF"
 
 # libiconv was found to be necessary on the latest DL mac (2013)
@@ -19 +19 @@
 if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
 #    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"    
-    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBXSLT LIBFFI LIBGSF"    
+    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT LIBFFI GLIB PCRE PKG-CONFIG LIBXML LIBXSLT LIBGSF"    
 fi
 
@@ -26 +26 @@
   windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML LIBGSF"
 
-  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML DBUS LIBFFI LIBGSF"
+  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBFFI GLIB LIBXML DBUS LIBGSF"