summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--gyp/common.gypi1
-rw-r--r--gyp/install.gypi2
-rw-r--r--gyp/mbgl-core.gypi11
-rw-r--r--gyp/mbgl-ios.gypi10
-rw-r--r--gyp/mbgl-osx.gypi10
-rw-r--r--linux/mapboxgl-app.gyp3
-rw-r--r--macosx/mapboxgl-app.gyp2
-rw-r--r--test/test.gyp2
9 files changed, 15 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index ed75627f4d..c4d42bfd46 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,7 @@ lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache
clean: clear_xcode_cache
-find ./deps/gyp -name "*.pyc" -exec rm {} \;
-rm -rf ./build/
+ -rm -rf ./macosx/build/
-rm -rf ./config.gypi ./config-ios.gypi
distclean: clean
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 163f2ce0a7..c25bb77779 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -1,6 +1,7 @@
{
'variables': {
'install_prefix%': '',
+ 'standalone_product_dir':'<!@(pwd)/../build'
},
'target_defaults': {
'default_configuration': 'Release',
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 6805c135c4..8fba986492 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -12,7 +12,7 @@
'mbgl-<(platform)',
],
'copies': [
- { 'files': [ '<(PRODUCT_DIR)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' },
+ { '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)/libmbgl-<(platform).a' ], 'destination': '<(install_prefix)/lib' },
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi
index e6b90a6b27..ed4a029fb6 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/mbgl-core.gypi
@@ -54,12 +54,21 @@
],
'variables': {
'core_lib':'<(PRODUCT_DIR)/libmbgl-core.a',
- 'standalone_lib':'<(PRODUCT_DIR)/libmbgl.a'
+ 'standalone_lib':'<(standalone_product_dir)/libmbgl.a'
},
'direct_dependent_settings': {
'include_dirs': [
'../include',
],
+ 'conditions': [
+ ['OS == "mac"', {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [ '<(standalone_lib)' ],
+ }
+ }, {
+ 'ldflags': [ '<(standalone_lib)' ],
+ }]
+ ],
},
'actions': [
{
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index 1baf06c1f3..755b3cc483 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -41,18 +41,10 @@
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
},
- 'link_settings': {
- 'libraries': [
- '<@(uv_static_libs)',
- ],
- },
'direct_dependent_settings': {
'include_dirs': [
'../include',
- ],
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [ '<@(uv_ldflags)' ],
- },
+ ]
},
},
],
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index 38aea690f4..bee0325498 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -17,18 +17,10 @@
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
},
- 'link_settings': {
- 'libraries': [
- '<@(uv_static_libs)',
- ],
- },
'direct_dependent_settings': {
'include_dirs': [
'../include',
- ],
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [ '<@(uv_ldflags)' ],
- },
+ ]
},
},
],
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp
index 724463ab5f..027612cbd4 100644
--- a/linux/mapboxgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -23,9 +23,6 @@
'-I<(boost_root)/include',
],
'libraries': [
- '-L<(PRODUCT_DIR)/',
- '-lmbgl',
- '-lmbgl-linux',
'<@(curl_static_libs)',
'<@(png_ldflags)',
'<@(sqlite3_ldflags)',
diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp
index e5789fffd6..0e6fe38042 100644
--- a/macosx/mapboxgl-app.gyp
+++ b/macosx/mapboxgl-app.gyp
@@ -37,8 +37,6 @@
},
'variables' : {
'ldflags': [
- '-L<(PRODUCT_DIR)/',
- '-lmbgl',
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
diff --git a/test/test.gyp b/test/test.gyp
index 9b1e369090..66bc97d8e5 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -5,8 +5,6 @@
],
'target_defaults': {
"libraries": [
- '-L<(PRODUCT_DIR)/',
- '-lmbgl',
'<@(uv_ldflags)',
'<@(curl_static_libs)',
'<@(png_ldflags)',