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 --- build.mak.in | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'build.mak.in') diff --git a/build.mak.in b/build.mak.in index 62a8c29e..802211ce 100644 --- a/build.mak.in +++ b/build.mak.in @@ -121,6 +121,21 @@ endif endif endif +ifneq (@ac_no_yuv@,1) +ifeq (@ac_external_yuv@,1) +APP_THIRD_PARTY_EXT += -lyuv +else +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv-$(LIB_SUFFIX) +ifeq ($(PJ_SHARED_LIBRARIES),) +APP_THIRD_PARTY_LIBS += -lyuv-$(TARGET_NAME) +else +APP_THIRD_PARTY_LIBS += -lyuv +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX) +endif +endif +endif + + # Additional flags @ac_build_mak_vars@ @@ -157,15 +172,11 @@ DARWIN_CFLAGS = @ac_darwin_cflags@ # Android ANDROID_CFLAGS = @ac_android_cflags@ -# libyuv -LIBYUV_CFLAGS = @ac_libyuv_cflags@ -LIBYUV_LDFLAGS = @ac_libyuv_ldflags@ - # PJMEDIA features exclusion PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ - $(OPENH264_CFLAGS) $(DARWIN_CFLAGS) $(LIBYUV_CFLAGS) + $(OPENH264_CFLAGS) $(DARWIN_CFLAGS) PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \ - $(OPENH264_LDFLAGS) $(LIBYUV_LDFLAGS) + $(OPENH264_LDFLAGS) # CFLAGS, LDFLAGS, and LIBS to be used by applications export APP_CC := @CC@ -- cgit v1.2.3