sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #1931: Fixed configure script for iOS to be able to detect both AVFoundation and OpenGL ES 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5348 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Sauw Ming 2016-06-16 10:55:23 +00:00
parent cfeae392cb
commit 118fc60dee
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aconfigure
View File

@ -6334,7 +6334,7 @@ $as_echo "Checking if AVFoundation framework is available... yes" >&6; }
$as_echo "Checking if AVFoundation framework is available... no" >&6; }
fi
if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then
ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
LIBS="$LIBS -framework OpenGLES"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5
$as_echo "Checking if OpenGLES framework is available... yes" >&6; }

2
aconfigure.ac
View File

@ -756,7 +756,7 @@ else
AC_MSG_RESULT([Checking if AVFoundation framework is available... no])
fi
if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then
ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
LIBS="$LIBS -framework OpenGLES"
AC_MSG_RESULT([Checking if OpenGLES framework is available... yes])
else

2
pjmedia/src/pjmedia-videodev/darwin_dev.m
View File

@ -35,7 +35,7 @@
#import <AVFoundation/AVFoundation.h>
#import <QuartzCore/QuartzCore.h>
#define THIS_FILE "darwin_dev.c"
#define THIS_FILE "darwin_dev.m"
#define DEFAULT_CLOCK_RATE 90000
#if TARGET_OS_IPHONE
#define DEFAULT_WIDTH 352