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

rename mbgl to mbgl-core

Browse Source
This commit is contained in:
Konstantin Käfer
2014-10-29 11:59:24 -04:00
parent 1d82ae14a4
commit 293b291b80
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -9,7 +9,7 @@ endif
PLATFORM ?= linux
all: mbgl
all: mbgl-core mblg-platform mbgl-headless
config.gypi: configure
./configure
@@ -18,9 +18,9 @@ config-ios.gypi: configure
MASON_PLATFORM=ios ./configure config-ios.gypi
# Builds the regular library
mbgl: config.gypi mapboxgl.gyp
mbgl-core: config.gypi mapboxgl.gyp
deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-core
mbgl-platform: config.gypi mapboxgl.gyp
deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
@@ -34,10 +34,6 @@ install: config.gypi mapboxgl.gyp
deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) -Dinstall_prefix=$(PREFIX) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) install
config: config.gypi mapboxgl.gyp
deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-config
##### Test cases ###############################################################
build/test/Makefile: src common config.gypi test/test.gyp
@@ -121,5 +117,5 @@ clean: clear_xcode_cache
distclean: clean
-rm -rf ./mason_packages
.PHONY: mbgl install test linux clear_xcode_cache build/test/Makefile clean distclean
.PHONY: mbgl-core install test linux clear_xcode_cache build/test/Makefile clean distclean
# DO NOT DELETE

4
gyp/install.gypi
View File

@@ -6,12 +6,12 @@
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'mbgl',
'mbgl-core',
'mbgl-headless',
'mbgl-<(platform)',
],
'copies': [
{ 'files': [ '<(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' },
{ 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' }

5
gyp/mbgl.gypi → gyp/mbgl-core.gypi
View File

@@ -1,8 +1,9 @@
{
'targets': [
{ 'target_name': 'mbgl',
'product_name': 'mbgl',
{ 'target_name': 'mbgl-core',
'product_name': 'mbgl-core',
'type': 'static_library',
'standalone_static_library': 1,
'hard_dependency': 1,
'dependencies': [
'shaders',

2
linux/mapboxgl-app.gyp
View File

@@ -45,7 +45,7 @@
}],
],
'dependencies': [
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
'../mapboxgl.gyp:mbgl-linux',
'../mapboxgl.gyp:copy_styles',
'../mapboxgl.gyp:copy_certificate_bundle',

2
macosx/mapboxgl-app.gyp
View File

@@ -40,7 +40,7 @@
],
'dependencies': [
'../mapboxgl.gyp:bundle_styles',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
'../mapboxgl.gyp:mbgl-osx',
]
}

2
mapboxgl.gyp
View File

@@ -6,7 +6,7 @@
'./gyp/styles.gypi',
'./gyp/fixtures.gypi',
'./gyp/certificates.gypi',
'./gyp/mbgl.gypi',
'./gyp/mbgl-core.gypi',
'./gyp/mbgl-platform.gypi',
'./gyp/mbgl-headless.gypi',
'./gyp/install.gypi',

18
test/test.gyp
View File

@@ -13,7 +13,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'clip_ids',
@@ -25,7 +25,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'enums',
@@ -37,7 +37,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'style_parser',
@@ -51,7 +51,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
'../mapboxgl.gyp:copy_fixtures',
]
},
@@ -64,7 +64,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'comparisons',
@@ -76,7 +76,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'tile',
@@ -88,7 +88,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'functions',
@@ -100,7 +100,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
]
},
{ 'target_name': 'headless',
@@ -128,7 +128,7 @@
],
'dependencies': [
'../deps/gtest/gtest.gyp:gtest',
'../mapboxgl.gyp:mbgl',
'../mapboxgl.gyp:mbgl-core',
'../mapboxgl.gyp:mbgl-headless',
'<(platform_library)',
],