diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-04-28 14:57:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 12:57:12 +0200 |
| commit | c588754eb497f1b4e6a1daf23210e883b3de7669 (patch) | |
| tree | ddcbfa9384e813ccc869692fb43650c48669eae2 | |
| parent | 96108bc71996279395a3966e79bb37577e9e9be7 (diff) | |
Set target_arch based on QT_ARCH for x86 and x86_64
This is needed when cross-compiling for the emulator.
Change-Id: I499c97df2deba8b91162c8f636bb5a25eba1bc29
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | src/core/gyp_run.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 9bfa6268b..874434e40 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -73,6 +73,9 @@ cross_compile { GYP_ARGS += "-D CXX=\"$$which($$QMAKE_CXX)\"" } +contains(QT_ARCH, "x86_64"): GYP_ARGS += "-D target_arch=x64" +contains(QT_ARCH, "i386"): GYP_ARGS += "-D target_arch=ia32" + contains(WEBENGINE_CONFIG, proprietary_codecs): GYP_ARGS += "-Dproprietary_codecs=1 -Dffmpeg_branding=Chrome -Duse_system_ffmpeg=0" !build_pass { |