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

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• build.mak.in (modified) (5 diffs)

pjproject/trunk/build.mak.in

@@ -59 +59 @@
 @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@
@@ -65 +95 @@
 export APP_CFLAGS := -DPJ_AUTOCONF=1\
         @CFLAGS@\
+        $(PJ_VIDEO_CFLAGS) \
         -I$(PJDIR)/pjlib/include\
         -I$(PJDIR)/pjlib-util/include\
@@ -77 +108 @@
         -L$(PJDIR)/pjsip/lib\
         -L$(PJDIR)/third_party/lib\
+        $(PJ_VIDEO_LDFLAGS) \
         @LDFLAGS@
 export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\
@@ -83 +115 @@
         -lpjsip-$(TARGET_NAME)\
         -lpjmedia-codec-$(TARGET_NAME)\
+        -lpjmedia-videodev-$(TARGET_NAME)\
         -lpjmedia-$(TARGET_NAME)\
         -lpjmedia-audiodev-$(TARGET_NAME)\
@@ -96 +129 @@
         $(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) \