diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-02-03 16:07:20 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-02-04 11:08:02 -0800 |
| commit | d7db9c775abafd852c3b935045443387191bf823 (patch) | |
| tree | 5e7f35cadc686c9476fd2e4107854396259ce0b9 | |
| parent | 7f27c742516c0f8777fb4e2834df937ba10be71f (diff) | |
| download | qtlocation-mapboxgl-d7db9c775abafd852c3b935045443387191bf823.tar.gz | |
[all] Make #include <mapbox/variant.hpp> universally accessible
| -rw-r--r-- | gyp/common.gypi | 2 | ||||
| -rw-r--r-- | gyp/core.gypi | 2 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-ios.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 |
8 files changed, 2 insertions, 8 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 6b7f2aea7e..c5eb30b3ab 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -20,6 +20,7 @@ '-Wno-variadic-macros', '-frtti', '-fexceptions', + '<@(variant_cflags)', '${CFLAGS}', ], 'GCC_WARN_PEDANTIC': 'YES', @@ -37,6 +38,7 @@ '-Wno-error=unused-parameter', '-frtti', '-fexceptions', + '<@(variant_cflags)', '${CFLAGS}', ], }], diff --git a/gyp/core.gypi b/gyp/core.gypi index 35a958f556..acec3f15be 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -31,12 +31,10 @@ '<@(opengl_cflags)', '<@(boost_cflags)', '<@(geojsonvt_cflags)', - '<@(variant_cflags)', '<@(rapidjson_cflags)', ], 'cflags': [ '<@(opengl_cflags)', - '<@(variant_cflags)', '<@(rapidjson_cflags)', '-fPIC' ], diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index 0471b753ef..8bb046a588 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -33,7 +33,6 @@ '<@(libuv_cflags)', '<@(nunicode_cflags)', '<@(boost_cflags)', - '<@(variant_cflags)', '<@(sqlite_cflags)', ], 'ldflags': [ diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index aab82387ed..f6d94b0e1c 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -69,7 +69,6 @@ 'cflags_cc': [ '<@(libuv_cflags)', '<@(boost_cflags)', - '<@(variant_cflags)', '<@(sqlite_cflags)', '<@(zlib_cflags)', ], diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 0c2d824ad6..2aedce8538 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -60,7 +60,6 @@ 'cflags_cc': [ '<@(libuv_cflags)', '<@(boost_cflags)', - '<@(variant_cflags)', '<@(sqlite_cflags)', '<@(zlib_cflags)', ], diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index bb849d64ab..0945fc1be2 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -26,7 +26,6 @@ '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 a37516e92a..3788efba43 100644 --- a/platform/linux/mapboxgl-app.gypi +++ b/platform/linux/mapboxgl-app.gypi @@ -28,7 +28,6 @@ '<@(opengl_cflags)', '<@(boost_cflags)', '<@(glfw_cflags)', - '<@(variant_cflags)', ], 'ldflags': [ '<@(glfw_ldflags)', diff --git a/test/test.gypi b/test/test.gypi index 8246c952b8..34c9d8dd56 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -112,7 +112,6 @@ '<@(boost_cflags)', '<@(sqlite_cflags)', '<@(geojsonvt_cflags)', - '<@(variant_cflags)', '<@(rapidjson_cflags)', '<@(pixelmatch_cflags)', ], |