make storage lib separate so we can build without storage libs

1 files changed, 23 insertions, 28 deletions

diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp
index 60eb16de38..e7db26f2b7 100644
--- a/linux/mapboxgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -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)'