diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-25 14:31:59 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-25 15:26:30 +0300 |
| commit | 5c3ae4c3d61fd028e03a59d0a897bea3d259d8e4 (patch) | |
| tree | 3347e47b4e9223ed45f57756450ed1beba5edfa7 | |
| parent | d00f55de418ecf2ae5f56ba73e249c0567ccd953 (diff) | |
| download | qtlocation-mapboxgl-5c3ae4c3d61fd028e03a59d0a897bea3d259d8e4.tar.gz | |
[Qt] Only include and link with QMapboxGL lib
Fixes #4808
| -rw-r--r-- | platform/qt/app/qmapboxgl.gypi | 5 | ||||
| -rw-r--r-- | platform/qt/platform.gyp | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/platform/qt/app/qmapboxgl.gypi b/platform/qt/app/qmapboxgl.gypi index 4a42d2c7a5..d3588a7667 100644 --- a/platform/qt/app/qmapboxgl.gypi +++ b/platform/qt/app/qmapboxgl.gypi @@ -10,7 +10,7 @@ ], 'dependencies': [ - 'platform-lib', + 'qt-lib', ], 'sources': [ @@ -21,7 +21,6 @@ 'include_dirs': [ '../include', - '../../../include', ], 'variables': { @@ -41,7 +40,7 @@ ['OS == "mac"', { 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags)' ], - 'OTHER_LDFLAGS': [ '<@(ldflags)', '-framework OpenGL' ], + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], }, }, { 'cflags_cc': [ '<@(cflags)' ], diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp index fb73c00ce1..d4f7dbc606 100644 --- a/platform/qt/platform.gyp +++ b/platform/qt/platform.gyp @@ -140,7 +140,6 @@ 'link_settings': { 'conditions': [ ['OS == "mac"', { - 'libraries': [ '-framework OpenGL' ], 'xcode_settings': { 'OTHER_LDFLAGS': [ '-all_load' ] } }] ], |