diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-09-24 04:01:34 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-09-24 04:01:34 +0000 |
| commit | 4d9808a6a48bd7ad4617709a2a1dbb6891deb963 (patch) | |
| tree | c371e06b95eaabd5ddce3a5a96b5b47d8a7ee388 /pjmedia/build | |
| parent | 76631c2519ae0dc653828d2eda184271cedd5aae (diff) | |
Re #1790: Initial basic implementation of Android OpenGL renderer
To use it, app has to specify PJMEDIA_HAS_VIDEO to 1
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4928 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build')
| -rw-r--r-- | pjmedia/build/Makefile | 3 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 54395c38..ba2b8187 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -106,7 +106,8 @@ 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 + colorbar_dev.o v4l2_dev.o opengl_dev.o \ + android_opengl.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 91b14aa4..2e8d24d7 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -25,6 +25,9 @@ QT_CFLAGS = @ac_qt_cflags@ # iOS IOS_CFLAGS = @ac_ios_cflags@ +# Android +ANDROID_CFLAGS = @ac_android_cflags@ + # libyuv LIBYUV_CFLAGS = @ac_libyuv_cflags@ LIBYUV_LDFLAGS = @ac_libyuv_ldflags@ @@ -33,7 +36,7 @@ LIBYUV_LDFLAGS = @ac_libyuv_ldflags@ # PJMEDIA features exclusion export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \ $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ - $(IOS_CFLAGS) $(LIBYUV_CFLAGS) + $(IOS_CFLAGS) $(ANDROID_CFLAGS) $(LIBYUV_CFLAGS) export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \ $(LIBYUV_LDFLAGS) |