From 9d6f656169d7c4a2914b80325a02e8bd7af1b917 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 12 Mar 2008 23:21:06 +0000 Subject: Ticket #451: Updated PortAudio to the latest version git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1865 74dad513-b988-da41-8d7b-12977e46ad98 --- third_party/build/portaudio/libportaudio.dsp | 8 +- third_party/build/portaudio/libportaudio.vcp | 209 +++++++++++++++++++++--- third_party/build/portaudio/libportaudio.vcproj | 8 +- third_party/build/portaudio/os-auto.mak.in | 3 +- 4 files changed, 202 insertions(+), 26 deletions(-) (limited to 'third_party') diff --git a/third_party/build/portaudio/libportaudio.dsp b/third_party/build/portaudio/libportaudio.dsp index 688f4131..bb74d83b 100644 --- a/third_party/build/portaudio/libportaudio.dsp +++ b/third_party/build/portaudio/libportaudio.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /I "..\..\portaudio\src\os\win" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" F90=df.exe # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\portaudio\src\common" /I "..\..\portaudio\include" /I "..\..\portaudio\src\os\win" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /D "PA_NO_ASIO" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -169,6 +169,10 @@ SOURCE=..\..\portaudio\src\os\win\pa_win_util.c # End Source File # Begin Source File +SOURCE=..\..\portaudio\src\os\win\pa_win_waveformat.c +# End Source File +# Begin Source File + SOURCE=..\..\portaudio\src\os\win\pa_x86_plain_converters.c # End Source File # Begin Source File diff --git a/third_party/build/portaudio/libportaudio.vcp b/third_party/build/portaudio/libportaudio.vcp index 9b857cd2..47ac00ef 100644 --- a/third_party/build/portaudio/libportaudio.vcp +++ b/third_party/build/portaudio/libportaudio.vcp @@ -881,12 +881,10 @@ NODEP_CPP_PA_AL=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_AL=\ + "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_allocation.h"\ "..\..\portaudio\src\common\pa_util.h"\ -NODEP_CPP_PA_AL=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -1154,14 +1152,12 @@ NODEP_CPP_PA_CO=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_CO=\ + "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_converters.h"\ "..\..\portaudio\src\common\pa_dither.h"\ "..\..\portaudio\src\common\pa_endianness.h"\ "..\..\portaudio\src\common\pa_types.h"\ -NODEP_CPP_PA_CO=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -1411,12 +1407,10 @@ NODEP_CPP_PA_CP=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_CP=\ + "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_cpuload.h"\ "..\..\portaudio\src\common\pa_util.h"\ -NODEP_CPP_PA_CP=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -2042,6 +2036,8 @@ NODEP_CPP_PA_FR=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_FR=\ + "..\..\portaudio\include\portaudio.h"\ + "..\..\portaudio\src\common\pa_debugprint.h"\ "..\..\portaudio\src\common\pa_endianness.h"\ "..\..\portaudio\src\common\pa_hostapi.h"\ "..\..\portaudio\src\common\pa_stream.h"\ @@ -2049,9 +2045,6 @@ DEP_CPP_PA_FR=\ "..\..\portaudio\src\common\pa_types.h"\ "..\..\portaudio\src\common\pa_util.h"\ -NODEP_CPP_PA_FR=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -2347,14 +2340,12 @@ NODEP_CPP_PA_PR=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_PR=\ + "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_converters.h"\ "..\..\portaudio\src\common\pa_dither.h"\ "..\..\portaudio\src\common\pa_process.h"\ "..\..\portaudio\src\common\pa_util.h"\ -NODEP_CPP_PA_PR=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -2700,6 +2691,7 @@ NODEP_CPP_PA_SK=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_SK=\ + "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_allocation.h"\ "..\..\portaudio\src\common\pa_converters.h"\ "..\..\portaudio\src\common\pa_cpuload.h"\ @@ -2709,9 +2701,6 @@ DEP_CPP_PA_SK=\ "..\..\portaudio\src\common\pa_stream.h"\ "..\..\portaudio\src\common\pa_util.h"\ -NODEP_CPP_PA_SK=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -2973,11 +2962,9 @@ NODEP_CPP_PA_ST=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_ST=\ + "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_stream.h"\ -NODEP_CPP_PA_ST=\ - "..\..\portaudio\src\common\portaudio.h"\ - !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -3313,11 +3300,13 @@ DEP_CPP_PA_WI=\ !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" DEP_CPP_PA_WI=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ "..\..\portaudio\include\pa_win_wmme.h"\ "..\..\portaudio\include\portaudio.h"\ "..\..\portaudio\src\common\pa_allocation.h"\ "..\..\portaudio\src\common\pa_converters.h"\ "..\..\portaudio\src\common\pa_cpuload.h"\ + "..\..\portaudio\src\common\pa_debugprint.h"\ "..\..\portaudio\src\common\pa_dither.h"\ "..\..\portaudio\src\common\pa_hostapi.h"\ "..\..\portaudio\src\common\pa_process.h"\ @@ -3325,6 +3314,9 @@ DEP_CPP_PA_WI=\ "..\..\portaudio\src\common\pa_trace.h"\ "..\..\portaudio\src\common\pa_util.h"\ +NODEP_CPP_PA_WI=\ + "..\..\portaudio\src\hostapi\wmme\pa_win_wdmks_utils.h"\ + !ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" @@ -3796,6 +3788,181 @@ DEP_CPP_PA_WIN_=\ "..\..\portaudio\src\common\pa_util.h"\ +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\portaudio\src\os\win\pa_win_waveformat.c + +!IF "$(CFG)" == "libportaudio - Win32 (WCE MIPSII_FP) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSII_FP) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSII) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSII) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE SH4) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE SH4) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE SH3) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE SH3) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSIV) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSIV) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE emulator) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE emulator) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4I) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4I) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSIV_FP) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPSIV_FP) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPS16) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE MIPS16) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4T) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE ARMV4T) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE x86) Release" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + +!ELSEIF "$(CFG)" == "libportaudio - Win32 (WCE x86) Debug" + +DEP_CPP_PA_WIN_W=\ + "..\..\portaudio\include\pa_win_waveformat.h"\ + "..\..\portaudio\include\portaudio.h"\ + + !ENDIF # End Source File diff --git a/third_party/build/portaudio/libportaudio.vcproj b/third_party/build/portaudio/libportaudio.vcproj index a8b4831b..de6170c3 100644 --- a/third_party/build/portaudio/libportaudio.vcproj +++ b/third_party/build/portaudio/libportaudio.vcproj @@ -41,7 +41,7 @@ + + diff --git a/third_party/build/portaudio/os-auto.mak.in b/third_party/build/portaudio/os-auto.mak.in index 5cfd2a62..fb76af43 100644 --- a/third_party/build/portaudio/os-auto.mak.in +++ b/third_party/build/portaudio/os-auto.mak.in @@ -47,7 +47,8 @@ endif # PortAudio on MacOS X (using current PortAudio) # ifeq ($(AC_PJMEDIA_SND),pa_darwinos) -export PORTAUDIO_OBJS +=pa_mac_hostapis.o \ +#export PORTAUDIO_OBJS +=pa_mac_hostapis.o +export PORTAUDIO_OBJS += \ pa_unix_util.o \ pa_mac_core.o \ pa_mac_core_blocking.o \ -- cgit v1.2.3