diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/core/gyp_configure_host.pro | 2 | ||||
| -rw-r--r-- | src/core/gyp_configure_target.pro | 2 | ||||
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 10 |
4 files changed, 10 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index b66341f8f..d3e523f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ src/core/Debug src/core/Release src/core/core_generated.gyp src/core/gypfiles -src/core/qmake_extras.gypi examples/webengine/quicknanobrowser/quicknanobrowser examples/webengine/quicknanobrowser/quicknanobrowser.app examples/webenginewidgets/browser/browser diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro index 3eb67389f..eb94cb802 100644 --- a/src/core/gyp_configure_host.pro +++ b/src/core/gyp_configure_host.pro @@ -10,7 +10,7 @@ GYPI_CONTENTS = "{" \ " ['CXX.host', '$$which($$QMAKE_CXX)']," \ " ['LD.host', '$$which($$QMAKE_LINK)']," -GYPI_FILE = $$absolute_path('qmake_extras.gypi') +GYPI_FILE = $$OUT_PWD/qmake_extras.gypi !build_pass { write_file($$GYPI_FILE, GYPI_CONTENTS) } diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro index 4d5204407..2a5996636 100644 --- a/src/core/gyp_configure_target.pro +++ b/src/core/gyp_configure_target.pro @@ -26,7 +26,7 @@ GYPI_CONTENTS += " ]," \ GYPI_CONTENTS += "}" -GYPI_FILE = $$absolute_path('qmake_extras.gypi') +GYPI_FILE = $$OUT_PWD/qmake_extras.gypi !exists($$GYPI_FILE): error("-- $$GYPI_FILE not found --") diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 970cce54e..6db73519a 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -57,13 +57,19 @@ def additional_include_files(args=[]): # Always include common.gypi. AddInclude(os.path.join(script_dir, 'common.gypi')) - # Include extra gypi files for additional build tweaks such as file exclusions, - # common stuff we generate and extract from qmake and platform specific drop-in files. + # Include extra gypi files for additional build tweaks such as file exclusions + # and platform specific drop-in files. build_extras = glob.glob(os.path.join(qtwebengine_root, 'src', 'core', '*_extras.gypi')) for build in build_extras: print "Using extra options found in " + build AddInclude(build) + # Include extra gypi files for common stuff we generate and extract from qmake. + build_extras = glob.glob(os.path.join(output_dir, '*_extras.gypi')) + for build in build_extras: + print "Using extra options found in " + build + AddInclude(build) + # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) for supplement in supplements: |