make storage lib separate so we can build without storage libs

This commit is contained in:
Konstantin Käfer
2015-01-23 16:31:48 +01:00
parent fbe30e04c4
commit 272fa8935e
26 changed files with 451 additions and 247 deletions

View File

@@ -3,55 +3,50 @@
'../gyp/common.gypi',
],
'targets': [
{
'target_name': 'linuxapp',
{ 'target_name': 'linuxapp',
'product_name': 'mapbox-gl',
'type': 'executable',
'dependencies': [
'../mbgl.gyp:<(core_library)',
'../mbgl.gyp:<(platform_library)',
'../mbgl.gyp:<(storage_library)',
'../mbgl.gyp:bundle_styles',
'../mbgl.gyp:copy_certificate_bundle',
],
'sources': [
'./main.cpp',
'main.cpp',
'../platform/default/settings_json.cpp',
'../platform/default/glfw_view.cpp',
'../platform/default/log_stderr.cpp',
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'variables' : {
'cxxflags': [
'<@(glfw3_cflags)',
'<@(png_cflags)',
'<@(jpeg_cflags)',
],
},
'cflags_cc': [
'<@(glfw3_cflags)',
'<@(png_cflags)',
'<@(jpeg_cflags)',
'-I<(boost_root)/include',
],
'variables': {
'ldflags': [
'<@(png_ldflags)',
'<@(sqlite3_static_libs)',
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
'<@(curl_ldflags)',
'<@(zlib_ldflags)',
],
'libraries': [
'<@(glfw3_static_libs)',
],
},
'libraries': [ '<@(libraries)' ],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(cxxflags)' ],
'OTHER_LDFLAGS': [ '<@(ldflags)' ],
}
}, {
'libraries': [ '<@(ldflags)' ],
'cxxflags': [ '<@(cxxflags)' ],
'ldflags': [ '<@(ldflags)' ],
}]
],
'dependencies': [
'../mapboxgl.gyp:mbgl-standalone',
'../mapboxgl.gyp:mbgl-linux',
'../mapboxgl.gyp:bundle_styles',
'../mapboxgl.gyp:copy_certificate_bundle',
],
'copies': [{
'files': [ '../styles/styles' ],
'destination': '<(PRODUCT_DIR)'