diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-21 15:37:58 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-22 12:09:14 -0800 |
| commit | b60b6c47c0a13b98a0eee29e3b05eb4f9369012a (patch) | |
| tree | 0f1a126a1210b20f1b64e349bb7883cb955cfdb8 /gyp/platform-osx.gypi | |
| parent | ab0efe5d00aaa7c468e9f398b1a098f0e89c4112 (diff) | |
| download | qtlocation-mapboxgl-b60b6c47c0a13b98a0eee29e3b05eb4f9369012a.tar.gz | |
[core] Merge SQLiteCache into the platform library
OfflineFileSource will depend on SQLite too.
Diffstat (limited to 'gyp/platform-osx.gypi')
| -rw-r--r-- | gyp/platform-osx.gypi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 9af1cbd77a..ed4abea68f 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -15,6 +15,9 @@ '../platform/default/timer.cpp', '../platform/default/default_file_source.cpp', '../platform/default/online_file_source.cpp', + '../platform/default/sqlite_cache.cpp', + '../platform/default/sqlite3.hpp', + '../platform/default/sqlite3.cpp', '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/application_root.mm', @@ -59,9 +62,16 @@ '<@(libuv_cflags)', '<@(boost_cflags)', '<@(variant_cflags)', + '<@(sqlite_cflags)', + '<@(zlib_cflags)', + ], + 'ldflags': [ + '<@(zlib_ldflags)', ], 'libraries': [ '<@(libuv_static_libs)', + '<@(sqlite_static_libs)', + '<@(zlib_static_libs)', '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', '$(SDKROOT)/System/Library/Frameworks/CoreLocation.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', @@ -85,6 +95,9 @@ 'link_settings': { 'libraries': [ '<@(libraries)' ], + 'xcode_settings': { + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], + }, }, 'direct_dependent_settings': { |