summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-01-21 19:30:58 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-02-04 10:49:05 +0100
commit8a1fce547e9ad0bf750418c844c9b23a3ee6d8dd (patch)
treee3f0e8f4b16071667c6a4fdf706740335500dbc6 /gyp
parent5503aef6907b1fea74d6bdbe696f02b9f016f752 (diff)
downloadqtlocation-mapboxgl-8a1fce547e9ad0bf750418c844c9b23a3ee6d8dd.tar.gz
rearrange tests and add storage tests
Diffstat (limited to 'gyp')
-rw-r--r--gyp/mbgl-android.gypi1
-rw-r--r--gyp/mbgl-linux.gypi4
-rw-r--r--gyp/mbgl-osx.gypi3
3 files changed, 4 insertions, 4 deletions
diff --git a/gyp/mbgl-android.gypi b/gyp/mbgl-android.gypi
index 85115910cd..17ce85eab2 100644
--- a/gyp/mbgl-android.gypi
+++ b/gyp/mbgl-android.gypi
@@ -33,7 +33,6 @@
],
},
'sources': [
- '../platform/android/cache_database_data.cpp',
'../platform/android/log_android.cpp',
'../platform/android/asset_request_libzip.cpp',
'../platform/default/string_stdlib.cpp',
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index c515e68bed..98449d744f 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -30,11 +30,11 @@
],
},
'sources': [
- '../platform/default/cache_database_tmp.cpp',
+ '../platform/default/shader_cache_tmp.cpp',
'../platform/default/log_stderr.cpp',
'../platform/default/string_stdlib.cpp',
+ '../platform/default/http_request_curl.cpp',
'../platform/default/asset_request_libuv.cpp',
- '../platform/default/http_request_baton_curl.cpp',
'../platform/default/application_root.cpp',
'../platform/default/image.cpp',
'../platform/default/image_reader.cpp',
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index 49135fd6c4..8de90a8a22 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -9,7 +9,7 @@
'version',
],
'sources': [
- '../platform/osx/cache_database_application_support.mm',
+ '../platform/osx/shader_cache_application_support.mm',
'../platform/darwin/log_nslog.mm',
'../platform/darwin/string_nsstring.mm',
'../platform/darwin/http_request_cocoa.mm',
@@ -33,6 +33,7 @@
],
'xcode_settings': {
'OTHER_LDFLAGS': [
+ '-framework Foundation',
'-framework ImageIO',
'-framework CoreServices',
],