diff options
Diffstat (limited to 'pjmedia/build/Makefile')
| -rw-r--r-- | pjmedia/build/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 2a4af87d..53faa2dc 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -75,13 +75,11 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ types.o vid_codec.o vid_codec_util.o \ 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) \ $(_LDFLAGS) @@ -97,7 +95,8 @@ export PJMEDIA_AUDIODEV_OBJS += audiodev.o audiotest.o errno.o \ android_jni_dev.o opensl_dev.o 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) @@ -105,12 +104,13 @@ export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \ # Defines for building PJMEDIA-VIDEODEV library # 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) @@ -211,7 +211,7 @@ distclean: realclean 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)/$@) pjmedia-codec: $(PJMEDIA_CODEC_LIB) @@ -221,12 +221,12 @@ $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME) 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)/$@) pjsdp: $(PJSDP_LIB) |