diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-06-16 10:38:34 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-06-16 10:38:34 +0000 |
| commit | d0644169cbb76202d28ba42c6a357d03cb5ad7c8 (patch) | |
| tree | b5c4612cb53587044c8020c09e0ba320d8b23572 /build.mak.in | |
| parent | 3fd9e3846649c9cd033f1a791fe7c5f9aab33944 (diff) | |
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!
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5347 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build.mak.in')
| -rw-r--r-- | build.mak.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build.mak.in b/build.mak.in index 074977dd..62a8c29e 100644 --- a/build.mak.in +++ b/build.mak.in @@ -147,10 +147,12 @@ OPENH264_LDFLAGS = @ac_openh264_ldflags@ # QT AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@ -QT_CFLAGS = @ac_qt_cflags@ +# QT_CFLAGS = @ac_qt_cflags@ -# iOS -IOS_CFLAGS = @ac_ios_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 ANDROID_CFLAGS = @ac_android_cflags@ @@ -161,7 +163,7 @@ LIBYUV_LDFLAGS = @ac_libyuv_ldflags@ # 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) |