diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
| commit | 68c0790817b4dedf8d4d028631e98d66171e73c0 (patch) | |
| tree | 1063f6bb873d4ab3bee85e2310e06ad9f9232261 /Android.mk | |
| parent | cd8742fdcb71e9bb3f987e5f98594c20b5c08134 (diff) | |
| parent | bd900a6c856c536c783aa7a53e3c6b19f3cb8bf9 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/interfaces/propertyprobe.c
sys/xvimage/xvimagesink.c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index b42e34b53..9fa657203 100644 --- a/Android.mk +++ b/Android.mk @@ -60,6 +60,7 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \ ifneq ($(NDK_BUILD), true) GST_PLUGINS_BASE_BUILT_SOURCES += ext/vorbis/Android.mk +ZLIB_CFLAGS = -I $(abspath $(GST_PLUGINS_BASE_TOP)/../../zlib) endif GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES)) @@ -78,6 +79,7 @@ gst-plugins-base-configure: PKG_CONFIG_TOP_BUILD_DIR=/ \ IVORBIS_CFLAGS="-I$(TOP)/external/tremolo -DTREMOR" \ IVORBIS_LIBS="-lvorbisidec" \ + ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \ $(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \ --prefix=/system --disable-orc --disable-gio --enable-ivorbis \ --disable-valgrind --disable-gtk-doc && \ |