diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-07-03 18:22:13 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-07-04 19:16:55 +0200 |
| commit | dbade2bcd58b3fe44fa16f950d5cbcf0a61f7136 (patch) | |
| tree | d1c1e19da93332c78d85272faa006e324338eb4e /build | |
| parent | 0875045c9714fbac897a8b9f277bb1b1ccfef962 (diff) | |
Cleanup include mechanism
Add proper support for GYPINCLUDES in gyp_generation.
Rename the exclusion gypi to a more generic name so we
can use it for more intrusive changes (we'll need it for mac).
Change-Id: Ie26f579c33d5e35b8c904fab9f448cde11bf0072
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'build')
| -rwxr-xr-x | build/gyp_qtwebengine | 4 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 12 | ||||
| -rw-r--r-- | build/qtwebengine_extras.gypi (renamed from build/exclude_chromium_sources.gypi) | 0 |
3 files changed, 9 insertions, 7 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine index 11889adbf..04dece7eb 100755 --- a/build/gyp_qtwebengine +++ b/build/gyp_qtwebengine @@ -60,8 +60,8 @@ def additional_include_files(args=[]): # Always include common.gypi. AddInclude(os.path.join(script_dir, 'common.gypi')) - # Files to exclude from the chromium build. - AddInclude(os.path.join(os.getcwd(), 'exclude_chromium_sources.gypi')) + # Used for additional build tweaks such as file exclusions + AddInclude(os.path.join(qtwebengine_src, 'build', 'qtwebengine_extras.gypi')) # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index d2d5886d6..d448342e4 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -40,11 +40,13 @@ GYPI_CONTENTS = "{" \ " 'targets': [" \ " {" \ " 'target_name': '$$TARGET'," \ - " 'type': '$$TARGET_TYPE'," \ - " 'includes': [" \ - " '../qtwebengine.gypi'," \ - " ]," \ - " 'ldflags': [" + " 'type': '$$TARGET_TYPE'," +!isEmpty(GYPINCLUDES) { +GYPI_CONTENTS += " 'includes': [" +for (incl, GYPINCLUDES): GYPI_CONTENTS += " '$$incl'," +GYPI_CONTENTS += " ]," +} +GYPI_CONTENTS += " 'ldflags': [" for (lib, LIBS): GYPI_CONTENTS += " '$$lib'," !isEmpty(QMAKE_RPATHDIR): GYPI_CONTENTS += " '$$QMAKE_RPATH$$QMAKE_RPATHDIR'," diff --git a/build/exclude_chromium_sources.gypi b/build/qtwebengine_extras.gypi index d37c1bd65..d37c1bd65 100644 --- a/build/exclude_chromium_sources.gypi +++ b/build/qtwebengine_extras.gypi |