diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 82 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 23 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 1 |
3 files changed, 63 insertions, 43 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index 4ed32eea14..01857aa562 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -1,50 +1,46 @@ { - 'conditions': [ - ['install_prefix != ""', { - 'targets': [ - { 'target_name': 'install', - 'type': 'none', - 'hard_dependency': 1, - 'dependencies': [ - 'core', - 'platform-<(platform_lib)', - 'http-<(http_lib)', - 'asset-<(asset_lib)', - 'cache-<(cache_lib)', - 'headless-<(headless_lib)', - 'standalone', - ], + 'targets': [ + { 'target_name': 'install2', + 'type': 'none', + 'hard_dependency': 1, + 'dependencies': [ + 'core', + 'platform-<(platform_lib)', + 'http-<(http_lib)', + 'asset-<(asset_lib)', + 'cache-<(cache_lib)', + 'headless-<(headless_lib)', + 'standalone', + ], - 'copies': [ - { 'files': [ '<(PRODUCT_DIR)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' }, - { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' }, - ], + 'copies': [ + { 'files': [ '<(PRODUCT_DIR)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' }, + { 'files': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp' ], 'destination': '<(install_prefix)/include/mbgl/util' }, + ], - 'actions': [ - { - 'action_name': 'Copy header files', - 'inputs': [ '../include/mbgl/mbgl.hpp' ], - 'outputs': [ '../include/mbgl/mbgl.hpp' ], - 'action': [ 'cp', '-r', 'include', '<(install_prefix)/' ] - }, + 'actions': [ + { + 'action_name': 'Copy header files', + 'inputs': [ '../include/mbgl/mbgl.hpp' ], + 'outputs': [ '<(install_prefix)/include/mbgl/mbgl.hpp' ], + 'action': [ 'cp', '-r', 'include', '<(install_prefix)/' ] + }, - { 'action_name': 'mbgl-config', - 'inputs': [ - '../utils/mbgl-config/mbgl-config.template.sh', - '../utils/mbgl-config/build.sh', - ], - 'outputs': [ - '<(install_prefix)/bin/mbgl-config', - ], - 'action': [ - './utils/mbgl-config/build.sh', - '<(install_prefix)', - '<(PRODUCT_DIR)/libmbgl.a.ldflags', - ] - } + { 'action_name': 'mbgl-config', + 'inputs': [ + '../utils/mbgl-config/mbgl-config.template.sh', + '../utils/mbgl-config/build.sh', + ], + 'outputs': [ + '<(install_prefix)/bin/mbgl-config', + ], + 'action': [ + './utils/mbgl-config/build.sh', + '<(install_prefix)', + '<(PRODUCT_DIR)/libmbgl.a.ldflags', ] - }, - ], - }], + } + ] + }, ], } diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index bb1b450728..a8a827af65 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -15,6 +15,19 @@ '../platform/darwin/application_root.mm', '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', + '../platform/darwin/reachability.m', + '../include/mbgl/ios/MGLMapView.h', + '../platform/ios/MGLMapView.mm', + '../include/mbgl/ios/MGLStyleFunctionValue.h', + '../platform/ios/MGLStyleFunctionValue.m', + '../include/mbgl/ios/MGLTypes.h', + '../platform/ios/MGLTypes.m', + '../include/mbgl/ios/NSArray+MGLAdditions.h', + '../platform/ios/NSArray+MGLAdditions.m', + '../include/mbgl/ios/NSDictionary+MGLAdditions.h', + '../platform/ios/NSDictionary+MGLAdditions.m', + '../include/mbgl/ios/UIColor+MGLAdditions.h', + '../platform/ios/UIColor+MGLAdditions.m', ], 'variables': { @@ -26,8 +39,14 @@ '<@(uv_static_libs)', ], 'ldflags': [ + '-framework CoreGraphics', + '-framework CoreLocation', '-framework ImageIO', + '-framework GLKit', '-framework MobileCoreServices', + '-framework OpenGLES', + '-framework SystemConfiguration', + '-framework UIKit', ], }, @@ -37,6 +56,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], + 'CLANG_ENABLE_OBJC_ARC': 'YES', }, 'link_settings': { @@ -50,6 +70,9 @@ 'include_dirs': [ '../include', ], + 'mac_bundle_resources': [ + '<!@(find ./platform/ios/resources -type f)', + ], }, }, ], diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index e3fe7b0d53..011f26e836 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -39,6 +39,7 @@ 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], + 'CLANG_ENABLE_OBJC_ARC': 'YES', }, 'link_settings': { |