diff options
| -rw-r--r-- | src/3rdparty/3rdparty.pro | 20 | ||||
| -rw-r--r-- | src/plugins/geoservices/geoservices.pro | 9 | ||||
| -rw-r--r-- | src/src.pro | 10 |
3 files changed, 13 insertions, 26 deletions
diff --git a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro deleted file mode 100644 index efdd8e51..00000000 --- a/src/3rdparty/3rdparty.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += poly2tri -SUBDIRS += clipper -SUBDIRS += clip2tri - -qtHaveModule(opengl) { - linux|android: { - equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapbox-gl-native - } - - greaterThan(QT_GCC_MAJOR_VERSION, 4) { - SUBDIRS += mapbox-gl-native - } - } - - ios|macos: { - SUBDIRS += mapbox-gl-native - } -} diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro index cedd159b..0c2a799e 100644 --- a/src/plugins/geoservices/geoservices.pro +++ b/src/plugins/geoservices/geoservices.pro @@ -5,15 +5,18 @@ SUBDIRS = nokia osm mapbox esri qtHaveModule(opengl) { linux|android: { equals(QT_GCC_MAJOR_VERSION, 4): greaterThan(QT_GCC_MINOR_VERSION, 8) { - SUBDIRS += mapboxgl + SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native + mapboxgl.depends = ../../3rdparty/mapbox-gl-native } greaterThan(QT_GCC_MAJOR_VERSION, 4) { - SUBDIRS += mapboxgl + SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native + mapboxgl.depends = ../../3rdparty/mapbox-gl-native } } ios|macos: { - SUBDIRS += mapboxgl + SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native + mapboxgl.depends = ../../3rdparty/mapbox-gl-native } } diff --git a/src/src.pro b/src/src.pro index a64ac534..d0a1ee4e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,13 +1,17 @@ TEMPLATE = subdirs +SUBDIRS += 3rdparty/clip2tri 3rdparty/clipper 3rdparty/poly2tri +3rdparty/clip2tri.depends = 3rdparty/clipper 3rdparty/poly2tri + SUBDIRS += positioning -plugins.depends += positioning 3rdparty +positioning.depends = 3rdparty/clip2tri qtHaveModule(quick) { - SUBDIRS += 3rdparty + plugins.depends += positioning SUBDIRS += location - location.depends += positioning 3rdparty + location.depends += positioning 3rdparty/clip2tri + plugins.depends += location SUBDIRS += imports |