Changeset 1201 for pjproject/branches/split-3rd-party/pjmedia/build/os-auto.mak.in

Timestamp:

Apr 17, 2007 4:16:01 PM (17 years ago)

Author:

bennylp

Message:

Fixed build system for third_party

File:

• pjproject/branches/split-3rd-party/pjmedia/build/os-auto.mak.in (modified) (4 diffs)

pjproject/branches/split-3rd-party/pjmedia/build/os-auto.mak.in

@@ -2 +2 @@
 
 # PJMEDIA features exclusion
-export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_g711_plc@ @ac_no_speex_aec@
+export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@
 
 # Define the desired sound device backend
@@ -45 +45 @@
 export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0
 else
-export CODEC_OBJS += $(GSM_OBJS)
+export CODEC_OBJS += gsm.o
 endif
 
@@ -51 +51 @@
 export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0
 else
-export CODEC_OBJS += $(SPEEX_OBJS)
+export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include
+export CODEC_OBJS += speex_codec.o
 endif
 
@@ -57 +58 @@
 export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0
 else
-export CODEC_OBJS += $(ILBC_OBJS)
+export CODEC_OBJS += ilbc.o
 endif
 
 
 #
-# PortAudio on Unix
+# PortAudio
 #
-ifeq ($(AC_PJMEDIA_SND),pa_unix)
-# Host APIs and utils
-export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_hostapis.o $(PA_DIR)/pa_unix_util.o
-
-# Include ALSA?
-ifeq ($(AC_PA_USE_ALSA),1)
-export CFLAGS += -DPA_USE_ALSA=1
-export PJMEDIA_OBJS += $(PA_DIR)/pa_linux_alsa.o
-endif
-
-export CFLAGS += -DPA_USE_OSS=1 \
-                 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
-export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_oss.o
-endif
-
-
-#
-# 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 \
-                        $(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)
-#
-ifeq ($(AC_PJMEDIA_SND),pa_win32)
-export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \
-                       $(PA_DIR)/pa_win_wmme.o
-export CFLAGS += -DPA_NO_ASIO -DPA_NO_DS \
-                 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND
+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
 endif