Changeset 770 for pjproject/trunk/pjmedia/build/os-auto.mak.in

Timestamp:

Oct 13, 2006 5:57:42 PM (18 years ago)

Author:

bennylp

Message:

Updated PortAudio? to latest version for Mac

File:

• pjproject/trunk/pjmedia/build/os-auto.mak.in (modified) (2 diffs)

pjproject/trunk/pjmedia/build/os-auto.mak.in

@@ -6 +6 @@
 # Define the desired sound device backend
 # Valid values are:
-#   - pa_unix:      PortAudio on Unix (OSS or ALSA)
-#   - pa_darwinos:  PortAudio on MacOSX (CoreAudio)
-#   - pa_win32:     PortAudio on Win32 (WMME)
-#   - ds:           Win32 DirectSound (dsound.c)
-#   - null:         Null sound device (nullsound.c)
+#   - pa_unix:          PortAudio on Unix (OSS or ALSA)
+#   - pa_darwinos:      PortAudio on MacOSX (CoreAudio)
+#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2)
+#   - pa_win32:         PortAudio on Win32 (WMME)
+#   - ds:               Win32 DirectSound (dsound.c)
+#   - null:             Null sound device (nullsound.c)
 AC_PJMEDIA_SND=@ac_pjmedia_snd@
 
 # For Unix, specify if ALSA should be supported
 AC_PA_USE_ALSA=@ac_pa_use_alsa@
+
+# Additional PortAudio CFLAGS are in @ac_pa_cflags@
 
 #
@@ -78 +81 @@
 
 #
-# PortAudio on MacOS X
+# PortAudio on MacOS X (using current PortAudio)
 #
 ifeq ($(AC_PJMEDIA_SND),pa_darwinos)
-export PJMEDIA_OBJS += $(PA_DIR)/pa_mac_hostapis.o $(PA_DIR)/pa_unix_util.o \
-                       $(PA_DIR)/pa_mac_core.o
-export CFLAGS += -DPA_USE_COREAUDIO=1  \
+export PJMEDIA_OBJS +=  $(PA_DIR)/pa_mac_hostapis.o \
+                        $(PA_DIR)/pa_unix_util.o \
+                        $(PA_DIR)/pa_mac_core.o \
+                        $(PA_DIR)/pa_mac_core_blocking.o \
+                        $(PA_DIR)/pa_mac_core_utilities.o \
+                        $(PA_DIR)/ringbuffer.o
+export CFLAGS += -DPA_USE_COREAUDIO=1 \
                  -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
+export CFLAGS += @ac_pa_cflags@
 endif
 
+#
+# PortAudio on MacOS X (using old PortAudio, for MacOS X 10.2.x)
+#
+ifeq ($(AC_PJMEDIA_SND),pa_old_darwinos)
+export PJMEDIA_OBJS +=  $(PA_DIR)/pa_mac_hostapis.o \
+                        $(PA_DIR)/pa_unix_util.o \
+                        $(PA_DIR)/pa_mac_core_old.o 
+export CFLAGS += -DPA_USE_COREAUDIO=1 \
+                 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
+export CFLAGS += @ac_pa_cflags@
+endif
+
+#
 #
 # PortAudio on Win32 (WMME)