As the Qt build will not use portaudio, we don't need to

put portaudio flags into config.pri

svn path=/trunk/; revision=52485

diff --git a/Makefile.nmake b/Makefile.nmake
index 1249e1432804183f490629e67b24b5a37d28a456..489a2291df1709aecf7995304e739d52d74dbf3c 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -479,7 +479,6 @@ GNUTLS_DIR = $(GNUTLS_DIR:\=/)
 SMI_DIR = $(SMI_DIR:\=/)
 KFW_DIR = $(KFW_DIR:\=/)
 LUA_DIR = $(LUA_DIR:\=/)
-PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/)
 GEOIP_DIR = $(GEOIP_DIR:\=/)
 WINSPARKLE_DIR = $(WINSPARKLE_DIR:\=/)
 
@@ -492,10 +491,10 @@ HHC_LIBS = $(HHC_LIBS)
 MSVC_VARIANT = $(MSVC_VARIANT)
 MSVCR_DLL = "$(MSVCR_DLL:\=/)"
 
-QMAKE_CFLAGS         *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
+QMAKE_CFLAGS         *= $(STANDARD_CFLAGS)
 # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
 # This avoids conflicts with the C++ standard library.
-QMAKE_CXXFLAGS       *= $(STANDARD_CFLAGS) /DNOMINMAX $(PORTAUDIO_CFLAGS:\=/)
+QMAKE_CXXFLAGS       *= $(STANDARD_CFLAGS) /DNOMINMAX
 QMAKE_LFLAGS         *= /LARGEADDRESSAWARE $(LDFLAGS)
 
 <<KEEP