tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] Split Qt flags

Browse Source 
The shared library won't link with things that we don't
use, like QtOpenGL anymore.
This commit is contained in:
Thiago Marcos P. Santos
2016-04-26 17:49:43 +03:00
parent 93b7d245f6
commit 18c337c845
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/qt/app/qmapboxgl.gypi
View File

@@ -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)',
],
},

8
platform/qt/platform.gyp
View File

@@ -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)',

11
platform/qt/scripts/configure.sh
View File

@@ -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