diff options
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | gyp/install.gypi | 2 | ||||
| m--------- | ios/mapbox-gl-cocoa | 0 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gyp | 25 | ||||
| -rw-r--r-- | macosx/mapboxgl-app.gyp | 3 |
5 files changed, 19 insertions, 18 deletions
@@ -45,13 +45,6 @@ case ${MASON_PLATFORM} in ZLIB_VERSION=system BOOST_VERSION=system ;; - 'osx') - GLFW_VERSION=a21f2377 - SQLITE_VERSION=system - LIBUV_VERSION=0.10.28 - ZLIB_VERSION=system - BOOST_VERSION=system - ;; *) GLFW_VERSION=a21f2377 SQLITE_VERSION=system diff --git a/gyp/install.gypi b/gyp/install.gypi index fc0411587b..df65d0457e 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -22,8 +22,6 @@ 'conditions': [ ['OS == "linux"', { 'other_ldflags': [ - '-L<(boost_root)/lib', - '-lboost_regex', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', ] diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa -Subproject f395112c34ecc754812d4325102ee273fa8ced0 +Subproject f853a95405ab477853fd57c6aecd10bb21399f2 diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index 913a1fac45..03a0c0aed7 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -22,13 +22,24 @@ '<@(glfw3_cflags)', '-I<(boost_root)/include', ], - 'libraries': [ - '<@(png_ldflags)', - '<@(sqlite3_ldflags)', - '<@(glfw3_static_libs)', - '<@(glfw3_ldflags)', - '<@(curl_ldflags)', - '<@(zlib_ldflags)', + 'variables': { + 'ldflags': [ + '<@(png_ldflags)', + '<@(sqlite3_ldflags)', + '<@(glfw3_static_libs)', + '<@(glfw3_ldflags)', + '<@(curl_ldflags)', + '<@(zlib_ldflags)', + ], + }, + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], + } + }, { + 'ldflags': [ '<@(ldflags)' ], + }] ], 'dependencies': [ '../mapboxgl.gyp:mbgl-standalone', diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp index 0e6fe38042..e948d054c2 100644 --- a/macosx/mapboxgl-app.gyp +++ b/macosx/mapboxgl-app.gyp @@ -40,8 +40,7 @@ '<@(sqlite3_ldflags)', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', - '<@(curl_ldflags)', - '<@(png_ldflags)' + '<@(zlib_ldflags)', ] }, 'conditions': [ |