diff options
Diffstat (limited to 'platform/linux/mapboxgl-app.gypi')
| -rw-r--r-- | platform/linux/mapboxgl-app.gypi | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/platform/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi index 3788efba43..533f0b85d2 100644 --- a/platform/linux/mapboxgl-app.gypi +++ b/platform/linux/mapboxgl-app.gypi @@ -28,6 +28,7 @@ '<@(opengl_cflags)', '<@(boost_cflags)', '<@(glfw_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(glfw_ldflags)', @@ -39,20 +40,27 @@ 'conditions': [ ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], 'xcode_settings': { 'SDKROOT': 'macosx', 'SUPPORTED_PLATFORMS':'macosx', 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], - 'OTHER_LDFLAGS': [ '<@(ldflags)' ], - 'SDKROOT': 'macosx', 'MACOSX_DEPLOYMENT_TARGET': '10.10', - } + }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], - 'libraries': [ '<@(libraries)', '<@(ldflags)' ], }] ], + + 'link_settings': { + 'conditions': [ + ['OS == "mac"', { + 'libraries': [ '<@(libraries)' ], + 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } + }, { + 'libraries': [ '<@(libraries)', '<@(ldflags)' ], + }] + ], + }, }, ], } |