Changeset 2501


Ignore:
Timestamp:
Mar 10, 2009 3:14:11 PM (10 years ago)
Author:
bennylp
Message:

Continuing task #741 for aps-direct: updated GNU build system for the new audiodev

Location:
pjproject/branches/projects/aps-direct
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/aps-direct/Makefile

    r2037 r2501  
    3434        pjnath/lib/libpjnath-$(TARGET_NAME).a \ 
    3535        pjmedia/lib/libpjmedia-$(TARGET_NAME).a \ 
     36        pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \ 
    3637        pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \ 
    3738        pjsip/lib/libpjsip-$(TARGET_NAME).a \ 
  • pjproject/branches/projects/aps-direct/build.mak.in

    r2232 r2501  
    6161        -lpjmedia-codec-$(TARGET_NAME)\ 
    6262        -lpjmedia-$(TARGET_NAME)\ 
     63        -lpjmedia-audiodev-$(TARGET_NAME)\ 
    6364        -lpjnath-$(TARGET_NAME)\ 
    6465        -lpjlib-util-$(TARGET_NAME)\ 
  • pjproject/branches/projects/aps-direct/pjmedia/build/Makefile

    r2344 r2501  
    1919export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 
    2020export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT) 
     21export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 
    2122 
    22 NULLSOUND_OBJS := nullsound.o 
    2323 
    2424############################################################################### 
     
    3535                   $(HOST_CXXFLAGS) $(CXXFLAGS) 
    3636export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ 
     37                   $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \ 
    3738                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ 
    3839                   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 
     
    5051export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    5152                        alaw_ulaw.o alaw_ulaw_table.o clock_thread.o codec.o \ 
    52                         conference.o delaybuf.o echo_common.o echo_port.o \ 
    53                         echo_suppress.o endpoint.o errno.o \ 
     53                        conference.o conf_switch.o delaybuf.o echo_common.o \ 
     54                        echo_port.o echo_suppress.o endpoint.o errno.o \ 
    5455                        g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ 
    5556                        null_port.o plc_common.o port.o splitcomb.o \ 
    5657                        resample_resample.o resample_libsamplerate.o \ 
    5758                        resample_port.o rtcp.o rtcp_xr.o rtp.o \ 
    58                         sdp.o sdp_cmp.o sdp_neg.o \ 
    59                         session.o silencedet.o sound_port.o stereo_port.o \ 
     59                        sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \ 
     60                        sound_legacy.o sound_port.o stereo_port.o \ 
    6061                        stream.o tonegen.o transport_adapter_sample.o \ 
    6162                        transport_ice.o transport_loop.o \ 
    6263                        transport_srtp.o transport_udp.o \ 
    6364                        wav_player.o wav_playlist.o wav_writer.o wave.o \ 
    64                         wsola.o $(SOUND_OBJS) $(NULLSOUND_OBJS) 
     65                        wsola.o 
    6566 
    6667export PJMEDIA_CFLAGS += $(_CFLAGS) 
     68 
     69 
     70############################################################################### 
     71# Defines for building PJMEDIA-AUDIODEV library 
     72# 
     73export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev 
     74export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o legacy_dev.o pa_dev.o \ 
     75                                 wmme_dev.o 
     76export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) 
    6777 
    6878 
     
    107117# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 
    108118# 
    109 TARGETS := pjmedia pjmedia-codec pjsdp pjmedia-test 
     119TARGETS := pjmedia pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test 
    110120 
    111121all: $(TARGETS) 
     
    122132distclean: realclean 
    123133 
    124 .PHONY: dep depend pjmedia pjmedia-codec pjmedia-test clean realclean distclean 
     134.PHONY: dep depend pjmedia pjmedia-codec pjmedia-audiodev pjmedia-test clean realclean distclean 
    125135 
    126136pjmedia: 
     
    129139pjmedia-codec: 
    130140        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB) 
     141 
     142pjmedia-audiodev: 
     143        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB) 
    131144 
    132145pjsdp: 
     
    153166        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ 
    154167        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
     168        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@ 
    155169        $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@ 
    156170        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ 
     
    158172realclean: 
    159173        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-$(TARGET_NAME).depend),$(HOST_RMR)) 
     174        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-audiodev-$(TARGET_NAME).depend),$(HOST_RMR)) 
    160175        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-codec-$(TARGET_NAME).depend),$(HOST_RMR)) 
    161176        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-test-$(TARGET_NAME).depend),$(HOST_RMR)) 
     
    163178         
    164179        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ 
     180        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia-audiodev $@ 
    165181        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
    166182        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ 
     
    169185depend: 
    170186        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@ 
     187        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia-audiodev $@ 
    171188        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 
    172189        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ 
  • pjproject/branches/projects/aps-direct/pjmedia/build/os-auto.mak.in

    r2182 r2501  
    7979# 
    8080ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 
    81 export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 
    82 export SOUND_OBJS = pasound.o 
     81export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 
    8382endif 
    8483 
    8584# 
    86 # Win32 DirectSound 
     85# Windows specific 
    8786# 
    88 ifeq ($(AC_PJMEDIA_SND),ds) 
    89 export SOUND_OBJS = dsound.o 
    90 export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND 
     87ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),) 
     88export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 
     89else 
     90export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 
    9191endif 
    9292 
     
    9595# 
    9696ifeq ($(AC_PJMEDIA_SND),null) 
    97 export SOUND_OBJS = nullsound.o 
     97# ***** Error ****** 
     98# This will not work either with the new Audiodev 
    9899export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND 
    99100endif 
     
    103104# 
    104105ifeq ($(AC_PJMEDIA_SND),external) 
    105 export SOUND_OBJS =  
    106 export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_EXTERNAL 
     106export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 
    107107endif 
    108108 
  • pjproject/branches/projects/aps-direct/pjsip-apps/build/Makefile

    r2183 r2501  
    99PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 
    1010PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 
     11PJMEDIA_AUDIODEV_LIB:=../../pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 
    1112PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 
    1213PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) 
Note: See TracChangeset for help on using the changeset viewer.