diff options
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 28 |
1 files changed, 4 insertions, 24 deletions
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 --") |