Changeset 5348


Ignore:
Timestamp:
Jun 16, 2016 10:55:23 AM (3 years ago)
Author:
ming
Message:

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

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5347 r5348  
    63356335        fi 
    63366336        if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then 
    6337           ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" 
     6337          ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" 
    63386338          LIBS="$LIBS -framework OpenGLES" 
    63396339          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5 
  • pjproject/trunk/aconfigure.ac

    r5347 r5348  
    757757        fi 
    758758        if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then 
    759           ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" 
     759          ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1" 
    760760          LIBS="$LIBS -framework OpenGLES" 
    761761          AC_MSG_RESULT([Checking if OpenGLES framework is available... yes]) 
  • pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m

    r5347 r5348  
    3636#import <QuartzCore/QuartzCore.h> 
    3737 
    38 #define THIS_FILE               "darwin_dev.c" 
     38#define THIS_FILE               "darwin_dev.m" 
    3939#define DEFAULT_CLOCK_RATE      90000 
    4040#if TARGET_OS_IPHONE 
Note: See TracChangeset for help on using the changeset viewer.