summaryrefslogtreecommitdiff
path: root/bin/offline.gypi
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-03 15:16:49 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-07 18:01:02 -0700
commitf964e40e7e9220d08751d8607af61ac5a7c0794c (patch)
treed34ca5407188fe3d71396faa8a8acceb52d9bd4b /bin/offline.gypi
parentf5d66f362272db034a311d2077dbdb2937c9bbdf (diff)
downloadqtlocation-mapboxgl-f964e40e7e9220d08751d8607af61ac5a7c0794c.tar.gz
[build] Refactor and simplify build system
* Main gyp files are now standardized as platform/<platform>/platform.gyp. * Each platform gyp file defines appropriate loop_lib and headless_lib variables. * Each platform gyp file includes mbgl.gypi, which defines base targets which may be useful to all platforms. * CI targets are consistent across platforms: `make $(PLATFORM) && make test-$(PLATFORM)`. * Renamed the "linux" test app to "glfw". It's now built in OS X CI. * Android build flakiness is fixed. * iOS CI builds the bench and iosapp targets. * Mesa version is now in one place. * CI scripts use bash "strict mode" and correct error handling. * All build output goes to the build directory. * Removed vestigial iOS/OS X/Android Travis scripts.
Diffstat (limited to 'bin/offline.gypi')
-rw-r--r--bin/offline.gypi42
1 files changed, 16 insertions, 26 deletions
diff --git a/bin/offline.gypi b/bin/offline.gypi
index 885a199b36..acdd17a749 100644
--- a/bin/offline.gypi
+++ b/bin/offline.gypi
@@ -1,49 +1,39 @@
{
- 'includes': [
- '../gyp/common.gypi',
- ],
'targets': [
- { 'target_name': 'mbgl-offline',
+ {
+ 'target_name': 'mbgl-offline',
'product_name': 'mbgl-offline',
'type': 'executable',
'dependencies': [
- 'mbgl.gyp:core',
- 'mbgl.gyp:platform-<(platform_lib)',
- 'mbgl.gyp:headless-<(headless_lib)',
- 'mbgl.gyp:http-<(http_lib)',
- 'mbgl.gyp:asset-<(asset_lib)',
- 'mbgl.gyp:copy_certificate_bundle',
+ 'platform-lib',
+ 'copy_certificate_bundle',
],
'include_dirs': [
+ '../include',
'../src',
],
'sources': [
- './offline.cpp',
+ 'offline.cpp',
],
- 'variables' : {
- 'cflags_cc': [
- '<@(boost_cflags)',
- ],
+ 'cflags_cc': [
+ '<@(boost_cflags)',
+ ],
+
+ 'link_settings': {
'libraries': [
'<@(boost_libprogram_options_static_libs)'
],
},
- 'conditions': [
- ['OS == "mac"', {
- 'libraries': [ '<@(libraries)' ],
- 'xcode_settings': {
- 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
- }
- }, {
- 'cflags_cc': [ '<@(cflags_cc)' ],
- 'libraries': [ '<@(libraries)' ],
- }]
- ],
+ 'xcode_settings': {
+ 'OTHER_CPLUSPLUSFLAGS': [
+ '<@(boost_cflags)',
+ ],
+ }
},
],
}