Changeset 5606

Timestamp:

Jun 15, 2017 2:56:48 AM (7 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:

• aconfigure (modified) (7 diffs)
• aconfigure.ac (modified) (1 diff)
• build.mak.in (modified) (1 diff)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/build/os-auto.mak.in (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -674 +674 @@
 ac_darwin_cflags
 ac_pjmedia_video_has_ios_opengl
+ac_pjmedia_video_has_vtoolbox
 ac_pjmedia_video_has_darwin
 ac_android_cflags
@@ -756 +757 @@
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
@@ -879 +879 @@
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -1132 +1131 @@
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
@@ -1278 +1268 @@
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-                libdir localedir mandir runstatedir
+                libdir localedir mandir
 do
   eval ac_val=\$$ac_var
@@ -1431 +1421 @@
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
@@ -6446 +6435 @@
 
 
+
         SAVED_LIBS="$LIBS"
         LIBS="-framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia"

pjproject/trunk/aconfigure.ac

@@ -813 +813 @@
         ac_pjmedia_video=darwin_os
         AC_SUBST(ac_pjmedia_video_has_darwin)
+        AC_SUBST(ac_pjmedia_video_has_vtoolbox)
         AC_SUBST(ac_pjmedia_video_has_ios_opengl)
         AC_SUBST(ac_darwin_cflags)

pjproject/trunk/build.mak.in

@@ -181 +181 @@
 # Darwin (Mac and iOS)
 AC_PJMEDIA_VIDEO_HAS_DARWIN = @ac_pjmedia_video_has_darwin@
+AC_PJMEDIA_VIDEO_HAS_VTOOLBOX = @ac_pjmedia_video_has_vtoolbox@
 AC_PJMEDIA_VIDEO_HAS_IOS_OPENGL = @ac_pjmedia_video_has_ios_opengl@
 DARWIN_CFLAGS = @ac_darwin_cflags@

pjproject/trunk/pjmedia/build/Makefile

@@ -137 +137 @@
 export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
 export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_vid_codecs.o openh264.o \
-                        vid_toolbox.o h263_packetizer.o h264_packetizer.o \
+                        h263_packetizer.o h264_packetizer.o \
                         $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                         ipp_codecs.o silk.o opus.o $(CODEC_OBJS) \

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -276 +276 @@
 
 #
+# VideoToolbox codec
+#
+ifeq ($(AC_PJMEDIA_VIDEO_HAS_VTOOLBOX),yes)
+export CODEC_OBJS += vid_toolbox.o
+endif
+
+#
 # iOS OpenGL video device
 #