summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-01-29 18:30:46 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-02-04 10:49:09 +0100
commit29baacf3a5bb773d94d08d16b81c3cda45a44eb6 (patch)
tree1dc3ca456151138ee5e8b7cf88b3afcecc3df1db /gyp
parent3d51e116a84ee168975bcee8377e9156f77e2731 (diff)
downloadqtlocation-mapboxgl-29baacf3a5bb773d94d08d16b81c3cda45a44eb6.tar.gz
refactor makefile
Diffstat (limited to 'gyp')
-rw-r--r--gyp/asset-fs.gypi52
-rw-r--r--gyp/asset-zip.gypi62
-rw-r--r--gyp/cache-sqlite.gypi (renamed from gyp/mbgl-storage-curl.gypi)11
-rw-r--r--gyp/common.gypi5
-rw-r--r--gyp/core.gypi (renamed from gyp/mbgl-core.gypi)2
-rw-r--r--gyp/headless-cgl.gypi (renamed from gyp/mbgl-headless.gypi)4
-rw-r--r--gyp/headless-glx.gypi18
-rw-r--r--gyp/http-curl.gypi55
-rw-r--r--gyp/http-nsurl.gypi43
-rw-r--r--gyp/install.gypi21
-rw-r--r--gyp/load.gypi6
-rw-r--r--gyp/mbgl-standalone.gypi16
-rw-r--r--gyp/mbgl-storage-cocoa.gypi62
-rw-r--r--gyp/none.gypi20
-rw-r--r--gyp/platform-android.gypi (renamed from gyp/mbgl-android.gypi)69
-rw-r--r--gyp/platform-ios.gypi (renamed from gyp/mbgl-ios.gypi)5
-rw-r--r--gyp/platform-linux.gypi (renamed from gyp/mbgl-linux.gypi)5
-rw-r--r--gyp/platform-osx.gypi (renamed from gyp/mbgl-osx.gypi)5
-rw-r--r--gyp/standalone.gypi32
-rw-r--r--gyp/variables.gypi32
20 files changed, 346 insertions, 179 deletions
diff --git a/gyp/asset-fs.gypi b/gyp/asset-fs.gypi
new file mode 100644
index 0000000000..9cd8593fbc
--- /dev/null
+++ b/gyp/asset-fs.gypi
@@ -0,0 +1,52 @@
+{
+ 'targets': [
+ { 'target_name': 'asset-fs',
+ 'product_name': 'mbgl-asset-fs',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'hard_dependency': 1,
+
+ 'sources': [
+ '../platform/default/asset_request_fs.cpp',
+ ],
+
+ 'include_dirs': [
+ '../include',
+ ],
+
+ 'variables': {
+ 'cflags_cc': [
+ '<@(uv_cflags)',
+ '-I<(boost_root)/include',
+ ],
+ 'ldflags': [
+ '<@(uv_ldflags)',
+ ],
+ 'libraries': [
+ '<@(uv_static_libs)',
+ ],
+ },
+
+ '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)' ],
+ }]
+ ],
+ },
+ },
+ ],
+}
diff --git a/gyp/asset-zip.gypi b/gyp/asset-zip.gypi
new file mode 100644
index 0000000000..87f7584772
--- /dev/null
+++ b/gyp/asset-zip.gypi
@@ -0,0 +1,62 @@
+{
+ 'targets': [
+ { 'target_name': 'asset-zip',
+ 'product_name': 'mbgl-asset-zip',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'hard_dependency': 1,
+
+ 'sources': [
+ '../platform/default/asset_request_zip.cpp',
+ '../platform/default/uv_zip.c',
+ ],
+
+ 'include_dirs': [
+ '../include',
+ ],
+
+ 'variables': {
+ 'cflags': [
+ '<@(uv_cflags)',
+ '<@(zip_cflags)',
+ ],
+ 'cflags_cc': [
+ '<@(uv_cflags)',
+ '<@(zip_cflags)',
+ '-I<(boost_root)/include',
+ ],
+ 'ldflags': [
+ '<@(uv_ldflags)',
+ '<@(zip_ldflags)',
+ ],
+ 'libraries': [
+ '<@(uv_static_libs)',
+ '<@(zip_static_libs)',
+ ],
+ },
+
+ 'conditions': [
+ ['OS == "mac"', {
+ 'xcode_settings': {
+ 'OTHER_CFLAGS': [ '<@(cflags)' ],
+ 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
+ },
+ }, {
+ 'cflags': [ '<@(cflags)' ],
+ 'cflags_cc': [ '<@(cflags_cc)' ],
+ }],
+ ],
+
+ 'link_settings': {
+ 'conditions': [
+ ['OS == "mac"', {
+ 'libraries': [ '<@(libraries)' ],
+ 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
+ }, {
+ 'libraries': [ '<@(libraries)', '<@(ldflags)' ],
+ }]
+ ],
+ },
+ },
+ ],
+}
diff --git a/gyp/mbgl-storage-curl.gypi b/gyp/cache-sqlite.gypi
index f500d813e5..53af8dab59 100644
--- a/gyp/mbgl-storage-curl.gypi
+++ b/gyp/cache-sqlite.gypi
@@ -1,16 +1,13 @@
{
'targets': [
- { 'target_name': 'mbgl-storage-curl',
- 'product_name': 'mbgl-storage-curl',
+ { 'target_name': 'cache-sqlite',
+ 'product_name': 'mbgl-cache-sqlite',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
'sources': [
- '../platform/default/default_file_source.cpp',
'../platform/default/sqlite_cache.cpp',
- '../platform/default/http_request_curl.cpp',
- '../platform/default/asset_request_libuv.cpp',
'../platform/default/sqlite3.hpp',
'../platform/default/sqlite3.cpp',
'../platform/default/compression.hpp',
@@ -25,19 +22,15 @@
'cflags_cc': [
'<@(uv_cflags)',
'<@(sqlite3_cflags)',
- '<@(curl_cflags)',
- '-I<(boost_root)/include',
],
'ldflags': [
'<@(uv_ldflags)',
'<@(sqlite3_ldflags)',
- '<@(curl_ldflags)',
'<@(zlib_ldflags)',
],
'libraries': [
'<@(uv_static_libs)',
'<@(sqlite3_static_libs)',
- '<@(curl_static_libs)',
'<@(zlib_static_libs)',
],
},
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 2e47dd2f60..301856c52f 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -1,7 +1,4 @@
{
- 'includes': [
- './variables.gypi',
- ],
'variables': {
'install_prefix%': '',
'standalone_product_dir':'<!@(pwd)/build',
@@ -60,7 +57,7 @@
}, {
'cflags_cc': [ '-fPIC' ],
}],
- ['platform == "ios"', {
+ ['host == "ios"', {
'xcode_settings': {
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
diff --git a/gyp/mbgl-core.gypi b/gyp/core.gypi
index 5e6344da1c..0adcaa766f 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/core.gypi
@@ -1,6 +1,6 @@
{
'targets': [
- { 'target_name': 'mbgl-core',
+ { 'target_name': 'core',
'product_name': 'mbgl-core',
'type': 'static_library',
'standalone_static_library': 1,
diff --git a/gyp/mbgl-headless.gypi b/gyp/headless-cgl.gypi
index df91e71698..bcb677c6ed 100644
--- a/gyp/mbgl-headless.gypi
+++ b/gyp/headless-cgl.gypi
@@ -1,7 +1,7 @@
{
'targets': [
- { 'target_name': 'mbgl-headless',
- 'product_name': 'mbgl-headless',
+ { 'target_name': 'headless-cgl',
+ 'product_name': 'mbgl-headless-cgl',
'type': 'static_library',
'standalone_static_library': 1,
diff --git a/gyp/headless-glx.gypi b/gyp/headless-glx.gypi
new file mode 100644
index 0000000000..06062be75f
--- /dev/null
+++ b/gyp/headless-glx.gypi
@@ -0,0 +1,18 @@
+{
+ 'targets': [
+ { 'target_name': 'headless-glx',
+ 'product_name': 'mbgl-headless-glx',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+
+ 'sources': [
+ '../platform/default/headless_view.cpp',
+ '../platform/default/headless_display.cpp',
+ ],
+
+ 'include_dirs': [
+ '../include',
+ ],
+ },
+ ],
+}
diff --git a/gyp/http-curl.gypi b/gyp/http-curl.gypi
new file mode 100644
index 0000000000..5dcd71a59b
--- /dev/null
+++ b/gyp/http-curl.gypi
@@ -0,0 +1,55 @@
+{
+ 'targets': [
+ { 'target_name': 'http-curl',
+ 'product_name': 'mbgl-http-curl',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'hard_dependency': 1,
+
+ 'sources': [
+ '../platform/default/http_request_curl.cpp',
+ ],
+
+ 'include_dirs': [
+ '../include',
+ ],
+
+ 'variables': {
+ 'cflags_cc': [
+ '<@(uv_cflags)',
+ '<@(curl_cflags)',
+ '-I<(boost_root)/include',
+ ],
+ 'ldflags': [
+ '<@(uv_ldflags)',
+ '<@(curl_ldflags)',
+ ],
+ 'libraries': [
+ '<@(uv_static_libs)',
+ '<@(curl_static_libs)',
+ ],
+ },
+
+ '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)' ],
+ }]
+ ],
+ },
+ },
+ ],
+}
diff --git a/gyp/http-nsurl.gypi b/gyp/http-nsurl.gypi
new file mode 100644
index 0000000000..4205f59d81
--- /dev/null
+++ b/gyp/http-nsurl.gypi
@@ -0,0 +1,43 @@
+{
+ 'targets': [
+ { 'target_name': 'http-nsurl',
+ 'product_name': 'mbgl-http-nsurl',
+ 'type': 'static_library',
+ 'standalone_static_library': 1,
+ 'hard_dependency': 1,
+
+ 'sources': [
+ '../platform/darwin/http_request_nsurl.mm',
+ ],
+
+ 'include_dirs': [
+ '../include',
+ ],
+
+ 'variables': {
+ 'cflags_cc': [
+ '<@(uv_cflags)',
+ ],
+ 'ldflags': [
+ '-framework Foundation', # For NSURLRequest
+ '<@(uv_ldflags)',
+ ],
+ 'libraries': [
+ '<@(uv_static_libs)',
+ ],
+ },
+
+ 'xcode_settings': {
+ 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
+ 'CLANG_ENABLE_OBJC_ARC': 'NO',
+ },
+
+ 'link_settings': {
+ 'libraries': [ '<@(libraries)' ],
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [ '<@(ldflags)' ],
+ },
+ },
+ },
+ ],
+}
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 48a7a997db..f42ffbf238 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -6,18 +6,22 @@
'type': 'none',
'hard_dependency': 1,
'dependencies': [
- '<(core_library)',
- '<(headless_library)',
- '<(platform_library)',
- '<(storage_library)',
+ 'core',
+ '<(headless_lib)',
+ '<(platform_lib)',
+ '<(http_lib)',
+ '<(asset_lib)',
+ '<(cache_lib)',
'mbgl-standalone',
],
'copies': [
{ 'files': [ '<(standalone_product_dir)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' },
{ 'files': [ '<(PRODUCT_DIR)/libmbgl-core.a' ], 'destination': '<(install_prefix)/lib' },
- { 'files': [ '<(PRODUCT_DIR)/libmbgl-headless.a' ], 'destination': '<(install_prefix)/lib' },
- { 'files': [ '<(PRODUCT_DIR)/lib<(platform_library).a' ], 'destination': '<(install_prefix)/lib' },
- { 'files': [ '<(PRODUCT_DIR)/lib<(storage_library).a' ], 'destination': '<(install_prefix)/lib' },
+ { 'files': [ '<(PRODUCT_DIR)/lib<(headless_lib).a' ], 'destination': '<(install_prefix)/lib' },
+ { 'files': [ '<(PRODUCT_DIR)/lib<(platform_lib).a' ], 'destination': '<(install_prefix)/lib' },
+ { 'files': [ '<(PRODUCT_DIR)/lib<(http_lib).a' ], 'destination': '<(install_prefix)/lib' },
+ { 'files': [ '<(PRODUCT_DIR)/lib<(asset_lib).a' ], 'destination': '<(install_prefix)/lib' },
+ { 'files': [ '<(PRODUCT_DIR)/lib<(cache_lib).a' ], 'destination': '<(install_prefix)/lib' },
{ 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' },
],
'variables': {
@@ -36,7 +40,7 @@
],
},
'actions': [
- { 'action_name': 'mbgl-config',
+ { 'action_name': 'mbgl-config',
'inputs': [
'../utils/mbgl-config/mbgl-config.template.sh',
'../utils/mbgl-config/build.sh',
@@ -47,7 +51,6 @@
'action': [
'./utils/mbgl-config/build.sh',
'<(install_prefix)',
- '<(platform)',
'<@(sqlite3_static_libs)',
'<@(sqlite3_ldflags)',
'<@(curl_ldflags)',
diff --git a/gyp/load.gypi b/gyp/load.gypi
new file mode 100644
index 0000000000..3d666ac938
--- /dev/null
+++ b/gyp/load.gypi
@@ -0,0 +1,6 @@
+{
+ 'conditions': [
+ ['platform_library == "mbglosx"', {
+ }],
+ ],
+} \ No newline at end of file
diff --git a/gyp/mbgl-standalone.gypi b/gyp/mbgl-standalone.gypi
deleted file mode 100644
index eb38a3e8c8..0000000000
--- a/gyp/mbgl-standalone.gypi
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- 'targets': [
- { 'target_name': 'standalone',
- 'product_name': 'libmbgl.a',
- 'type': 'executable',
- 'hard_dependency': 1,
-
- 'dependencies': [
- '<(core_library)',
- '<(platform_library)',
- '<(storage_library)',
- '<(headless_library)',
- ],
- },
- ],
-} \ No newline at end of file
diff --git a/gyp/mbgl-storage-cocoa.gypi b/gyp/mbgl-storage-cocoa.gypi
deleted file mode 100644
index c22216b823..0000000000
--- a/gyp/mbgl-storage-cocoa.gypi
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- 'targets': [
- { 'target_name': 'mbgl-storage-cocoa',
- 'product_name': 'mbgl-storage-cocoa',
- 'type': 'static_library',
- 'standalone_static_library': 1,
- 'hard_dependency': 1,
-
- 'sources': [
- '../platform/default/default_file_source.cpp',
- '../platform/default/sqlite_cache.cpp',
- '../platform/darwin/http_request_cocoa.mm',
- '../platform/default/asset_request_libuv.cpp',
- '../platform/default/sqlite3.hpp',
- '../platform/default/sqlite3.cpp',
- '../platform/default/compression.hpp',
- '../platform/default/compression.cpp',
- ],
-
- 'include_dirs': [
- '../include',
- ],
-
- 'variables': {
- 'cflags_cc': [
- '<@(uv_cflags)',
- '<@(sqlite3_cflags)',
- '-I<(boost_root)/include',
- ],
- 'ldflags': [
- '-framework Foundation', # For NSURLRequest
- '<@(uv_ldflags)',
- '<@(sqlite3_ldflags)',
- '<@(zlib_ldflags)',
- ],
- 'libraries': [
- '<@(uv_static_libs)',
- '<@(sqlite3_static_libs)',
- '<@(zlib_static_libs)',
- ],
- },
-
- 'xcode_settings': {
- 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
- 'CLANG_ENABLE_OBJC_ARC': 'NO',
- },
-
- 'link_settings': {
- 'libraries': [ '<@(libraries)' ],
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [ '<@(ldflags)' ],
- },
- },
-
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../include',
- ],
- },
- },
- ],
-}
diff --git a/gyp/none.gypi b/gyp/none.gypi
new file mode 100644
index 0000000000..ce748bfe6f
--- /dev/null
+++ b/gyp/none.gypi
@@ -0,0 +1,20 @@
+{
+ 'targets': [
+ { 'target_name': 'http-none',
+ 'product_name': 'mbgl-http-none',
+ 'type': 'none',
+ },
+ { 'target_name': 'asset-none',
+ 'product_name': 'mbgl-asset-none',
+ 'type': 'none',
+ },
+ { 'target_name': 'cache-none',
+ 'product_name': 'mbgl-cache-none',
+ 'type': 'none',
+ },
+ { 'target_name': 'headless-none',
+ 'product_name': 'mbgl-headless-none',
+ 'type': 'none',
+ },
+ ],
+}
diff --git a/gyp/mbgl-android.gypi b/gyp/platform-android.gypi
index 17ce85eab2..ac86f50e65 100644
--- a/gyp/mbgl-android.gypi
+++ b/gyp/platform-android.gypi
@@ -1,83 +1,76 @@
{
'targets': [
- { 'target_name': 'mbgl-android',
- 'product_name': 'mbgl-android',
+ { 'target_name': 'platform-android',
+ 'product_name': 'mbgl-platform-android',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
'dependencies': [
'version',
],
+
+ 'sources': [
+ '../platform/android/log_android.cpp',
+ '../platform/default/string_stdlib.cpp',
+ '../platform/default/image.cpp',
+ '../platform/default/image_reader.cpp',
+ '../platform/default/png_reader.cpp',
+ '../platform/default/jpeg_reader.cpp',
+ ],
+
'variables': {
'cflags_cc': [
'<@(png_cflags)',
'<@(jpeg_cflags)',
'<@(uv_cflags)',
- '<@(curl_cflags)',
'<@(nu_cflags)',
- '<@(zip_cflags)',
- '<@(openssl_cflags)',
'-I<(boost_root)/include',
],
- 'cflags': [
- '<@(uv_cflags)',
- '<@(nu_cflags)',
- ],
'ldflags': [
'<@(png_ldflags)',
'<@(jpeg_ldflags)',
'<@(uv_ldflags)',
- '<@(curl_ldflags)',
'<@(nu_ldflags)',
- '<@(zip_ldflags)',
],
- },
- 'sources': [
- '../platform/android/log_android.cpp',
- '../platform/android/asset_request_libzip.cpp',
- '../platform/default/string_stdlib.cpp',
- '../platform/default/http_request_baton_curl.cpp',
- '../platform/default/image.cpp',
- '../platform/default/image_reader.cpp',
- '../platform/default/png_reader.cpp',
- '../platform/default/jpeg_reader.cpp',
- ],
- 'include_dirs': [
- '../include',
- '../src',
- ],
- 'link_settings': {
'libraries': [
'<@(png_static_libs)',
'<@(jpeg_static_libs)',
- '<@(nu_static_libs)'
+ '<@(uv_static_libs)',
+ '<@(nu_static_libs)',
],
},
+
+ 'include_dirs': [
+ '../include',
+ '../src',
+ ],
+
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
- 'OTHER_CFLAGS': [ '<@(cflags)' ],
}
}, {
'cflags_cc': [ '<@(cflags_cc)' ],
- 'cflags': [ '<@(cflags)' ],
}]
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../include',
- ],
+
+ 'link_settings': {
'conditions': [
['OS == "mac"', {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [ '<@(ldflags)' ],
- }
+ 'libraries': [ '<@(libraries)' ],
+ 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
}, {
- 'ldflags': [ '<@(ldflags)' ],
+ 'libraries': [ '<@(libraries)', '<@(ldflags)' ],
}]
],
},
+
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../include',
+ ],
+ },
},
],
}
diff --git a/gyp/mbgl-ios.gypi b/gyp/platform-ios.gypi
index c2a7b6ca70..2bbe1272d2 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -1,7 +1,7 @@
{
'targets': [
- { 'target_name': 'mbgl-ios',
- 'product_name': 'mbgl-ios',
+ { 'target_name': 'platform-ios',
+ 'product_name': 'mbgl-platform-ios',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
@@ -13,6 +13,7 @@
'../platform/darwin/log_nslog.mm',
'../platform/darwin/string_nsstring.mm',
'../platform/darwin/application_root.mm',
+ '../platform/darwin/asset_root.mm',
'../platform/darwin/image.mm',
],
diff --git a/gyp/mbgl-linux.gypi b/gyp/platform-linux.gypi
index 930cd6fb17..2915606ac5 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -1,7 +1,7 @@
{
'targets': [
- { 'target_name': 'mbgl-linux',
- 'product_name': 'mbgl-linux',
+ { 'target_name': 'platform-linux',
+ 'product_name': 'mbgl-platform-linux',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
@@ -13,6 +13,7 @@
'../platform/default/log_stderr.cpp',
'../platform/default/string_stdlib.cpp',
'../platform/default/application_root.cpp',
+ '../platform/default/asset_root.cpp',
'../platform/default/image.cpp',
'../platform/default/image_reader.cpp',
'../platform/default/png_reader.cpp',
diff --git a/gyp/mbgl-osx.gypi b/gyp/platform-osx.gypi
index d90d88ef43..1fdf9de2c7 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -1,7 +1,7 @@
{
'targets': [
- { 'target_name': 'mbgl-osx',
- 'product_name': 'mbgl-osx',
+ { 'target_name': 'platform-osx',
+ 'product_name': 'mbgl-platform-osx',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
@@ -13,6 +13,7 @@
'../platform/darwin/log_nslog.mm',
'../platform/darwin/string_nsstring.mm',
'../platform/darwin/application_root.mm',
+ '../platform/darwin/asset_root.mm',
'../platform/darwin/image.mm',
],
diff --git a/gyp/standalone.gypi b/gyp/standalone.gypi
new file mode 100644
index 0000000000..7f222016cd
--- /dev/null
+++ b/gyp/standalone.gypi
@@ -0,0 +1,32 @@
+{
+ 'targets': [
+ { 'target_name': 'everything',
+ 'type': 'none',
+ 'hard_dependency': 1,
+
+ 'dependencies': [
+ 'core',
+ 'platform-<(platform_lib)',
+ 'http-<(http_lib)',
+ 'asset-<(asset_lib)',
+ 'cache-<(cache_lib)',
+ 'headless-<(headless_lib)',
+ ],
+ },
+
+ { 'target_name': 'standalone',
+ 'product_name': 'libmbgl.a',
+ 'type': 'executable',
+ 'hard_dependency': 1,
+
+ 'dependencies': [
+ 'core',
+ 'platform-<(platform_lib)',
+ 'http-<(http_lib)',
+ 'asset-<(asset_lib)',
+ 'cache-<(cache_lib)',
+ 'headless-<(headless_lib)',
+ ],
+ },
+ ],
+} \ No newline at end of file
diff --git a/gyp/variables.gypi b/gyp/variables.gypi
deleted file mode 100644
index fd76adfb7a..0000000000
--- a/gyp/variables.gypi
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- 'variables': {
- 'core_library%': 'mbgl-core',
- 'headless_library%': 'mbgl-headless',
- },
- 'conditions': [
- ['platform == "osx"', {
- 'variables': {
- 'platform_library%': 'mbgl-osx',
- 'storage_library%': 'mbgl-storage-cocoa',
- },
- }],
- ['platform == "ios"', {
- 'variables': {
- 'platform_library%': 'mbgl-ios',
- 'storage_library%': 'mbgl-storage-cocoa',
- },
- }],
- ['platform == "linux"', {
- 'variables': {
- 'platform_library%': 'mbgl-linux',
- 'storage_library%': 'mbgl-storage-curl',
- },
- }],
- ['platform == "android"', {
- 'variables': {
- 'platform_library%': 'mbgl-android',
- 'storage_library%': 'mbgl-storage-curl',
- },
- }],
- ],
-} \ No newline at end of file