From cd283c8825c9a94400f27735acb1c9385e90ffc8 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 19 Jul 2011 03:42:28 +0000 Subject: Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn". git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98 --- build.mak.in | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'build.mak.in') diff --git a/build.mak.in b/build.mak.in index 2f8197da..99465bfc 100644 --- a/build.mak.in +++ b/build.mak.in @@ -58,12 +58,43 @@ endif # Additional flags @ac_build_mak_vars@ +# +# Video +# Note: there are duplicated macros in pjmedia/os-auto.mak.in (and that's not +# good! + +# SDL flags +SDL_CFLAGS = @ac_sdl_cflags@ +SDL_LDFLAGS = @ac_sdl_ldflags@ + +# FFMPEG dlags +FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ +FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@ + +# Video4Linux2 +V4L2_CFLAGS = @ac_v4l2_cflags@ +V4L2_LDFLAGS = @ac_v4l2_ldflags@ + +# QT +AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@ +QT_CFLAGS = @ac_qt_cflags@ + +# iOS +IOS_CFLAGS = @ac_ios_cflags@ + +# PJMEDIA features exclusion +PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ + $(IOS_CFLAGS) +PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) + + # CFLAGS, LDFLAGS, and LIBS to be used by applications export PJDIR := @ac_pjdir@ export APP_CC := @CC@ export APP_CXX := @CXX@ export APP_CFLAGS := -DPJ_AUTOCONF=1\ @CFLAGS@\ + $(PJ_VIDEO_CFLAGS) \ -I$(PJDIR)/pjlib/include\ -I$(PJDIR)/pjlib-util/include\ -I$(PJDIR)/pjnath/include\ @@ -76,12 +107,14 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\ -L$(PJDIR)/pjmedia/lib\ -L$(PJDIR)/pjsip/lib\ -L$(PJDIR)/third_party/lib\ + $(PJ_VIDEO_LDFLAGS) \ @LDFLAGS@ export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\ -lpjsip-ua-$(TARGET_NAME)\ -lpjsip-simple-$(TARGET_NAME)\ -lpjsip-$(TARGET_NAME)\ -lpjmedia-codec-$(TARGET_NAME)\ + -lpjmedia-videodev-$(TARGET_NAME)\ -lpjmedia-$(TARGET_NAME)\ -lpjmedia-audiodev-$(TARGET_NAME)\ -lpjnath-$(TARGET_NAME)\ @@ -95,6 +128,7 @@ export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \ $(PJ_DIR)/pjsip/lib/libpjsip-simple-$(LIB_SUFFIX) \ $(PJ_DIR)/pjsip/lib/libpjsip-$(LIB_SUFFIX) \ $(PJ_DIR)/pjmedia/lib/libpjmedia-codec-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjmedia/lib/libpjmedia-videodev-$(LIB_SUFFIX) \ $(PJ_DIR)/pjmedia/lib/libpjmedia-$(LIB_SUFFIX) \ $(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev-$(LIB_SUFFIX) \ $(PJ_DIR)/pjnath/lib/libpjnath-$(LIB_SUFFIX) \ -- cgit v1.2.3