Moved mbgl::util::default_styles to a more appropriate location, where iOS platform code can also find it. Moved -[MGLMapView bundledStyleURLs] (which is now deprecated) and the style switcher in iosapp to default_styles. Added a collection of convenience methods for getting style URLs. It makes little sense to layer an enum atop this, as MapKit does, because MGLMapView styles aren’t limited to this set. A good analogy is UIColor. This also makes for a good entry point for future runtime styling APIs. Introduced independent constants for each default style, because it’s more common to need access to a particular style than to iterate over them. This fact is apparent in the MGLStyle class, which now uses macros and assertions to ensure that it’s kept up-to-date with changes in default_styles. /ref #1462
61 lines
1.5 KiB
Python
61 lines
1.5 KiB
Python
{
|
|
'includes': [
|
|
'../gyp/common.gypi',
|
|
],
|
|
'targets': [
|
|
{ 'target_name': 'linuxapp',
|
|
'product_name': 'mapbox-gl',
|
|
'type': 'executable',
|
|
|
|
'dependencies': [
|
|
'../mbgl.gyp:core',
|
|
'../mbgl.gyp:platform-<(platform_lib)',
|
|
'../mbgl.gyp:http-<(http_lib)',
|
|
'../mbgl.gyp:asset-<(asset_lib)',
|
|
'../mbgl.gyp:cache-<(cache_lib)',
|
|
'../mbgl.gyp:copy_certificate_bundle',
|
|
],
|
|
|
|
'sources': [
|
|
'main.cpp',
|
|
'../platform/default/settings_json.cpp',
|
|
'../platform/default/glfw_view.hpp',
|
|
'../platform/default/glfw_view.cpp',
|
|
'../platform/default/log_stderr.cpp',
|
|
],
|
|
|
|
'variables' : {
|
|
'cflags_cc': [
|
|
'<@(opengl_cflags)',
|
|
'<@(boost_cflags)',
|
|
'<@(glfw_cflags)',
|
|
'<@(variant_cflags)',
|
|
],
|
|
'ldflags': [
|
|
'<@(glfw_ldflags)',
|
|
],
|
|
'libraries': [
|
|
'<@(glfw_static_libs)',
|
|
],
|
|
},
|
|
|
|
'conditions': [
|
|
['OS == "mac"', {
|
|
'libraries': [ '<@(libraries)' ],
|
|
'xcode_settings': {
|
|
'SDKROOT': 'macosx',
|
|
'SUPPORTED_PLATFORMS':'macosx',
|
|
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
|
|
'OTHER_LDFLAGS': [ '<@(ldflags)' ],
|
|
'SDKROOT': 'macosx',
|
|
'MACOSX_DEPLOYMENT_TARGET': '10.9',
|
|
}
|
|
}, {
|
|
'cflags_cc': [ '<@(cflags_cc)' ],
|
|
'libraries': [ '<@(libraries)', '<@(ldflags)' ],
|
|
}]
|
|
],
|
|
},
|
|
],
|
|
}
|