Changeset 5347 for pjproject/trunk/build.mak.in

Timestamp:

Jun 16, 2016 10:38:34 AM (8 years ago)

Author:

ming

Message:

Re #1931: Add support for AVFoundation on Mac

• Deprecate QTKit
• Rename ios_dev.m to darwin_dev.m
• Important: Re-run configure and make dep after applying this change!

File:

• pjproject/trunk/build.mak.in (modified) (2 diffs)

pjproject/trunk/build.mak.in

@@ -148 +148 @@
 # QT
 AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@
-QT_CFLAGS = @ac_qt_cflags@
-
-# iOS
-IOS_CFLAGS = @ac_ios_cflags@
+# QT_CFLAGS = @ac_qt_cflags@
+
+# Darwin (Mac and iOS)
+AC_PJMEDIA_VIDEO_HAS_DARWIN = @ac_pjmedia_video_has_darwin@
+AC_PJMEDIA_VIDEO_HAS_IOS_OPENGL = @ac_pjmedia_video_has_ios_opengl@
+DARWIN_CFLAGS = @ac_darwin_cflags@
 
 # Android
@@ -162 +164 @@
 # PJMEDIA features exclusion
 PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \
-                   $(OPENH264_CFLAGS) $(IOS_CFLAGS) $(LIBYUV_CFLAGS)
+                   $(OPENH264_CFLAGS) $(DARWIN_CFLAGS) $(LIBYUV_CFLAGS)
 PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \
                    $(OPENH264_LDFLAGS) $(LIBYUV_LDFLAGS)