Changeset 26814

Timestamp:

2013-01-30T13:54:38+13:00 (11 years ago)

Author:

davidb

Message:

More careful selection of packages, as needed by various cross-compilers

File:

• gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh (modified) (1 diff)

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

@@ -3 +3 @@
 source ../cascade-make/lib/cascade-lib.bash GEXTGNOME .. $*
 
-if [ "x$CROSSCONFIGURE_ARGS" = "x" ] ; then
-  # regular compile for host machine
+# The standard list of packages
+pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"
 
-  pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"
-else 
-  pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML LIBFFI GLIB LIBGSF"
-#  pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML LIBFFI GLIB LIBGSF"
+if [ "x$crossOS" != "x" ] ; then
+  # cross compiling
+  windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML GLIB LIBGSF"
+
+  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML DBUS LIBFFI GLIB LIBGSF"
+
+
+  if [ $crossOS = "android" ] ; then
+    pkglist=$android_pkglist
+  elif [ $crossOS = "windows" ] ; then
+    pkglist=$windows_pkglist
+  fi
+
 fi