diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-03-27 13:11:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 19:45:24 +0100 |
| commit | 135655013ddf1d640faf83d2d28081a9d51676ec (patch) | |
| tree | 5fc577ca7e0c5118f647bac6535138c9a75fac21 /src/core/config | |
| parent | 072353fed80645a53b4bb22507dca5b98c023232 (diff) | |
Add more options for gyp on Windows
Turning off gyp's parallel processing that broken on Windows.
Disable nacl, remoting and ash.
Change-Id: If695799f94111135fcdf4130180e998d0094055d
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/windows.pri | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index c366b6a47..cd10bf07d 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -1,5 +1,10 @@ GYP_ARGS += "-D qt_os=\"win32\"" +GYP_CONFIG += \ + disable_nacl=1 \ + remoting=0 \ + use_ash=0 \ + # Libvpx build needs additional search path on Windows. git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$$git_chromium_src_dir\"" @@ -7,3 +12,6 @@ GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$$git_chr # Use path from environment for perl, bison and gperf instead of values set in WebKit's core.gypi. GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"gperf.exe\"" +# Gyp's parallel processing is broken on Windows +GYP_ARGS += "--no-parallel" + |