Changeset 5027 for pjproject/trunk/pjmedia/build

Timestamp:

Mar 26, 2015 5:08:40 AM (9 years ago)

Author:

nanang

Message:

Re #1822: Updated build script to auto define PJMEDIA_VIDEO_DEV_HAS_ANDROID.

Location:

pjproject/trunk/pjmedia/build

Files:

• Makefile (modified) (1 diff)
• os-auto.mak.in (modified) (2 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -107 +107 @@
 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)

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -5 +5 @@
 #   - mac_os
 #   - iphone_os
+#   - android_os
 AC_PJMEDIA_VIDEO = @ac_pjmedia_video@
 
@@ -233 +234 @@
 
 #
+# 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
 #