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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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 
Note: See TracChangeset for help on using the changeset viewer.