Compile PortAudio if it's available.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40708 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index cee46b69f64eb12d6e842c516ff324202d92b429..48106dffeee909f19f5a992c73766e48c3764056 100644 (file)
--- 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_
 

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index 570d506a8df4b8d7f6dca5dc91045cf7a5f0a259..2bda910f23cd1b7b730676cc836e20e58127300f 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -144,6 +144,14 @@ FORMS += main_window.ui
 DEFINES += HAVE_CONFIG_H INET6 REENTRANT
 unix:DEFINES += _U_=\"__attribute__((unused))\"
 
+macx:QMAKE_LFLAGS += \
+    -framework CoreServices \
+    -framework ApplicationServices -framework CoreFoundation -framework CoreServices
+
+unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil \
+    -lpcap -lportaudio
+macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv
+
 # http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output
 unix: {
     EXTRA_BINFILES = \
@@ -163,6 +171,33 @@ mac {
 }
 
 win32 {
+    LIBS += \
+        wsock32.lib user32.lib shell32.lib comctl32.lib \
+        -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-1.7.0 \
+        -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0
+
+    !isEmpty(PORTAUDIO_DIR) {
+        PA_SOURCES = \
+            common/pa_allocation.c \
+            common/pa_converters.c \
+            common/pa_cpuload.c \
+            common/pa_dither.c \
+            common/pa_front.c \
+            common/pa_process.c \
+            common/pa_skeleton.c \
+            common/pa_stream.c \
+            common/pa_trace.c \
+            hostapi/wmme/pa_win_wmme.c \
+            os/win/pa_win_hostapis.c \
+            os/win/pa_win_util.c \
+            os/win/pa_win_waveformat.c \
+            os/win/pa_x86_plain_converters.c
+
+        for(FILE,PA_SOURCES){
+            SOURCES += $${PORTAUDIO_DIR}/src/$${FILE}
+        }
+    }
+
     EXTRA_BINFILES = \
         ../../dumpcap.exe \
         ../../epan/libwireshark.dll ../../wiretap/wiretap-1.7.0.dll ../../wsutil/libwsutil.dll \
@@ -193,18 +228,6 @@ win32 {
 
 }
 
-macx:QMAKE_LFLAGS += \
-    -framework CoreServices \
-    -framework ApplicationServices -framework CoreFoundation -framework CoreServices
-
-unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil \
-    -lpcap -lportaudio
-macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv
-
-win32:LIBS += \
-    wsock32.lib user32.lib shell32.lib comctl32.lib \
-    -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-1.7.0 \
-    -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0
 
 RESOURCES += \
     toolbar.qrc \