diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-04-08 09:03:35 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-04-08 09:03:35 +0000 |
| commit | f8f81f703f4715440cbfb28c2232345df5564b80 (patch) | |
| tree | 973fddaaf0cc475e41ec893a4c7a8b02c8f3e137 /pjmedia/build | |
| parent | 8917c6a09a7f3a4332157b73c014df525a17d46f (diff) | |
Re #1757: Initial implementation of iOS OpenGL ES renderer. To use it, application needs to add:
#define PJMEDIA_VIDEO_DEV_HAS_OPENGL 1
#define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1
#define PJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL 1
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4812 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build')
| -rw-r--r-- | pjmedia/build/Makefile | 2 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 8012cb75..23dc715e 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -106,7 +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 + 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 c0642cc8..ea057824 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -214,7 +214,7 @@ endif # iOS video device # ifeq ($(AC_PJMEDIA_VIDEO),iphone_os) -export PJMEDIA_VIDEODEV_OBJS += ios_dev.o +export PJMEDIA_VIDEODEV_OBJS += ios_dev.o ios_opengl_dev.o endif # |