summaryrefslogtreecommitdiff
path: root/pjmedia/build
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2015-03-26 05:08:40 +0000
committerNanang Izzuddin <nanang@teluu.com>2015-03-26 05:08:40 +0000
commitedf6b789769d8cabc745ab793282cae79d000937 (patch)
treeb41ac96bd5ad85c6c010e69ad8dacbe6ee6c562d /pjmedia/build
parentd874c87049bd75d89132b4e5b2a56886c3b431fb (diff)
Re #1822: Updated build script to auto define PJMEDIA_VIDEO_DEV_HAS_ANDROID.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5027 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build')
-rw-r--r--pjmedia/build/Makefile3
-rw-r--r--pjmedia/build/os-auto.mak.in8
2 files changed, 9 insertions, 2 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index d7b83552..54395c38 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -106,8 +106,7 @@ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
#
export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev
export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \
- colorbar_dev.o v4l2_dev.o opengl_dev.o \
- android_opengl.o android_dev.o
+ colorbar_dev.o v4l2_dev.o opengl_dev.o
export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 16efbca6..c4f7d5ae 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -4,6 +4,7 @@
# Valid values are:
# - mac_os
# - iphone_os
+# - android_os
AC_PJMEDIA_VIDEO = @ac_pjmedia_video@
# SDL flags
@@ -232,6 +233,13 @@ export PJMEDIA_VIDEODEV_OBJS += ios_dev.o ios_opengl_dev.o
endif
#
+# Android video device
+#
+ifeq ($(AC_PJMEDIA_VIDEO),andriod_os)
+export PJMEDIA_VIDEODEV_OBJS += android_dev.o android_opengl.o
+endif
+
+#
# Determine whether we should compile the obj-c version of a particular source code
#
ifneq (,$(filter $(AC_PJMEDIA_VIDEO),mac_os iphone_os))