diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-06 09:47:48 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-07 15:16:48 +0100 |
| commit | 606c81a8463793f399d56764af878716239272c8 (patch) | |
| tree | 8a96d538340f0dfaf1b7654c914e9b79c67a18b9 /src | |
| parent | d6365ee7d90524d2070605f35d24ab07164a5208 (diff) | |
| download | qtscript-606c81a8463793f399d56764af878716239272c8.tar.gz | |
Build fix for Windows.
Deactivate min, max macros in windows.h
Change-Id: Ie045b6b278fa788d55eb8a3dbefb7fab6edb5934
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index b061321..3b83ac6 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -45,6 +45,8 @@ INCLUDEPATH = \ DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF win32-* { +# Prevent definition of min, max macros in windows.h + DEFINES+=NOMINMAX LIBS += -lwinmm } contains(JAVASCRIPTCORE_JIT,yes) { |