Define NOMINMAX for the entire Qt build.
svn path=/trunk/; revision=51955
This commit is contained in:
parent
52bcaf69af
commit
34e2a96d0b
|
@ -487,7 +487,9 @@ MSVC_VARIANT = $(MSVC_VARIANT)
|
||||||
MSVCR_DLL = "$(MSVCR_DLL:\=/)"
|
MSVCR_DLL = "$(MSVCR_DLL:\=/)"
|
||||||
|
|
||||||
QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
|
QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
|
||||||
QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_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_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS)
|
QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS)
|
||||||
|
|
||||||
<<KEEP
|
<<KEEP
|
||||||
|
|
|
@ -23,10 +23,6 @@
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(NOMINMAX)
|
|
||||||
#define NOMINMAX
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "summary_dialog.h"
|
#include "summary_dialog.h"
|
||||||
#include "ui_summary_dialog.h"
|
#include "ui_summary_dialog.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue