diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-10 07:13:36 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-10 07:13:36 +0000 |
| commit | c3d138dca533445f3d665e42bf02de2fa2a335fa (patch) | |
| tree | 27ed40fb7090ced15ee57d87aa77beb654f7599e | |
| parent | 6602789a480462235e416253144b3bec29f1c729 (diff) | |
As the Qt build will not use portaudio, we don't need to
put portaudio flags into config.pri
svn path=/trunk/; revision=52485
| -rw-r--r-- | Makefile.nmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1249e14328..489a2291df 100644 --- 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 |