diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-11 10:25:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-11 10:25:38 +0000 |
| commit | c305cc06c74cb95ef2ddfacee0ede1d82e3dbb3c (patch) | |
| tree | e09e2ccbc9bda8f46737c89e8b2297061d6daade /src/core/gyp_run.pro | |
| parent | f658dcb0893e7869cc0c029bfe0be82838af4bb8 (diff) | |
| parent | ccf12049b662fe1b03b5b0ea199d29b32f072eda (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index e83db387b..02d1e41d6 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -83,9 +83,22 @@ contains(QT_ARCH, "arm") { contains(QMAKE_CFLAGS, "-mthumb"): GYP_CONFIG += arm_thumb=1 } +contains(QT_ARCH, "mips") { + !cross_compile: GYP_CONFIG += sysroot=\"\" + GYP_CONFIG += target_arch=mipsel + + contains(QMAKE_CFLAGS, "mips32r6"): mips_arch_variant=\"r6\" + else: contains(QMAKE_CFLAGS, "mips32r2"): mips_arch_variant=\"r2\" + else: contains(QMAKE_CFLAGS, "mips32"): mips_arch_variant=\"r1\" + + contains(QMAKE_CFLAGS, "-mdsp2"): GYP_CONFIG += mips_dsp_rev=2 + else: contains(QMAKE_CFLAGS, "-mdsp"): GYP_CONFIG += mips_dsp_rev=1 +} + contains(QT_ARCH, "x86_64"): GYP_CONFIG += target_arch=x64 contains(QT_ARCH, "i386"): GYP_CONFIG += target_arch=ia32 contains(QT_ARCH, "arm64"): GYP_CONFIG += target_arch=arm64 +contains(QT_ARCH, "mips64"): GYP_CONFIG += target_arch=mips64el contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_CONFIG += proprietary_codecs=1 ffmpeg_branding=Chrome |