diff options
| -rw-r--r-- | gyp/mbgl-core.gypi | 4 | ||||
| -rw-r--r-- | macosx/mapboxgl-app.gyp | 31 |
2 files changed, 23 insertions, 12 deletions
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index c4b6712833..e6b90a6b27 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -48,6 +48,10 @@ { 'target_name': 'mbgl-standalone', 'type': 'none', + 'hard_dependency': 1, + 'dependencies': [ + 'mbgl-core' + ], 'variables': { 'core_lib':'<(PRODUCT_DIR)/libmbgl-core.a', 'standalone_lib':'<(PRODUCT_DIR)/libmbgl.a' diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp index 4e19e86a2d..e5789fffd6 100644 --- a/macosx/mapboxgl-app.gyp +++ b/macosx/mapboxgl-app.gyp @@ -35,18 +35,25 @@ 'MACOSX_DEPLOYMENT_TARGET':'10.9', 'CLANG_ENABLE_OBJC_ARC': 'YES' }, - 'libraries': [ - '<@(glfw3_static_libs)', - ], - 'libraries': [ - '-L<(PRODUCT_DIR)/', - '-lmbgl', - '<@(png_ldflags)', - '<@(sqlite3_ldflags)', - '<@(glfw3_static_libs)', - '<@(glfw3_ldflags)', - '<@(curl_ldflags)', - '<@(zlib_ldflags)', + 'variables' : { + 'ldflags': [ + '-L<(PRODUCT_DIR)/', + '-lmbgl', + '<@(sqlite3_ldflags)', + '<@(glfw3_static_libs)', + '<@(glfw3_ldflags)', + '<@(curl_ldflags)', + '<@(png_ldflags)' + ] + }, + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], + } + }, { + 'ldflags': [ '<@(ldflags)' ], + }] ], 'dependencies': [ '../mapboxgl.gyp:bundle_styles', |