diff options
author | Benny Prijono <bennylp@teluu.com> | 2009-03-12 18:11:37 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2009-03-12 18:11:37 +0000 |
commit | 1dacdee696b7591a6dcc0b3c1d0f41573e473168 (patch) | |
tree | 302b09dcd989c0c05cf09f6aebaa63d870b421b9 /pjmedia/build/os-auto.mak.in | |
parent | ba9d8ca28eb209571c0bd6a080a8bb03d0fa2d33 (diff) |
(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2506 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build/os-auto.mak.in')
-rw-r--r-- | pjmedia/build/os-auto.mak.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index 656e3d58..74911aea 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -78,23 +78,24 @@ endif # PortAudio # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) -export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND -export SOUND_OBJS = pasound.o +export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 endif # -# Win32 DirectSound +# Windows specific # -ifeq ($(AC_PJMEDIA_SND),ds) -export SOUND_OBJS = dsound.o -export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND +ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),) +export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 +else +export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 endif # # Null sound device # ifeq ($(AC_PJMEDIA_SND),null) -export SOUND_OBJS = nullsound.o +# ***** Error ****** +# This will not work either with the new Audiodev export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND endif @@ -102,8 +103,7 @@ endif # External sound device # ifeq ($(AC_PJMEDIA_SND),external) -export SOUND_OBJS = -export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_EXTERNAL +export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 endif |