diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-android.gypi | 79 | ||||
| -rw-r--r-- | gyp/mbgl-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-osx.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl-platform.gypi | 4 |
6 files changed, 87 insertions, 0 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 6d5fb7690d..d219ba2f99 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -32,6 +32,7 @@ 'cflags_cc': [ '-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin. '-Wno-literal-suffix', # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61653 + '-Wno-unknown-warning-option', '-Wno-error=unused-parameter', ], }], diff --git a/gyp/mbgl-android.gypi b/gyp/mbgl-android.gypi new file mode 100644 index 0000000000..21a6771d7f --- /dev/null +++ b/gyp/mbgl-android.gypi @@ -0,0 +1,79 @@ +{ + 'targets': [ + { 'target_name': 'mbgl-android', + 'product_name': 'mbgl-android', + 'type': 'static_library', + 'standalone_static_library': 1, + 'hard_dependency': 1, + 'variables': { + 'cflags_cc': [ + '<@(png_cflags)', + '<@(jpeg_cflags)', + '<@(uv_cflags)', + '<@(curl_cflags)', + '<@(nu_cflags)', + '<@(zip_cflags)', + '<@(openssl_cflags)', + '-I<(boost_root)/include', + ], + 'cflags': [ + '<@(uv_cflags)', + '<@(nu_cflags)', + ], + 'ldflags': [ + '<@(png_ldflags)', + '<@(jpeg_ldflags)', + '<@(uv_ldflags)', + '<@(curl_ldflags)', + '<@(nu_ldflags)', + '<@(zip_ldflags)', + ], + }, + 'sources': [ + '../platform/android/cache_database_data.cpp', + '../platform/android/log_android.cpp', + '../platform/android/asset_request_baton_libzip.cpp', + '../platform/default/string_stdlib.cpp', + '../platform/default/http_request_baton_curl.cpp', + '../platform/default/image.cpp', + '../platform/default/image_reader.cpp', + '../platform/default/png_reader.cpp', + '../platform/default/jpeg_reader.cpp', + '../platform/default/caching_http_file_source.cpp', + ], + 'include_dirs': [ + '../include', + ], + 'link_settings': { + 'libraries': [ + '<@(png_static_libs)', + ], + }, + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], + 'OTHER_CFLAGS': [ '<@(cflags)' ], + } + }, { + 'cflags_cc': [ '<@(cflags_cc)' ], + 'cflags': [ '<@(cflags)' ], + }] + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '../include', + ], + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], + } + }, { + 'ldflags': [ '<@(ldflags)' ], + }] + ], + }, + }, + ], +} diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index dd1c9c0c20..c2cb2eed5f 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -36,6 +36,7 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', + '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ '../include', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 9d979ddf13..5bfa8f757d 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -35,6 +35,7 @@ '../platform/default/image_reader.cpp', '../platform/default/png_reader.cpp', '../platform/default/jpeg_reader.cpp', + '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ '../include', diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 76c22f5ad6..0ca00a81e9 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -11,6 +11,7 @@ '../platform/darwin/string_nsstring.mm', '../platform/darwin/http_request_baton_cocoa.mm', '../platform/darwin/image.mm', + '../platform/default/asset_request_baton_noop.cpp', ], 'include_dirs': [ '../include', diff --git a/gyp/mbgl-platform.gypi b/gyp/mbgl-platform.gypi index 74ac9aecc6..08fa5f821c 100644 --- a/gyp/mbgl-platform.gypi +++ b/gyp/mbgl-platform.gypi @@ -12,5 +12,9 @@ 'includes': ['mbgl-linux.gypi'], 'variables': { 'platform_library': 'mbgl-linux' }, }], + ['platform == "android"', { + 'includes': ['mbgl-android.gypi'], + 'variables': { 'platform_library': 'mbgl-android' }, + }], ], } |