Changeset 5606


Ignore:
Timestamp:
Jun 15, 2017 2:56:48 AM (2 years ago)
Author:
ming
Message:

Re #2022: Fixed build configuration to make sure that it's not included in other platforms (such as Android).

Location:
pjproject/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5603 r5606  
    674674ac_darwin_cflags 
    675675ac_pjmedia_video_has_ios_opengl 
     676ac_pjmedia_video_has_vtoolbox 
    676677ac_pjmedia_video_has_darwin 
    677678ac_android_cflags 
     
    756757oldincludedir 
    757758includedir 
    758 runstatedir 
    759759localstatedir 
    760760sharedstatedir 
     
    879879sharedstatedir='${prefix}/com' 
    880880localstatedir='${prefix}/var' 
    881 runstatedir='${localstatedir}/run' 
    882881includedir='${prefix}/include' 
    883882oldincludedir='/usr/include' 
     
    11321131    silent=yes ;; 
    11331132 
    1134   -runstatedir | --runstatedir | --runstatedi | --runstated \ 
    1135   | --runstate | --runstat | --runsta | --runst | --runs \ 
    1136   | --run | --ru | --r) 
    1137     ac_prev=runstatedir ;; 
    1138   -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 
    1139   | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 
    1140   | --run=* | --ru=* | --r=*) 
    1141     runstatedir=$ac_optarg ;; 
    1142  
    11431133  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 
    11441134    ac_prev=sbindir ;; 
     
    12781268                datadir sysconfdir sharedstatedir localstatedir includedir \ 
    12791269                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 
    1280                 libdir localedir mandir runstatedir 
     1270                libdir localedir mandir 
    12811271do 
    12821272  eval ac_val=\$$ac_var 
     
    14311421  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com] 
    14321422  --localstatedir=DIR     modifiable single-machine data [PREFIX/var] 
    1433   --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run] 
    14341423  --libdir=DIR            object code libraries [EPREFIX/lib] 
    14351424  --includedir=DIR        C header files [PREFIX/include] 
     
    64466435 
    64476436 
     6437 
    64486438        SAVED_LIBS="$LIBS" 
    64496439        LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia" 
  • pjproject/trunk/aconfigure.ac

    r5603 r5606  
    813813        ac_pjmedia_video=darwin_os 
    814814        AC_SUBST(ac_pjmedia_video_has_darwin) 
     815        AC_SUBST(ac_pjmedia_video_has_vtoolbox) 
    815816        AC_SUBST(ac_pjmedia_video_has_ios_opengl) 
    816817        AC_SUBST(ac_darwin_cflags) 
  • pjproject/trunk/build.mak.in

    r5428 r5606  
    181181# Darwin (Mac and iOS) 
    182182AC_PJMEDIA_VIDEO_HAS_DARWIN = @ac_pjmedia_video_has_darwin@ 
     183AC_PJMEDIA_VIDEO_HAS_VTOOLBOX = @ac_pjmedia_video_has_vtoolbox@ 
    183184AC_PJMEDIA_VIDEO_HAS_IOS_OPENGL = @ac_pjmedia_video_has_ios_opengl@ 
    184185DARWIN_CFLAGS = @ac_darwin_cflags@ 
  • pjproject/trunk/pjmedia/build/Makefile

    r5603 r5606  
    137137export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec 
    138138export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_vid_codecs.o openh264.o \ 
    139                         vid_toolbox.o h263_packetizer.o h264_packetizer.o \ 
     139                        h263_packetizer.o h264_packetizer.o \ 
    140140                        $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    141141                        ipp_codecs.o silk.o opus.o $(CODEC_OBJS) \ 
  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r5568 r5606  
    276276 
    277277# 
     278# VideoToolbox codec 
     279# 
     280ifeq ($(AC_PJMEDIA_VIDEO_HAS_VTOOLBOX),yes) 
     281export CODEC_OBJS += vid_toolbox.o 
     282endif 
     283 
     284# 
    278285# iOS OpenGL video device 
    279286# 
Note: See TracChangeset for help on using the changeset viewer.