Re #1822: Updated build script to auto define PJMEDIA_VIDEO_DEV_HAS_ANDROID.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5027 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
12b3d89abc
commit
904be7610d
|
@ -6197,6 +6197,7 @@ $as_echo "Checking if OpenGL ES 2 is available... yes" >&6; }
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... no" >&5
|
||||
$as_echo "Checking if OpenGL ES 2 is available... no" >&6; }
|
||||
fi
|
||||
ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1"
|
||||
;;
|
||||
arm-apple-darwin*)
|
||||
ac_pjmedia_video=iphone_os
|
||||
|
|
|
@ -722,6 +722,7 @@ else
|
|||
else
|
||||
AC_MSG_RESULT([Checking if OpenGL ES 2 is available... no])
|
||||
fi
|
||||
ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1"
|
||||
;;
|
||||
arm-apple-darwin*)
|
||||
ac_pjmedia_video=iphone_os
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
# Valid values are:
|
||||
# - mac_os
|
||||
# - iphone_os
|
||||
# - android_os
|
||||
AC_PJMEDIA_VIDEO = @ac_pjmedia_video@
|
||||
|
||||
# SDL flags
|
||||
|
@ -231,6 +232,13 @@ ifeq ($(AC_PJMEDIA_VIDEO),iphone_os)
|
|||
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
|
||||
#
|
||||
|
|
|
@ -196,7 +196,7 @@ PJ_BEGIN_DECL
|
|||
/**
|
||||
* This setting controls whether Android support should be included.
|
||||
*
|
||||
* Default: 0
|
||||
* Default: 0 (or detected by configure)
|
||||
*/
|
||||
#ifndef PJMEDIA_VIDEO_DEV_HAS_ANDROID
|
||||
# define PJMEDIA_VIDEO_DEV_HAS_ANDROID 0
|
||||
|
|
Loading…
Reference in New Issue