tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Factor out libuv-related build logic

Browse Source
This commit is contained in:
John Firebaugh
2016-03-31 17:09:10 -07:00
parent 08c9406ed4
commit 7e9a4f15c5
6 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gyp/mbgl.gyp
View File

@@ -8,6 +8,45 @@
'core.gypi',
'none.gypi',
],
'targets': [
{ 'target_name': 'loop',
'product_name': 'mbgl-loop',
'type': 'static_library',
'standalone_static_library': 1,
'sources': [
'../platform/default/async_task.cpp',
'../platform/default/run_loop.cpp',
'../platform/default/timer.cpp',
],
'include_dirs': [
'../include',
'../src',
],
'cflags_cc': [
'<@(libuv_cflags)',
],
'link_settings': {
'libraries': [
'<@(libuv_static_libs)',
'<@(libuv_ldflags)',
],
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(libuv_cflags)' ],
}
}]
],
},
],
'conditions': [
['headless_lib == "cgl" and host == "osx"', { 'includes': [ 'headless-cgl.gypi' ] } ],
['headless_lib == "eagl" and host == "ios"', { 'includes': [ 'headless-eagl.gypi' ] } ],

7
gyp/platform-android.gypi
View File

@@ -7,18 +7,16 @@
'hard_dependency': 1,
'dependencies': [
'version',
'loop',
],
'sources': [
'../platform/android/src/log_android.cpp',
'../platform/default/async_task.cpp',
'../platform/default/run_loop.cpp',
'../platform/default/thread.cpp',
'../platform/default/string_stdlib.cpp',
'../platform/default/image.cpp',
'../platform/default/png_reader.cpp',
'../platform/default/jpeg_reader.cpp',
'../platform/default/timer.cpp',
'../platform/default/default_file_source.cpp',
'../platform/default/online_file_source.cpp',
'../platform/default/mbgl/storage/offline.hpp',
@@ -35,7 +33,6 @@
'cflags_cc': [
'<@(libpng_cflags)',
'<@(libjpeg-turbo_cflags)',
'<@(libuv_cflags)',
'<@(nunicode_cflags)',
'<@(boost_cflags)',
'<@(sqlite_cflags)',
@@ -45,7 +42,6 @@
'ldflags': [
'<@(libpng_ldflags)',
'<@(libjpeg-turbo_ldflags)',
'<@(libuv_ldflags)',
'<@(nunicode_ldflags)',
'<@(sqlite_ldflags)',
'<@(zlib_ldflags)',
@@ -53,7 +49,6 @@
'libraries': [
'<@(libpng_static_libs)',
'<@(libjpeg-turbo_static_libs)',
'<@(libuv_static_libs)',
'<@(nunicode_static_libs)',
'<@(sqlite_static_libs)',
'<@(zlib_static_libs)',

6
gyp/platform-ios.gypi
View File

@@ -8,12 +8,10 @@
'hard_dependency': 1,
'dependencies': [
'version',
'loop',
],
'sources': [
'../platform/default/async_task.cpp',
'../platform/default/run_loop.cpp',
'../platform/default/timer.cpp',
'../platform/default/default_file_source.cpp',
'../platform/default/online_file_source.cpp',
'../platform/default/mbgl/storage/offline.hpp',
@@ -80,7 +78,6 @@
'variables': {
'cflags_cc': [
'<@(libuv_cflags)',
'<@(boost_cflags)',
'<@(sqlite_cflags)',
'<@(zlib_cflags)',
@@ -92,7 +89,6 @@
'<@(zlib_ldflags)',
],
'libraries': [
'<@(libuv_static_libs)',
'<@(sqlite_static_libs)',
'<@(zlib_static_libs)',
'$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',

7
gyp/platform-linux.gypi
View File

@@ -7,19 +7,17 @@
'hard_dependency': 1,
'dependencies': [
'version',
'loop',
],
'sources': [
'../platform/default/async_task.cpp',
'../platform/default/log_stderr.cpp',
'../platform/default/string_stdlib.cpp',
'../platform/default/run_loop.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/timer.cpp',
'../platform/default/default_file_source.cpp',
'../platform/default/online_file_source.cpp',
'../platform/default/mbgl/storage/offline.hpp',
@@ -36,7 +34,6 @@
'cflags_cc': [
'<@(libpng_cflags)',
'<@(libjpeg-turbo_cflags)',
'<@(libuv_cflags)',
'<@(nunicode_cflags)',
'<@(boost_cflags)',
'<@(sqlite_cflags)',
@@ -47,7 +44,6 @@
'ldflags': [
'<@(libpng_ldflags)',
'<@(libjpeg-turbo_ldflags)',
'<@(libuv_ldflags)',
'<@(nunicode_ldflags)',
'<@(sqlite_ldflags)',
'<@(zlib_ldflags)',
@@ -56,7 +52,6 @@
'libraries': [
'<@(libpng_static_libs)',
'<@(libjpeg-turbo_static_libs)',
'<@(libuv_static_libs)',
'<@(nunicode_static_libs)',
'<@(sqlite_static_libs)',
'<@(zlib_static_libs)',

6
gyp/platform-osx.gypi
View File

@@ -7,12 +7,10 @@
'hard_dependency': 1,
'dependencies': [
'version',
'loop',
],
'sources': [
'../platform/default/async_task.cpp',
'../platform/default/run_loop.cpp',
'../platform/default/timer.cpp',
'../platform/default/default_file_source.cpp',
'../platform/default/online_file_source.cpp',
'../platform/default/mbgl/storage/offline.hpp',
@@ -68,7 +66,6 @@
'variables': {
'cflags_cc': [
'<@(libuv_cflags)',
'<@(boost_cflags)',
'<@(sqlite_cflags)',
'<@(zlib_cflags)',
@@ -79,7 +76,6 @@
'<@(zlib_ldflags)',
],
'libraries': [
'<@(libuv_static_libs)',
'<@(sqlite_static_libs)',
'<@(zlib_static_libs)',
'$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',

1
platform/android/mapboxgl-app.gypi
View File

@@ -34,7 +34,6 @@
'<@(libpng_static_libs)',
'<@(libjpeg-turbo_static_libs)',
'<@(sqlite_static_libs)',
'<@(libuv_static_libs)',
'<@(nunicode_static_libs)',
'<@(libzip_static_libs)',
],