summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-02 12:00:03 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-02 13:12:24 -0700
commit7800445c85b29f60b8f5ff265122182035af6ff0 (patch)
treeb52f49e8e5c88a9e88ccded3c8e1da18e6086b9a /platform
parent34f9618d31532c7872bef4529eaa138527a320c9 (diff)
downloadqtlocation-mapboxgl-7800445c85b29f60b8f5ff265122182035af6ff0.tar.gz
[core] Use gyp's direct_dependent_settings to propagate variant cflags
Diffstat (limited to 'platform')
-rw-r--r--platform/android/platform.gyp1
-rw-r--r--platform/ios/platform.gyp1
-rw-r--r--platform/linux/platform.gyp1
-rw-r--r--platform/osx/platform.gyp1
-rw-r--r--platform/qt/platform.gyp1
5 files changed, 0 insertions, 5 deletions
diff --git a/platform/android/platform.gyp b/platform/android/platform.gyp
index 599aa586ce..ce243e493e 100644
--- a/platform/android/platform.gyp
+++ b/platform/android/platform.gyp
@@ -51,7 +51,6 @@
'<@(rapidjson_cflags)',
'<@(nunicode_cflags)',
'<@(sqlite_cflags)',
- '<@(variant_cflags)',
'<@(jni.hpp_cflags)',
'<@(libzip_cflags)',
'<@(libpng_cflags)',
diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp
index 6458a55f2c..e4abff27e3 100644
--- a/platform/ios/platform.gyp
+++ b/platform/ios/platform.gyp
@@ -113,7 +113,6 @@
'<@(sqlite_cflags)',
'<@(zlib_cflags)',
'<@(rapidjson_cflags)',
- '<@(variant_cflags)',
],
'ldflags': [
'<@(sqlite_ldflags)',
diff --git a/platform/linux/platform.gyp b/platform/linux/platform.gyp
index 4bef3e69cd..236f0619f7 100644
--- a/platform/linux/platform.gyp
+++ b/platform/linux/platform.gyp
@@ -75,7 +75,6 @@
'<@(nunicode_cflags)',
'<@(sqlite_cflags)',
'<@(rapidjson_cflags)',
- '<@(variant_cflags)',
'<@(libcurl_cflags)',
'<@(libpng_cflags)',
'<@(libjpeg-turbo_cflags)',
diff --git a/platform/osx/platform.gyp b/platform/osx/platform.gyp
index 6b9915f5d5..c3f94935d3 100644
--- a/platform/osx/platform.gyp
+++ b/platform/osx/platform.gyp
@@ -70,7 +70,6 @@
'<@(sqlite_cflags)',
'<@(zlib_cflags)',
'<@(rapidjson_cflags)',
- '<@(variant_cflags)',
],
'CLANG_ENABLE_OBJC_ARC': 'YES',
'CLANG_ENABLE_MODULES': 'YES',
diff --git a/platform/qt/platform.gyp b/platform/qt/platform.gyp
index 53b3e5fa02..dc43e0200f 100644
--- a/platform/qt/platform.gyp
+++ b/platform/qt/platform.gyp
@@ -83,7 +83,6 @@
'<@(qt_network_cflags)',
'<@(rapidjson_cflags)',
'<@(sqlite_cflags)',
- '<@(variant_cflags)',
'<@(webp_cflags)',
'-fPIC',
],