From 0fb2109e9a14857f76d12c45beaac7fc9640487e Mon Sep 17 00:00:00 2001 From: Zoltan Arvai Date: Thu, 20 Feb 2014 17:46:08 +0100 Subject: 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 --- src/core/gyp_run.pro | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') 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 --") -- cgit v1.2.3