From 7e9a4f15c5082dfe5987e1dcbb4b816f04068a60 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 31 Mar 2016 17:09:10 -0700 Subject: [PATCH] [build] Factor out libuv-related build logic --- gyp/mbgl.gyp | 39 ++++++++++++++++++++++++++++++ gyp/platform-android.gypi | 7 +----- gyp/platform-ios.gypi | 6 +---- gyp/platform-linux.gypi | 7 +----- gyp/platform-osx.gypi | 6 +---- platform/android/mapboxgl-app.gypi | 1 - 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/gyp/mbgl.gyp b/gyp/mbgl.gyp index 2acee2833..daea49136 100644 --- a/gyp/mbgl.gyp +++ b/gyp/mbgl.gyp @@ -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' ] } ], diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index e31a9c9be..38692c32b 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -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)', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 9ed2c4e8e..d1e62e724 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -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', diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 6da107590..172e7349f 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -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)', diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 1530f88b8..8f81276d5 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -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', diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi index 5e0e653a6..f9644c8d9 100644 --- a/platform/android/mapboxgl-app.gypi +++ b/platform/android/mapboxgl-app.gypi @@ -34,7 +34,6 @@ '<@(libpng_static_libs)', '<@(libjpeg-turbo_static_libs)', '<@(sqlite_static_libs)', - '<@(libuv_static_libs)', '<@(nunicode_static_libs)', '<@(libzip_static_libs)', ],