diff options
author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-06-02 10:42:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 15:02:47 +0200 |
commit | 65bf1a1334acce38983896241d3b211e1fa4659a (patch) | |
tree | d3be651f90234f9464c063c875c9173f4f5bd26b | |
parent | 3c181552ac5983f93ba0562063897be7772a570b (diff) |
Move gyp defines to os specific config for Windows
Currently some variables defined in os independent section.
Change-Id: I661d840b2271dc4bccf98dc2a252feaf6907952c
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
-rw-r--r-- | src/core/config/windows.gypi | 8 | ||||
-rw-r--r-- | src/core/config/windows.pri | 2 | ||||
-rw-r--r-- | src/core/qtwebengine_extras.gypi | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/core/config/windows.gypi b/src/core/config/windows.gypi new file mode 100644 index 000000000..0b9842c53 --- /dev/null +++ b/src/core/config/windows.gypi @@ -0,0 +1,8 @@ +{ + 'variables': { + 'win_use_allocator_shim': 0, + 'win_release_RuntimeLibrary': 2, + 'win_debug_RuntimeLibrary': 3, + 'chrome_multiple_dll': 0, + }, +} diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index cd10bf07d..bb82eb783 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -1,4 +1,4 @@ -GYP_ARGS += "-D qt_os=\"win32\"" +GYP_ARGS += "-D qt_os=\"win32\" -I config/windows.gypi" GYP_CONFIG += \ disable_nacl=1 \ diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 8cd2ff913..fe035a0b1 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -2,10 +2,6 @@ 'variables': { 'werror%': '', 'qt_os%': '', - 'win_use_allocator_shim': 0, - 'win_release_RuntimeLibrary': 2, - 'win_debug_RuntimeLibrary': 3, - 'chrome_multiple_dll': 0, }, 'target_defaults': { # patterns used to exclude chromium files from the build when we have a drop-in replacement |