From f2de888a88002f4812ce56c39aabf1fb773073d5 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 28 Jun 2016 14:32:08 +0000 Subject: Re #1937: Added libyuv build configs for GNU build systems. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5361 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/build/os-auto.mak.in | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'pjmedia/build') diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 37e7ffac..63e95a3c 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -28,10 +28,6 @@ DARWIN_CFLAGS = @ac_darwin_cflags@ # Android ANDROID_CFLAGS = @ac_android_cflags@ -# libyuv -LIBYUV_CFLAGS = @ac_libyuv_cflags@ -LIBYUV_LDFLAGS = @ac_libyuv_ldflags@ - # openh264 OPENH264_CFLAGS = @ac_openh264_cflags@ OPENH264_LDFLAGS = @ac_openh264_ldflags@ @@ -44,10 +40,10 @@ WEBRTC_LDFLAGS = @ac_webrtc_ldflags@ # PJMEDIA features exclusion export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \ $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ - $(DARWIN_CFLAGS) $(ANDROID_CFLAGS) $(LIBYUV_CFLAGS) \ + $(DARWIN_CFLAGS) $(ANDROID_CFLAGS) \ $(OPENH264_CFLAGS) $(WEBRTC_CFLAGS) export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \ - $(LIBYUV_LDFLAGS) $(OPENH264_LDFLAGS) $(WEBRTC_LDFLAGS) + $(OPENH264_LDFLAGS) $(WEBRTC_LDFLAGS) # Define the desired sound device backend # Valid values are: @@ -195,6 +191,19 @@ ifeq (@ac_external_pa@,1) export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 endif +# +# libyuv +# +ifeq (@ac_no_yuv@,1) +export CFLAGS += -DPJMEDIA_HAS_LIBYUV=0 +else +export CFLAGS += -DPJMEDIA_HAS_LIBYUV=1 +ifeq (@ac_external_yuv@,0) +export CFLAGS += -I$(THIRD_PARTY)/yuv/include +endif +endif + + # # MacOSX specific # -- cgit v1.2.3