diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-10 16:51:06 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-06-10 18:11:18 +0200 |
| commit | c373b6ca6c3bc2597a54cecffd409ea84798905f (patch) | |
| tree | 09f6067d368eeb8223553b3ac4a5254f4ace6547 /build | |
| parent | 83a2bc6d446387d25fd10164e87627c9d49878eb (diff) | |
Fix undefined symbols in debug builds.
process uses the same code as lib and decides at runtime which
code to run. Fix the debug build by making sure that all infrastructure
code is available in both process and lib by building common code
not shared directly through chromium sources in a separate static lib.
Diffstat (limited to 'build')
| -rw-r--r-- | build/exclude_chromium_sources.gypi | 1 | ||||
| -rwxr-xr-x | build/gyp_blinq | 2 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/build/exclude_chromium_sources.gypi b/build/exclude_chromium_sources.gypi index 1f96a5789..9e876d251 100644 --- a/build/exclude_chromium_sources.gypi +++ b/build/exclude_chromium_sources.gypi @@ -2,6 +2,7 @@ 'target_defaults': { # patterns used to exclude chromium files from the build when we have a drop-in replacement 'sources/': [ + ['exclude', 'browser/renderer_host/gtk_im_context_wrapper\\.cc$'], ['exclude', 'browser/renderer_host/render_widget_host_view_gtk\\.(cc|h)$'], ['exclude', 'browser/renderer_host/render_widget_host_view_mac.*\\.(mm|h)$'], ['exclude', 'browser/renderer_host/render_widget_host_view_win.*\\.(cc|h)$'], diff --git a/build/gyp_blinq b/build/gyp_blinq index a7eff0d6f..51d2f4cdc 100755 --- a/build/gyp_blinq +++ b/build/gyp_blinq @@ -5,6 +5,7 @@ import os import subprocess import sys +qtwebengine_src = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) chrome_src = os.path.abspath(os.environ.get('CHROMIUM_SRC_DIR')) # null-checked in build.pro script_dir = os.path.abspath(os.path.join(chrome_src, 'build')) if not os.path.isdir(script_dir): @@ -104,6 +105,7 @@ if __name__ == '__main__': args.extend(["--toplevel-dir=" + toplevel]) # Chromium specific Hack: for Chromium to build, the depth has to be set to the chromium src dir. args.extend(["--depth=" + chrome_src]) + args.extend(['-D', 'qtwebengine_src_dir=' + qtwebengine_src]) args.extend(['-D', 'chromium_src_dir=' + chrome_src]) # Tweak the output location and format (hardcode ninja for now) args.extend(['--generator-output', os.path.abspath(get_output_dir())]) diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index e727d6946..5cf0e3eb5 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -50,6 +50,11 @@ for (lib, LIBS): GYPI_CONTENTS += " '$$lib'," GYPI_CONTENTS += " ]," +!isEmpty(GYPDEPENDENCIES) { + GYPI_CONTENTS += " 'dependencies': [" + for (dep, GYPDEPENDENCIES): GYPI_CONTENTS += " '$$dep'," + GYPI_CONTENTS += " ]," +} !isEmpty(DEFINES) { GYPI_CONTENTS += " 'defines': [" for (define, DEFINES): GYPI_CONTENTS += " '$$define'," |