diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-06-16 10:55:23 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-06-16 10:55:23 +0000 |
| commit | bddd40a4e4db55d1c6b046a4fe21b733e76f9fd5 (patch) | |
| tree | d831fbb3fb9956b6bd7c69326fd321be5b407f41 | |
| parent | d0644169cbb76202d28ba42c6a357d03cb5ad7c8 (diff) | |
Re #1931: Fixed configure script for iOS to be able to detect both AVFoundation and OpenGL ES
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5348 74dad513-b988-da41-8d7b-12977e46ad98
| -rwxr-xr-x | aconfigure | 2 | ||||
| -rw-r--r-- | aconfigure.ac | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/darwin_dev.m | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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; } diff --git a/aconfigure.ac b/aconfigure.ac index 306ee873..e8a6000b 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -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 diff --git a/pjmedia/src/pjmedia-videodev/darwin_dev.m b/pjmedia/src/pjmedia-videodev/darwin_dev.m index b791d0b6..b531474c 100644 --- a/pjmedia/src/pjmedia-videodev/darwin_dev.m +++ b/pjmedia/src/pjmedia-videodev/darwin_dev.m @@ -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 |