diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-03 15:16:49 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-07 18:01:02 -0700 |
commit | f964e40e7e9220d08751d8607af61ac5a7c0794c (patch) | |
tree | d34ca5407188fe3d71396faa8a8acceb52d9bd4b /gyp/platform-linux.gypi | |
parent | f5d66f362272db034a311d2077dbdb2937c9bbdf (diff) | |
download | qtlocation-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 'gyp/platform-linux.gypi')
-rw-r--r-- | gyp/platform-linux.gypi | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi deleted file mode 100644 index 3d2c042996..0000000000 --- a/gyp/platform-linux.gypi +++ /dev/null @@ -1,97 +0,0 @@ -{ - 'targets': [ - { 'target_name': 'platform-linux', - 'product_name': 'mbgl-platform-linux', - 'type': 'static_library', - 'standalone_static_library': 1, - 'hard_dependency': 1, - 'dependencies': [ - 'version', - 'loop', - ], - - 'sources': [ - '../platform/default/log_stderr.cpp', - '../platform/default/string_stdlib.cpp', - '../platform/default/thread.cpp', - '../platform/default/image.cpp', - '../platform/default/webp_reader.cpp', - '../platform/default/png_reader.cpp', - '../platform/default/jpeg_reader.cpp', - '../platform/default/default_file_source.cpp', - '../platform/default/online_file_source.cpp', - '../platform/default/mbgl/storage/offline.hpp', - '../platform/default/mbgl/storage/offline.cpp', - '../platform/default/mbgl/storage/offline_database.hpp', - '../platform/default/mbgl/storage/offline_database.cpp', - '../platform/default/mbgl/storage/offline_download.hpp', - '../platform/default/mbgl/storage/offline_download.cpp', - '../platform/default/sqlite3.hpp', - '../platform/default/sqlite3.cpp', - ], - - 'variables': { - 'cflags_cc': [ - '<@(opengl_cflags)', - '<@(libpng_cflags)', - '<@(libjpeg-turbo_cflags)', - '<@(nunicode_cflags)', - '<@(boost_cflags)', - '<@(sqlite_cflags)', - '<@(webp_cflags)', - '<@(rapidjson_cflags)', - '<@(variant_cflags)', - ], - 'ldflags': [ - '<@(libpng_ldflags)', - '<@(libjpeg-turbo_ldflags)', - '<@(nunicode_ldflags)', - '<@(sqlite_ldflags)', - '<@(zlib_ldflags)', - '<@(webp_ldflags)', - ], - 'libraries': [ - '<@(libpng_static_libs)', - '<@(libjpeg-turbo_static_libs)', - '<@(nunicode_static_libs)', - '<@(sqlite_static_libs)', - '<@(zlib_static_libs)', - '<@(webp_static_libs)', - ], - }, - - 'include_dirs': [ - '../include', - '../src', - '../platform/default', - ], - - 'conditions': [ - ['OS == "mac"', { - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], - } - }, { - 'cflags_cc': [ '<@(cflags_cc)' ], - }] - ], - - 'link_settings': { - 'conditions': [ - ['OS == "mac"', { - 'libraries': [ '<@(libraries)' ], - 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } - }, { - 'libraries': [ '<@(libraries)', '<@(ldflags)' ], - }] - ], - }, - - 'direct_dependent_settings': { - 'include_dirs': [ - '../include', - ], - }, - }, - ], -} |