osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update to Portaudio pa_stable_v19_20071207 

svn path=/trunk/; revision=25285
This commit is contained in:
Tomas Kukosa 2008-05-13 07:39:23 +00:00
parent a814581553
commit a1d164a5da
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.nmake
View File

@ -703,7 +703,7 @@ process_libs:
!ENDIF
!IFDEF PORTAUDIO_DIR
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
. portaudio_v19.zip
. portaudio_v19_2.zip
!ENDIF
!IFDEF SMI_DIR
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@ -804,8 +804,8 @@ clean_setup:
rm -r -f $(WIRESHARK_LIBS)/nasm-2.02
rm -r -f $(WIRESHARK_LIBS)/pcre-6.4
rm -r -f $(WIRESHARK_LIBS)/pcre-7.0
rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1
rm -r -f $(WIRESHARK_LIBS)/portaudio_v19
rm -r -f $(WIRESHARK_LIBS)/portaudio_v19_2
rm -r -f $(WIRESHARK_LIBS)/user-guide
rm -r -f $(WIRESHARK_LIBS)/WpdPack
rm -r -f $(WIRESHARK_LIBS)/AirPcap_Devpack_1_0_0_594

4
config.nmake
View File

@ -251,7 +251,7 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
# PORTAUDIO_DIR isn't defined.
#
#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19
PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
#
# Version number of PortAudio
@ -784,7 +784,7 @@ PORTAUDIO_CONFIG=^#define HAVE_LIBPORTAUDIO 1
PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\pa_common
PORTAUDIO_API_CONFIG=^#define PORTAUDIO_API_1 1
!ELSE
PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common
PORTAUDIO_CFLAGS=/I$(PORTAUDIO_DIR)\include /I$(PORTAUDIO_DIR)\src\common /I$(PORTAUDIO_DIR)\src\os\win /DPA_NO_DS /DPA_NO_ASIO
!ENDIF
!ELSE
PORTAUDIO_CFLAGS=

4
gtk/Makefile.nmake
View File

@ -45,6 +45,7 @@ WIRESHARK_WIN32_GTK_SRC = \
pa_win_util.c \
pa_win_hostapis.c \
pa_x86_plain_converters.c \
pa_win_waveformat.c \
!ENDIF
pa_win_wmme.c
!ENDIF
@ -110,6 +111,9 @@ pa_win_hostapis.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_hostapis.c
pa_x86_plain_converters.obj: $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c
$(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) $(PORTAUDIO_DIR)\src\os\win\pa_x86_plain_converters.c -o $@
pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c
$(CC) -c /Zi /W1 /Od $(PORTAUDIO_CFLAGS) -o $@ $?
!ENDIF
clean:

4
tools/win32-setup.sh
View File

@ -7,8 +7,8 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save previous tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-24/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-12/packages/"
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-12/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-13/packages/"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"