mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-21 13:36:39 +00:00
Android, Add explicit path for zlib
This change fixes building gst-libs/gst/tag/ code with the Android buildsystem.
This commit is contained in:
parent
87bb5dddb2
commit
d32ce909f1
1 changed files with 2 additions and 0 deletions
|
@ -67,6 +67,7 @@ GST_PLUGINS_BASE_BUILT_SOURCES := \
|
||||||
|
|
||||||
ifneq ($(NDK_BUILD), true)
|
ifneq ($(NDK_BUILD), true)
|
||||||
GST_PLUGINS_BASE_BUILT_SOURCES += ext/vorbis/Android.mk
|
GST_PLUGINS_BASE_BUILT_SOURCES += ext/vorbis/Android.mk
|
||||||
|
ZLIB_CFLAGS = -I $(abspath $(GST_PLUGINS_BASE_TOP)/../../zlib)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
|
GST_PLUGINS_BASE_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BASE_TOP))/%, $(GST_PLUGINS_BASE_BUILT_SOURCES))
|
||||||
|
@ -85,6 +86,7 @@ gst-plugins-base-configure:
|
||||||
PKG_CONFIG_TOP_BUILD_DIR=/ \
|
PKG_CONFIG_TOP_BUILD_DIR=/ \
|
||||||
IVORBIS_CFLAGS="-I$(TOP)/external/tremolo -DTREMOR" \
|
IVORBIS_CFLAGS="-I$(TOP)/external/tremolo -DTREMOR" \
|
||||||
IVORBIS_LIBS="-lvorbisidec" \
|
IVORBIS_LIBS="-lvorbisidec" \
|
||||||
|
ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \
|
||||||
$(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
|
$(abspath $(GST_PLUGINS_BASE_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \
|
||||||
--prefix=/system --disable-orc --disable-gio --enable-ivorbis \
|
--prefix=/system --disable-orc --disable-gio --enable-ivorbis \
|
||||||
--disable-valgrind --disable-gtk-doc && \
|
--disable-valgrind --disable-gtk-doc && \
|
||||||
|
|
Loading…
Reference in a new issue