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

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

put portaudio flags into config.pri

svn path=/trunk/; revision=52485
This commit is contained in:
Jörg Mayer 2013-10-10 07:13:36 +00:00
parent 6602789a48
commit c3d138dca5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.nmake
View File

@ -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