diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-02-14 13:55:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-25 12:27:34 +0100 |
| commit | 5a94bc9ae151f24cf3eaf7f378bbc9c227f01208 (patch) | |
| tree | 59f626420321d5f507a6de6c94edc6ccc3bf8ba3 /src/core | |
| parent | 75aa1821d151f2103abece4942624104426e0c17 (diff) | |
Add qt_os embedded_linux for platform specific configuration.
Change-Id: I2c7878b0f5a84bc299d6c033a69e1f2f904168f3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/gyp_run.pro | 4 | ||||
| -rw-r--r-- | src/core/qtwebengine.gypi | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index d1867ada9..dd820f6b5 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -25,6 +25,10 @@ cross_compile { "-D android_ndk_root=\"$${TOOLCHAIN_SYSROOT}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\"" } + linux { + GYP_ARGS += "-D qt_os=\"embedded_linux\"" + } + !isEmpty(TOOLCHAIN_SYSROOT): GYP_ARGS += "-D sysroot=\"$${TOOLCHAIN_SYSROOT}\"" contains(QT_ARCH, "arm") { diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 801b8926d..0e1ab52b2 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -46,7 +46,17 @@ '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator', ], }], - ['_toolset=="target" and qt_os=="android"', { + # android and embedded_linux need some special flags. + ['qt_os=="embedded_linux" or qt_os=="android"', { + 'conditions': [ + ['qt_os=="android"', { + 'dependencies': [ + '<(chromium_src_dir)/third_party/ashmem/ashmem.gyp:ashmem', + '<(chromium_src_dir)/third_party/freetype/freetype.gyp:ft2', + '<(chromium_src_dir)/third_party/android_tools/ndk/android_tools_ndk.gyp:cpu_features', + ], + }], + ], 'configurations': { 'Debug_Base': { # Reduce the binary size. @@ -68,11 +78,6 @@ ], }, }, - 'dependencies': [ - '<(chromium_src_dir)/third_party/ashmem/ashmem.gyp:ashmem', - '<(chromium_src_dir)/third_party/freetype/freetype.gyp:ft2', - '<(chromium_src_dir)/third_party/android_tools/ndk/android_tools_ndk.gyp:cpu_features', - ], }], ['OS=="win"', { 'resource_include_dirs': [ |