diff options
| -rw-r--r-- | gyp/common.gypi | 2 | ||||
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 1 | ||||
| -rw-r--r-- | platform/android/mapboxgl-app.gypi | 1 | ||||
| -rw-r--r-- | platform/linux/mapboxgl-app.gypi | 1 | ||||
| -rw-r--r-- | test/test.gypi | 1 |
9 files changed, 8 insertions, 2 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 118c75000e..d54a31b640 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -20,7 +20,6 @@ '-Wno-variadic-macros', '-frtti', '-fexceptions', - '<@(variant_cflags)', '${CFLAGS}', ], 'GCC_WARN_PEDANTIC': 'YES', @@ -38,7 +37,6 @@ '-Wno-error=unused-parameter', '-frtti', '-fexceptions', - '<@(variant_cflags)', '${CFLAGS}', ], }], diff --git a/gyp/core.gypi b/gyp/core.gypi index acec3f15be..06497710d3 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -32,6 +32,7 @@ '<@(boost_cflags)', '<@(geojsonvt_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'cflags': [ '<@(opengl_cflags)', diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index 91962ed856..e31a9c9bec 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -40,6 +40,7 @@ '<@(boost_cflags)', '<@(sqlite_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(libpng_ldflags)', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index e33c3d453d..dc52db7acd 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -77,6 +77,7 @@ '<@(sqlite_cflags)', '<@(zlib_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(sqlite_ldflags)', diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 0fae25d4b8..8865f68e1e 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -43,6 +43,7 @@ '<@(sqlite_cflags)', '<@(webp_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(libpng_ldflags)', diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 804a4cd9a6..581937ac66 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -68,6 +68,7 @@ '<@(sqlite_cflags)', '<@(zlib_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(zlib_ldflags)', diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index 5f972e48ef..ecc5ceff04 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -26,6 +26,7 @@ 'cflags_cc': [ '<@(boost_cflags)', + '<@(variant_cflags)', ], 'libraries': [ '<@(libpng_static_libs)', diff --git a/platform/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi index a2c61e9d3b..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)', diff --git a/test/test.gypi b/test/test.gypi index f12588890a..32b686a80d 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -109,6 +109,7 @@ '<@(geojsonvt_cflags)', '<@(rapidjson_cflags)', '<@(pixelmatch_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(gtest_ldflags)', |