diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-01-22 17:40:12 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 10:49:06 +0100 |
| commit | 9a549094e02b046eb67a3c3a1ed8df96791825ca (patch) | |
| tree | e6b867eac917fb852354e9171a2fefacbb474aa2 /gyp | |
| parent | 78376acea78056d9c20cc39bf98323adeedd22aa (diff) | |
| download | qtlocation-mapboxgl-9a549094e02b046eb67a3c3a1ed8df96791825ca.tar.gz | |
make ios compile
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-ios.gypi | 5 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index 2bc9ec718d..41b04e97c1 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -10,7 +10,7 @@ 'IPHONEOS_DEPLOYMENT_TARGET':'7.0', 'TARGETED_DEVICE_FAMILY': '1,2', 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'CLANG_ENABLE_OBJC_ARC': 'YES', + 'CLANG_ENABLE_OBJC_ARC': 'NO', 'CODE_SIGN_IDENTITY': 'iPhone Developer', 'SKIP_INSTALL': 'YES' }, @@ -34,10 +34,9 @@ 'version', ], 'sources': [ - '../platform/ios/cache_database_library.mm', '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', - '../platform/darwin/http_request_baton_cocoa.mm', + '../platform/darwin/http_request_cocoa.mm', '../platform/darwin/application_root.mm', '../platform/darwin/image.mm', '../platform/default/asset_request_libuv.cpp', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 98449d744f..ae873c5a9e 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -30,7 +30,6 @@ ], }, 'sources': [ - '../platform/default/shader_cache_tmp.cpp', '../platform/default/log_stderr.cpp', '../platform/default/string_stdlib.cpp', '../platform/default/http_request_curl.cpp', diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 8de90a8a22..352a132a06 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -9,7 +9,6 @@ 'version', ], 'sources': [ - '../platform/osx/shader_cache_application_support.mm', '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_cocoa.mm', |