diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-26 17:49:43 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-26 18:36:07 +0300 |
| commit | 18c337c845921debb4428c7c0cabdbed9035655b (patch) | |
| tree | 4e3b79b6a1b8a27978320b6d1c289db2bbc36153 | |
| parent | 93b7d245f6fc9a544f0e69c4f75015a145b043d0 (diff) | |
| download | qtlocation-mapboxgl-18c337c845921debb4428c7c0cabdbed9035655b.tar.gz | |
[Qt] Split Qt flags
The shared library won't link with things that we don't
use, like QtOpenGL anymore.
| -rw-r--r-- | platform/qt/app/qmapboxgl.gypi | 8 | ||||
| -rw-r--r-- | platform/qt/platform.gyp | 8 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 11 |
3 files changed, 21 insertions, 6 deletions
diff --git a/platform/qt/app/qmapboxgl.gypi b/platform/qt/app/qmapboxgl.gypi index b2cc3c4b18..62a2939ad2 100644 --- a/platform/qt/app/qmapboxgl.gypi +++ b/platform/qt/app/qmapboxgl.gypi @@ -26,12 +26,16 @@ 'variables': { 'cflags': [ '<@(opengl_cflags)', - '<@(qt_cflags)', + '<@(qt_core_cflags)', + '<@(qt_gui_cflags)', + '<@(qt_opengl_cflags)', '-fPIC', ], 'ldflags': [ '<@(opengl_ldflags)', - '<@(qt_ldflags)' + '<@(qt_core_ldflags)', + '<@(qt_gui_ldflags)', + '<@(qt_opengl_ldflags)', ], }, diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp index 3e22d18424..fb833e985c 100644 --- a/platform/qt/platform.gyp +++ b/platform/qt/platform.gyp @@ -69,7 +69,9 @@ '<@(libjpeg-turbo_cflags)', '<@(nunicode_cflags)', '<@(opengl_cflags)', - '<@(qt_cflags)', + '<@(qt_core_cflags)', + '<@(qt_gui_cflags)', + '<@(qt_network_cflags)', '<@(rapidjson_cflags)', '<@(sqlite_cflags)', '<@(variant_cflags)', @@ -80,7 +82,9 @@ '<@(libjpeg-turbo_ldflags)', '<@(nunicode_ldflags)', '<@(opengl_ldflags)', - '<@(qt_ldflags)', + '<@(qt_core_ldflags)', + '<@(qt_gui_ldflags)', + '<@(qt_network_ldflags)', '<@(sqlite_ldflags)', '<@(webp_ldflags)', '<@(zlib_ldflags)', diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index ec88247c94..321a0ffa66 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -31,8 +31,15 @@ fi function print_qt_flags { mason install Qt system - CONFIG+=" 'qt_cflags%': $(quote_flags $(mason cflags Qt system "QtCore QtGui QtOpenGL QtNetwork")),"$LN - CONFIG+=" 'qt_ldflags%': $(quote_flags $(mason ldflags Qt system "QtCore QtGui QtOpenGL QtNetwork")),"$LN + CONFIG+=" 'qt_core_cflags%': $(quote_flags $(mason cflags Qt system "QtCore")),"$LN + CONFIG+=" 'qt_gui_cflags%': $(quote_flags $(mason cflags Qt system "QtGui")),"$LN + CONFIG+=" 'qt_opengl_cflags%': $(quote_flags $(mason cflags Qt system "QtOpenGL")),"$LN + CONFIG+=" 'qt_network_cflags%': $(quote_flags $(mason cflags Qt system "QtNetwork")),"$LN + + CONFIG+=" 'qt_core_ldflags%': $(quote_flags $(mason ldflags Qt system "QtCore")),"$LN + CONFIG+=" 'qt_gui_ldflags%': $(quote_flags $(mason ldflags Qt system "QtGui")),"$LN + CONFIG+=" 'qt_opengl_ldflags%': $(quote_flags $(mason ldflags Qt system "QtOpenGL")),"$LN + CONFIG+=" 'qt_network_ldflags%': $(quote_flags $(mason ldflags Qt system "QtNetwork")),"$LN QT_VERSION_MAJOR=$(qmake -query QT_VERSION | cut -d. -f1) if hash moc 2>/dev/null && hash rcc 2>/dev/null; then |