Ignore:
Timestamp:
Dec 10, 2010 11:04:30 AM (14 years ago)
Author:
bennylp
Message:

Migration of current video works from private repository to this repository. This closed #1176

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/2.0-dev/pjmedia/build/Makefile

    r3319 r3392  
    1919export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT) 
    2020export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 
     21export PJMEDIA_VIDEODEV_LIB:=../lib/libpjmedia-videodev-$(TARGET_NAME)$(LIBEXT) 
    2122 
    2223 
     
    3536export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ 
    3637                   $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \ 
     38                   $(subst /,$(HOST_PSEP),$(PJMEDIA_VIDEODEV_LIB)) \ 
    3739                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ 
    3840                   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 
     
    5052export PJMEDIA_SRCDIR = ../src/pjmedia 
    5153export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    52                         alaw_ulaw.o alaw_ulaw_table.o bidirectional.o clock_thread.o codec.o \ 
    53                         conference.o conf_switch.o delaybuf.o echo_common.o \ 
     54                        alaw_ulaw.o alaw_ulaw_table.o avi_player.o \ 
     55                        bidirectional.o clock_thread.o codec.o conference.o \ 
     56                        conf_switch.o converter.o  converter_libswscale.o \ 
     57                        delaybuf.o echo_common.o \ 
    5458                        echo_port.o echo_suppress.o endpoint.o errno.o \ 
     59                        format.o ffmpeg_util.o \ 
    5560                        g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ 
    5661                        null_port.o plc_common.o port.o splitcomb.o \ 
     
    6166                        stream.o tonegen.o transport_adapter_sample.o \ 
    6267                        transport_ice.o transport_loop.o \ 
    63                         transport_srtp.o transport_udp.o \ 
     68                        transport_srtp.o transport_udp.o vid_codec.o videoport.o \ 
    6469                        wav_player.o wav_playlist.o wav_writer.o wave.o \ 
    6570                        wsola.o 
     
    7984 
    8085############################################################################### 
     86# Defines for building PJMEDIA-VIDEODEV library 
     87# 
     88export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev 
     89export PJMEDIA_VIDEODEV_OBJS +=  videodev.o ffmpeg_dev.o sdl_dev.o colorbar_dev.o \ 
     90                                 v4l2_dev.o 
     91export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) 
     92 
     93 
     94############################################################################### 
    8195# Defines for building PJSDP library 
    8296# Note that SDP functionality is already INCLUDED in PJMEDIA. 
     
    94108# 
    95109export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec 
    96 export PJMEDIA_CODEC_OBJS += \ 
     110export PJMEDIA_CODEC_OBJS += ffmpeg_codecs.o \ 
    97111                        $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    98112                        ipp_codecs.o $(CODEC_OBJS) 
     
    105119# 
    106120export PJMEDIA_TEST_SRCDIR = ../src/test 
    107 export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o rtp_test.o test.o 
     121export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o \ 
     122                            vid_dev_test.o vid_codec_test.o rtp_test.o test.o 
    108123export PJMEDIA_TEST_OBJS += sdp_neg_test.o  
    109124export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) 
     
    118133# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 
    119134# 
    120 TARGETS := pjmedia pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test 
     135TARGETS := pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test 
    121136 
    122137all: $(TARGETS) 
     
    133148distclean: realclean 
    134149 
    135 .PHONY: dep depend pjmedia pjmedia-codec pjmedia-audiodev pjmedia-test clean realclean distclean 
     150.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean 
    136151 
    137152pjmedia: 
     
    140155pjmedia-codec: 
    141156        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB) 
     157 
     158pjmedia-videodev: 
     159        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB) 
    142160 
    143161pjmedia-audiodev: 
     
    167185        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ 
    168186        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
     187        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@ 
    169188        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ 
    170189        $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@ 
     
    173192realclean: 
    174193        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-$(TARGET_NAME).depend),$(HOST_RMR)) 
     194        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-videodev-$(TARGET_NAME).depend),$(HOST_RMR)) 
    175195        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-audiodev-$(TARGET_NAME).depend),$(HOST_RMR)) 
    176196        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-codec-$(TARGET_NAME).depend),$(HOST_RMR)) 
     
    179199         
    180200        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ 
     201        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@ 
    181202        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ 
    182203        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
     
    186207depend: 
    187208        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ 
     209        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@ 
    188210        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ 
    189211        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
Note: See TracChangeset for help on using the changeset viewer.