Changeset 3664 for pjproject/trunk/pjmedia/build/Makefile

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)
• pjmedia/build/Makefile (modified) (15 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -19 +19 @@
 export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT)
 export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT)
+export PJMEDIA_VIDEODEV_LIB:=../lib/libpjmedia-videodev-$(TARGET_NAME)$(LIBEXT)
 
 
@@ -28 +29 @@
                    $(CC_INC)../../pjlib/include \
                    $(CC_INC)../../pjlib-util/include \
+                   $(CC_INC)../../pjmedia/include \
                    $(CC_INC)../../pjnath/include \
                    $(CC_INC)../.. \
@@ -33 +35 @@
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
+export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_VIDEODEV_LIB)) \
+                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
+                   $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
@@ -50 +53 @@
 export PJMEDIA_SRCDIR = ../src/pjmedia
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        alaw_ulaw.o alaw_ulaw_table.o bidirectional.o clock_thread.o codec.o \
-                        conference.o conf_switch.o delaybuf.o echo_common.o \
+                        alaw_ulaw.o alaw_ulaw_table.o avi_player.o \
+                        bidirectional.o clock_thread.o codec.o conference.o \
+                        conf_switch.o converter.o  converter_libswscale.o \
+                        delaybuf.o echo_common.o \
                         echo_port.o echo_suppress.o endpoint.o errno.o \
+                        event.o format.o ffmpeg_util.o \
                         g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
                         null_port.o plc_common.o port.o splitcomb.o \
@@ -59 +65 @@
                         sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
                         sound_legacy.o sound_port.o stereo_port.o \
-                        stream.o tonegen.o transport_adapter_sample.o \
-                        transport_ice.o transport_loop.o \
-                        transport_srtp.o transport_udp.o \
+                        stream_common.o stream.o tonegen.o transport_adapter_sample.o \
+                        transport_ice.o transport_loop.o transport_srtp.o transport_udp.o \
+                        types.o vid_codec.o vid_codec_util.o \
+                        vid_port.o vid_stream.o vid_tee.o \
                         wav_player.o wav_playlist.o wav_writer.o wave.o \
                         wsola.o
@@ -79 +86 @@
 
 ###############################################################################
+# Defines for building PJMEDIA-VIDEODEV library
+#
+export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev
+export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o ffmpeg_dev.o \
+                                colorbar_dev.o v4l2_dev.o
+export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
+
+
+###############################################################################
 # Defines for building PJSDP library
 # Note that SDP functionality is already INCLUDED in PJMEDIA.
@@ -94 +110 @@
 #
 export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
-export PJMEDIA_CODEC_OBJS += \
+export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_codecs.o \
+                        h263_packetizer.o h264_packetizer.o \
                         $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                         ipp_codecs.o $(CODEC_OBJS)
@@ -105 +122 @@
 #
 export PJMEDIA_TEST_SRCDIR = ../src/test
-export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o rtp_test.o test.o
+export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o \
+                            vid_codec_test.o vid_dev_test.o vid_port_test.o \
+                            rtp_test.o test.o
 export PJMEDIA_TEST_OBJS += sdp_neg_test.o 
 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS)
@@ -118 +137 @@
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
+TARGETS := pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
 
 all: $(TARGETS)
@@ -133 +152 @@
 distclean: realclean
 
-.PHONY: dep depend pjmedia pjmedia-codec pjmedia-audiodev pjmedia-test clean realclean distclean
+.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean
 
 pjmedia:
@@ -140 +159 @@
 pjmedia-codec:
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
+
+pjmedia-videodev:
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB)
 
 pjmedia-audiodev:
@@ -167 +189 @@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@
@@ -173 +196 @@
 realclean:
         $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-$(TARGET_NAME).depend),$(HOST_RMR))
+        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-videodev-$(TARGET_NAME).depend),$(HOST_RMR))
         $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-audiodev-$(TARGET_NAME).depend),$(HOST_RMR))
         $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-codec-$(TARGET_NAME).depend),$(HOST_RMR))
@@ -179 +203 @@
         
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
@@ -186 +211 @@
 depend:
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@