diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2014-03-26 13:13:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 15:47:32 +0100 |
commit | 175dba21885a5bcbd031c1cbc394825b5fbb783e (patch) | |
tree | ef8f83599c2d31e555bf1da5855f33f98777f96d | |
parent | 9be81c588afc913f5214d78608fecafeef8bc160 (diff) |
Introduce platform specific pri files for all platforms.
Define qt_os for all supported platforms.
Move simple platform specific flags into the pri files.
Change-Id: I09b030f4a8a815f48a8100d81669a7729218efc2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r-- | src/core/config/desktop_linux.pri | 2 | ||||
-rw-r--r-- | src/core/config/embedded_android.pri | 7 | ||||
-rw-r--r-- | src/core/config/embedded_linux.pri | 49 | ||||
-rw-r--r-- | src/core/config/mac_osx.pri | 2 | ||||
-rw-r--r-- | src/core/config/windows.pri | 9 | ||||
-rw-r--r-- | src/core/gyp_run.pro | 28 | ||||
-rw-r--r-- | src/core/qtwebengine.gypi | 6 |
7 files changed, 76 insertions, 27 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 47fb4de77..3eee962f7 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -1,3 +1,5 @@ +GYP_ARGS += "-D qt_os=\"desktop_linux\"" + GYP_CONFIG += \ desktop_linux=1 \ toolkit_uses_gtk=0 \ diff --git a/src/core/config/embedded_android.pri b/src/core/config/embedded_android.pri new file mode 100644 index 000000000..b2d0eb3ee --- /dev/null +++ b/src/core/config/embedded_android.pri @@ -0,0 +1,7 @@ + +CC = $$which($$QMAKE_CC) +ANDROID_TOOLCHAIN = $$dirname(CC) +TOOLCHAIN_SYSROOT = $$ANDROID_BUILD_TOP + +GYP_ARGS += "-D qt_os=\"embedded_android\" -D android_src=\"$${TOOLCHAIN_SYSROOT}\" -D android_toolchain=\"$${ANDROID_TOOLCHAIN}\"" \ + "-D android_ndk_root=\"$${TOOLCHAIN_SYSROOT}\" -D android_product_out=\"$${ANDROID_PRODUCT_OUT}\"" diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri new file mode 100644 index 000000000..d90072ef3 --- /dev/null +++ b/src/core/config/embedded_linux.pri @@ -0,0 +1,49 @@ +GYP_ARGS += "-D qt_os=\"embedded_linux\"" + +GYP_CONFIG += \ + embedded=1 \ + use_aura=1 \ + use_ozone=1 \ + use_openssl=1 \ + disable_nacl=1 \ + use_system_icu=1 \ + build_ffmpegsumo=0 \ + configuration_policy=0 \ + enable_autofill_dialog=0 \ + enable_automation=0 \ + enable_background=0 \ + enable_captive_portal_detection=0 \ + enable_extensions=0 \ + enable_google_now=0 \ + enable_language_detection=0 \ + enable_managed_users=0 \ + enable_plugin_installation=0 \ + enable_plugins=0 \ + enable_printing=0 \ + enable_session_service=0 \ + enable_spellcheck=0 \ + enable_task_manager=0 \ + enable_webrtc=0 \ + enable_themes=0 \ + notifications=0 \ + ozone_platform_dri=0 \ + ozone_platform_test=0 \ + p2p_apis=0 \ + safe_browsing=0 \ + toolkit_uses_gtk=0 \ + use_ash=0 \ + use_cups=0 \ + use_custom_freetype=0 \ + use_gconf=0 \ + use_gio=0 \ + use_gnome_keyring=0 \ + use_kerberos=0 \ + use_pango=0 \ + use_pulseaudio=0 \ + use_x11=0 \ + want_separate_host_toolset=0 \ + use_cairo=0 \ + desktop_linux=0 \ + v8_use_snapshot=false \ + gtest_target_type=none \ + diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri new file mode 100644 index 000000000..e4ff78c5a --- /dev/null +++ b/src/core/config/mac_osx.pri @@ -0,0 +1,2 @@ +GYP_ARGS += "-D qt_os=\"mac\" -D mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"" + diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri new file mode 100644 index 000000000..c366b6a47 --- /dev/null +++ b/src/core/config/windows.pri @@ -0,0 +1,9 @@ +GYP_ARGS += "-D qt_os=\"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=\"$$OUT_PWD/$$getConfigDir()/obj/$$git_chromium_src_dir\"" + +# Use path from environment for perl, bison and gperf instead of values set in WebKit's core.gypi. +GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"gperf.exe\"" + diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 0962c7cfe..73216de85 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -7,10 +7,14 @@ TEMPLATE = aux cross_compile { GYP_ARGS = "-D qt_cross_compile=1" posix: GYP_ARGS += "-D os_posix=1" + linux: include(config/embedded_linux.pri) + android: include(config/embedded_android.pri) } else { # !cross_compile GYP_ARGS = "-D qt_cross_compile=0" linux: include(config/desktop_linux.pri) + mac: include(config/mac_osx.pri) + win32: include(config/windows.pri) } # Append additional platform options defined in GYP_CONFIG @@ -26,19 +30,6 @@ for (config, GYP_CONFIG): GYP_ARGS += "-D $$config" cross_compile { TOOLCHAIN_SYSROOT = $$[QT_SYSROOT] - android { - CC = $$which($$QMAKE_CC) - ANDROID_TOOLCHAIN = $$dirname(CC) - TOOLCHAIN_SYSROOT = $$ANDROID_BUILD_TOP - - GYP_ARGS += "-D qt_os=\"android\" -D android_src=\"$${TOOLCHAIN_SYSROOT}\" -D android_toolchain=\"$${ANDROID_TOOLCHAIN}\"" \ - "-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") { @@ -79,17 +70,6 @@ cross_compile { GYP_ARGS += "-D CXX=\"$$which($$QMAKE_CXX)\"" } -mac: GYP_ARGS += "-D mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"" - -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=\"$$OUT_PWD/$$getConfigDir()/obj/$$git_chromium_src_dir\"" - - # Use path from environment for perl, bison and gperf instead of values set in WebKit's core.gypi. - GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"gperf.exe\"" -} - !build_pass { message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}...") !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --") diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index f3c0112c5..a64760fc3 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -46,10 +46,10 @@ '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator', ], }], - # android and embedded_linux need some special flags. - ['qt_os=="embedded_linux" or qt_os=="android"', { + # embedded_android and embedded_linux need some additional options. + ['qt_os=="embedded_linux" or qt_os=="embedded_android"', { 'conditions': [ - ['qt_os=="android"', { + ['qt_os=="embedded_android"', { 'dependencies': [ '<(chromium_src_dir)/third_party/ashmem/ashmem.gyp:ashmem', '<(chromium_src_dir)/third_party/freetype/freetype.gyp:ft2', |