diff options
| -rw-r--r-- | bin/render.gypi | 3 | ||||
| -rw-r--r-- | gyp/asset-fs.gypi | 18 | ||||
| -rw-r--r-- | gyp/asset-zip.gypi | 5 | ||||
| -rw-r--r-- | gyp/cache-sqlite.gypi | 3 | ||||
| -rw-r--r-- | gyp/core.gypi | 4 | ||||
| -rw-r--r-- | gyp/http-android.gypi | 18 | ||||
| -rw-r--r-- | gyp/http-curl.gypi | 3 | ||||
| -rw-r--r-- | gyp/http-nsurl.gypi | 9 | ||||
| -rw-r--r-- | test/test.gypi | 3 |
9 files changed, 0 insertions, 66 deletions
diff --git a/bin/render.gypi b/bin/render.gypi index c200350a4a..c01a75f8c3 100644 --- a/bin/render.gypi +++ b/bin/render.gypi @@ -28,16 +28,13 @@ 'variables' : { 'cflags_cc': [ '<@(glfw_cflags)', - '<@(libuv_cflags)', '<@(boost_cflags)', ], 'ldflags': [ '<@(glfw_ldflags)', - '<@(libuv_ldflags)', ], 'libraries': [ '<@(glfw_static_libs)', - '<@(libuv_static_libs)', '<@(boost_libprogram_options_static_libs)' ], }, diff --git a/gyp/asset-fs.gypi b/gyp/asset-fs.gypi index e84fabb629..a4f3f7f4f0 100644 --- a/gyp/asset-fs.gypi +++ b/gyp/asset-fs.gypi @@ -17,15 +17,8 @@ 'variables': { 'cflags_cc': [ - '<@(libuv_cflags)', '<@(boost_cflags)', ], - 'ldflags': [ - '<@(libuv_ldflags)', - ], - 'libraries': [ - '<@(libuv_static_libs)', - ], 'defines': [ '-DMBGL_ASSET_FS' ], @@ -54,17 +47,6 @@ }] ], }, - - 'link_settings': { - 'conditions': [ - ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], - 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } - }, { - 'libraries': [ '<@(libraries)', '<@(ldflags)' ], - }] - ], - }, }, ], } diff --git a/gyp/asset-zip.gypi b/gyp/asset-zip.gypi index 40459e516a..8a19da4fcd 100644 --- a/gyp/asset-zip.gypi +++ b/gyp/asset-zip.gypi @@ -17,20 +17,15 @@ 'variables': { 'cflags': [ - '<@(libuv_cflags)', '<@(libzip_cflags)', ], 'cflags_cc': [ - '<@(libuv_cflags)', '<@(libzip_cflags)', - '<@(boost_cflags)', ], 'ldflags': [ - '<@(libuv_ldflags)', '<@(libzip_ldflags)', ], 'libraries': [ - '<@(libuv_static_libs)', '<@(libzip_static_libs)', ], 'defines': [ diff --git a/gyp/cache-sqlite.gypi b/gyp/cache-sqlite.gypi index 704dc490ea..54774a4f05 100644 --- a/gyp/cache-sqlite.gypi +++ b/gyp/cache-sqlite.gypi @@ -19,16 +19,13 @@ 'variables': { 'cflags_cc': [ - '<@(libuv_cflags)', '<@(sqlite_cflags)', ], 'ldflags': [ - '<@(libuv_ldflags)', '<@(sqlite_ldflags)', '<@(zlib_ldflags)', ], 'libraries': [ - '<@(libuv_static_libs)', '<@(sqlite_static_libs)', '<@(zlib_static_libs)', ], diff --git a/gyp/core.gypi b/gyp/core.gypi index a1bf41a0e1..35a958f556 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -28,7 +28,6 @@ 'variables': { 'cflags_cc': [ - '<@(libuv_cflags)', '<@(opengl_cflags)', '<@(boost_cflags)', '<@(geojsonvt_cflags)', @@ -36,18 +35,15 @@ '<@(rapidjson_cflags)', ], 'cflags': [ - '<@(libuv_cflags)', '<@(opengl_cflags)', '<@(variant_cflags)', '<@(rapidjson_cflags)', '-fPIC' ], 'ldflags': [ - '<@(libuv_ldflags)', '<@(opengl_ldflags)', ], 'libraries': [ - '<@(libuv_static_libs)', '<@(geojsonvt_static_libs)', ], }, diff --git a/gyp/http-android.gypi b/gyp/http-android.gypi index c210db0fb6..84a44adcbc 100644 --- a/gyp/http-android.gypi +++ b/gyp/http-android.gypi @@ -17,15 +17,8 @@ 'variables': { 'cflags_cc': [ - '<@(libuv_cflags)', '<@(boost_cflags)', ], - 'ldflags': [ - '<@(libuv_ldflags)', - ], - 'libraries': [ - '<@(libuv_static_libs)', - ], 'defines': [ '-DMBGL_HTTP_ANDROID' ], @@ -54,17 +47,6 @@ }] ], }, - - 'link_settings': { - 'conditions': [ - ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], - 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } - }, { - 'libraries': [ '<@(libraries)', '<@(ldflags)' ], - }] - ], - }, }, ], } diff --git a/gyp/http-curl.gypi b/gyp/http-curl.gypi index 7ae5b1b75f..af4c2c5472 100644 --- a/gyp/http-curl.gypi +++ b/gyp/http-curl.gypi @@ -17,16 +17,13 @@ 'variables': { 'cflags_cc': [ - '<@(libuv_cflags)', '<@(libcurl_cflags)', '<@(boost_cflags)', ], 'ldflags': [ - '<@(libuv_ldflags)', '<@(libcurl_ldflags)', ], 'libraries': [ - '<@(libuv_static_libs)', '<@(libcurl_static_libs)', ], 'defines': [ diff --git a/gyp/http-nsurl.gypi b/gyp/http-nsurl.gypi index efd2c18a7d..af15520c56 100644 --- a/gyp/http-nsurl.gypi +++ b/gyp/http-nsurl.gypi @@ -16,15 +16,8 @@ ], 'variables': { - 'cflags_cc': [ - '<@(libuv_cflags)', - ], 'ldflags': [ '-framework Foundation', # For NSURLRequest - '<@(libuv_ldflags)', - ], - 'libraries': [ - '<@(libuv_static_libs)', ], 'defines': [ '-DMBGL_HTTP_NSURL' @@ -32,7 +25,6 @@ }, 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'CLANG_ENABLE_OBJC_ARC': 'NO', }, @@ -44,7 +36,6 @@ }, 'link_settings': { - 'libraries': [ '<@(libraries)' ], 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ], }, diff --git a/test/test.gypi b/test/test.gypi index 981440d8f6..708b89e74f 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -99,14 +99,12 @@ ], 'libraries': [ '<@(gtest_static_libs)', - '<@(libuv_static_libs)', '<@(sqlite_static_libs)', '<@(geojsonvt_static_libs)', ], 'variables': { 'cflags_cc': [ '<@(gtest_cflags)', - '<@(libuv_cflags)', '<@(opengl_cflags)', '<@(boost_cflags)', '<@(sqlite_cflags)', @@ -117,7 +115,6 @@ ], 'ldflags': [ '<@(gtest_ldflags)', - '<@(libuv_ldflags)', '<@(sqlite_ldflags)', ], }, |