diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/headless.cpp | 4 | ||||
| -rw-r--r-- | test/test.gyp | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/test/headless.cpp b/test/headless.cpp index 29db9500d4..1c583a9c07 100644 --- a/test/headless.cpp +++ b/test/headless.cpp @@ -2,16 +2,16 @@ #include <mbgl/map/map.hpp> #include <mbgl/util/image.hpp> -#include <mbgl/util/io.hpp> #include <mbgl/util/std.hpp> +#include <mbgl/util/io.hpp> #include <rapidjson/document.h> #include <rapidjson/writer.h> #include <rapidjson/stringbuffer.h> #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/platform/default/headless_display.hpp> -#include <mbgl/platform/default/caching_http_file_source.hpp> +#include <mbgl/storage/caching_http_file_source.hpp> #include "./fixtures/fixture_log.hpp" diff --git a/test/test.gyp b/test/test.gyp index 86dbcc08a5..5aec5ac3ac 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -23,6 +23,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { @@ -41,6 +42,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)'] } }, { @@ -59,6 +61,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)'] } }, { @@ -79,6 +82,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone' ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { @@ -97,6 +101,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { @@ -115,6 +120,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { @@ -133,6 +139,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { @@ -151,6 +158,7 @@ '../deps/gtest/gtest.gyp:gtest', '../mapboxgl.gyp:mbgl-standalone', ], + 'include_dirs': [ '../src' ], 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { @@ -184,7 +192,8 @@ '../mapboxgl.gyp:mbgl-standalone', '../mapboxgl.gyp:mbgl-headless', '<(platform_library)', - ] + ], + 'include_dirs': [ '../src' ] }, { 'target_name': 'text_conversions', 'product_name': 'test_text_conversions', @@ -198,6 +207,7 @@ '../mapboxgl.gyp:mbgl-standalone', '<(platform_library)', ], + 'include_dirs': [ '../src' ], 'variables': { 'cflags_cc': [ '-I<(boost_root)/include', |