diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-24 18:49:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 13:33:11 +0100 |
| commit | 9be81c588afc913f5214d78608fecafeef8bc160 (patch) | |
| tree | 19b06bff7e5016845ad30babc32ae5cc9f3834e6 /src/core/gyp_run.pro | |
| parent | 9a1a09bf82ea98a2b69b351120619c787ce990a8 (diff) | |
Get rid of GTK dependencies
Build with aura by default and remove GTK related code.
This patch introduces a mechanism for setting gyp build
configuration variables using a GYP_CONFIG and adds a
desktop_linux.pri configuration for this target.
Change-Id: I6b044ba52ebb20c187572669af94a6fc280b0412
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 82f18331b..0962c7cfe 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -4,6 +4,18 @@ TEMPLATE = aux +cross_compile { + GYP_ARGS = "-D qt_cross_compile=1" + posix: GYP_ARGS += "-D os_posix=1" +} else { + # !cross_compile + GYP_ARGS = "-D qt_cross_compile=0" + linux: include(config/desktop_linux.pri) +} + +# Append additional platform options defined in GYP_CONFIG +for (config, GYP_CONFIG): GYP_ARGS += "-D $$config" + # Copy this logic from qt_module.prf so that ninja can run according # to the same rules as the final module linking in core_module.pro. !host_build:if(win32|mac):!macx-xcode { @@ -11,9 +23,7 @@ TEMPLATE = aux contains(QT_CONFIG, build_all):CONFIG += build_all } -GYP_ARGS = "-D qt_cross_compile=0" cross_compile { - GYP_ARGS = "-D qt_cross_compile=1 -D os_posix=1" TOOLCHAIN_SYSROOT = $$[QT_SYSROOT] android { |