diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-01-24 21:26:22 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-01-24 21:26:22 +0000 |
| commit | 377322404ff8caadd6ea9e12d43c5e51fd3e79d5 (patch) | |
| tree | 56dc508f1ae2b94385c66021bc3113241e813aa7 /Makefile.nmake | |
| parent | abb8c5ef0866dd0f605848f4532caf3dc0f053db (diff) | |
Compile PortAudio if it's available.
svn path=/trunk/; revision=40708
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index cee46b69f6..48106dffee 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -392,7 +392,7 @@ config.h : config.h.win32 config.nmake ui\qt\config.pri: config.nmake Makefile.nmake @echo Creating <<ui\qt\config.pri -# Automatically generated from Makefile.nmake. Do not edit. +# Automatically generated from Makefile.nmake. Edit there, not here. VERSION = $(VERSION) WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR:\=/) GLIB_DIR = $(GTK_DIR:\=/) @@ -402,14 +402,15 @@ GNUTLS_DIR = $(GNUTLS_DIR:\=/) SMI_DIR = $(SMI_DIR:\=/) KFW_DIR = $(KFW_DIR:\=/) LUA_DIR = $(LUA_DIR:\=/) +PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/) MSVC_VARIANT = $(MSVC_VARIANT) WIRESHARK_LOCAL_CFLAGS = $(LOCAL_CFLAGS) WIRESHARK_STANDARD_CFLAGS = $(STANDARD_CFLAGS) -QMAKE_CFLAGS += $(STANDARD_CFLAGS) -QMAKE_CXXFLAGS += $(STANDARD_CFLAGS) +QMAKE_CFLAGS += $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) +QMAKE_CXXFLAGS += $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) DEFINES += _NEED_VAR_IMPORT_ |