Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/build/Makefile

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/build/Makefile (modified) (7 diffs)

pjproject/branches/projects/uwp/pjmedia/build/Makefile

@@ -76 +76 @@
                         vid_port.o vid_stream.o vid_stream_info.o vid_tee.o \
                         wav_player.o wav_playlist.o wav_writer.o wave.o \
-                        wsola.o
+                        wsola.o audiodev.o videodev.o
 
 export PJMEDIA_CFLAGS += $(_CFLAGS)
 export PJMEDIA_CXXFLAGS += $(_CXXFLAGS)
-export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \
-                          $(PJMEDIA_AUDIODEV_LDLIB) \
-                          $(PJLIB_LDLIB) \
+export PJMEDIA_LDFLAGS += $(PJLIB_LDLIB) \
                           $(PJLIB_UTIL_LDLIB) \
                           $(PJNATH_LDLIB) \
@@ -98 +96 @@
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
-export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \
+export PJMEDIA_AUDIODEV_LDFLAGS += $(PJMEDIA_LDLIB) \
+                                   $(PJLIB_LDLIB) \
                                    $(_LDFLAGS)
 
@@ -106 +105 @@
 #
 export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev
-export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o avi_dev.o ffmpeg_dev.o \
+export PJMEDIA_VIDEODEV_OBJS += videodev.o errno.o avi_dev.o ffmpeg_dev.o \
                                 colorbar_dev.o v4l2_dev.o opengl_dev.o \
                                 util.o
 export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS)
-export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \
+export PJMEDIA_VIDEODEV_LDFLAGS += $(PJMEDIA_LDLIB) \
+                                   $(PJLIB_LDLIB) \
                                    $(_LDFLAGS)
 
@@ -139 +139 @@
                         h263_packetizer.o h264_packetizer.o \
                         $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        ipp_codecs.o silk.o $(CODEC_OBJS) \
+                        ipp_codecs.o silk.o opus.o $(CODEC_OBJS) \
                         g7221_sdp_match.o amr_sdp_match.o
 export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
@@ -161 +161 @@
 export PJMEDIA_TEST_LDFLAGS += $(PJMEDIA_CODEC_LDLIB) \
                                $(PJMEDIA_VIDEODEV_LDLIB) \
+                               $(PJMEDIA_AUDIODEV_LDLIB) \
                                $(PJMEDIA_LDLIB) \
-                               $(PJMEDIA_AUDIODEV_LDLIB) \
                                $(PJLIB_LDLIB) \
                                $(PJLIB_UTIL_LDLIB) \
@@ -212 +212 @@
 pjmedia: $(PJMEDIA_LIB)
 $(PJMEDIA_SONAME): $(PJMEDIA_LIB)
-$(PJMEDIA_LIB) $(PJMEDIA_SONAME): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME)
+$(PJMEDIA_LIB) $(PJMEDIA_SONAME):
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
@@ -222 +222 @@
 pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB)
 $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_VIDEODEV_LIB)
-$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME):
+$(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB)
 $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_AUDIODEV_LIB)
-$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME):
+$(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME)
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)