diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-02-20 17:46:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 13:39:48 +0100 |
| commit | 0fb2109e9a14857f76d12c45beaac7fc9640487e (patch) | |
| tree | 1c6473398cf06173c646b1dc82218113fd0c23b5 /src/core/gyp_run.pro | |
| parent | 9b4a0e619229d5cb426814056a4e8a569bad39a7 (diff) | |
Extend search path in libvpx to enable build with QtWebEngine
Paths are paritally hardcoded for Windows in libvpx.
Change-Id: Ic1c537bcc8b988c9803326709e38f44cb0943ee3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 9ab8ff6fc..782859818 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -58,6 +58,12 @@ cross_compile { GYP_ARGS += "-D CXX=\"$$which($$QMAKE_CXX)\"" } +win32 { +# Libvpx build needs additional search path on Windows. +git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") +GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$getOutDir()/$$getConfigDir()/obj/$$git_chromium_src_dir\"" +} + !build_pass { message(Running gyp_qtwebengine $${GYP_ARGS}...) !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --") |