diff options
Diffstat (limited to 'test/test.gypi')
| -rw-r--r-- | test/test.gypi | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/test/test.gypi b/test/test.gypi index 34c9d8dd56..32b686a80d 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -47,6 +47,7 @@ 'util/text_conversions.cpp', 'util/thread.cpp', 'util/thread_local.cpp', + 'util/tile_cover.cpp', 'util/timer.cpp', 'util/token.cpp', 'util/work_queue.cpp', @@ -57,6 +58,7 @@ 'api/render_missing.cpp', 'api/set_style.cpp', 'api/custom_layer.cpp', + 'api/offline.cpp', 'geometry/binpack.cpp', @@ -67,12 +69,10 @@ 'storage/storage.hpp', 'storage/storage.cpp', - 'storage/cache_response.cpp', - 'storage/cache_revalidate.cpp', - 'storage/cache_shared.cpp', - 'storage/cache_size.cpp', - 'storage/cache_stale.cpp', - 'storage/database.cpp', + 'storage/default_file_source.cpp', + 'storage/offline.cpp', + 'storage/offline_database.cpp', + 'storage/offline_download.cpp', 'storage/asset_file_source.cpp', 'storage/headers.cpp', 'storage/http_cancel.cpp', @@ -100,11 +100,6 @@ 'sprite/sprite_parser.cpp', 'sprite/sprite_store.cpp', ], - 'libraries': [ - '<@(gtest_static_libs)', - '<@(sqlite_static_libs)', - '<@(geojsonvt_static_libs)', - ], 'variables': { 'cflags_cc': [ '<@(gtest_cflags)', @@ -114,23 +109,37 @@ '<@(geojsonvt_cflags)', '<@(rapidjson_cflags)', '<@(pixelmatch_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(gtest_ldflags)', '<@(sqlite_ldflags)', ], + 'libraries': [ + '<@(gtest_static_libs)', + '<@(sqlite_static_libs)', + '<@(geojsonvt_static_libs)', + ], }, 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], - 'OTHER_LDFLAGS': [ '<@(ldflags)' ], }, }, { 'cflags_cc': [ '<@(cflags_cc)' ], - 'libraries': [ '<@(ldflags)' ], }], ], + 'link_settings': { + 'conditions': [ + ['OS == "mac"', { + 'libraries': [ '<@(libraries)' ], + 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } + }, { + 'libraries': [ '<@(libraries)', '<@(ldflags)' ], + }] + ], + }, }, ] } |