summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-08-16 23:36:09 -0400
committerReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-08-16 23:36:09 -0400
commitf7e0a595e1fa6c2252661b12bc7dffdce945a5d0 (patch)
tree7023f1181340c40ec6a3db31ed627540d8fd857e
parent2542c8e7dd8f778e5513f33ae78651f06ef41b08 (diff)
Get rid of harcoded reference to local workaround for unmatching glib versions (System v/s Shipped one)
-rwxr-xr-xsetup.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/setup.sh b/setup.sh
index f2a7941..8f94cdd 100755
--- a/setup.sh
+++ b/setup.sh
@@ -6,4 +6,8 @@ target=`android list targets | grep "android-11" | cut -d' ' -f2`
android update project -n GStreamer -p . -t $target
for i in *; do if [ -d $i ]; then echo $i; cp config.sub $i; fi; done
rm -f res/config.sub
-GLIB_COMPILE_SCHEMAS=/home/reynaldo/devel/Collabora/glib-2-30/gio/.libs/glib-compile-schemas GLIB_GENMARSHAL=/home/reynaldo/devel/Collabora/glib-2-30/gobject/glib-genmarshal ANDROGENIZER_NDK=1 NDK_BUILD=1 ndk-build gstreamer-aggregate-configure && ndk-build -B V=1 && ant debug
+# This is an example to get past the glib a glib version mismatch
+# between the system's and the ndk port shipped one.
+#
+#GLIB_COMPILE_SCHEMAS=/PATH_TO_LOCALLY_INSTALLED_MATCHING_GLIB/gio/.libs/glib-compile-schemas GLIB_GENMARSHAL=/PATH_TO_LOCALLY_INSTALLED_MATCHING_GLIB/gobject/glib-genmarshal ANDROGENIZER_NDK=1 NDK_BUILD=1 ndk-build gstreamer-aggregate-configure && ndk-build -B V=1 && ant debug
+ANDROGENIZER_NDK=1 NDK_BUILD=1 ndk-build gstreamer-aggregate-configure && ndk-build -B V=1 && ant debug