define shader builds as separate targets

1 files changed, 37 insertions, 27 deletions

diff --git a/llmr.gyp b/llmr.gyp
index 46455fafc4..9edc104c70 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -5,26 +5,25 @@
   ],
   'targets': [
     {
-      'target_name': 'before_build_actions',
-      'type':'none',
+      'target_name': 'shaders_gl',
+      'type': 'none',
       'actions': [
         {
-          'action_name': 'Build Stylesheet',
+          'action_name': 'Build Shaders',
           'inputs': [
-            'bin/style.js'
+            '<!@(find src -name "*.glsl")'
           ],
           'outputs': [
-            'include/llmr/style/resources.hpp',
-            'src/style/resources.cpp'
+            'include/llmr/shader/shaders.hpp',
+            'src/shader/shaders.cpp'
           ],
-          'action': ['bin/build-style.js']
+          'action': ['bin/build-shaders.js', 'gl'],
         }
-      ],
+      ]
     },
     {
-      'target_name': 'llmr-x86',
-      'product_name': 'llmr-x86',
-      'type': 'static_library',
+      'target_name': 'shaders_gles2',
+      'type': 'none',
       'actions': [
         {
           'action_name': 'Build Shaders',
@@ -35,11 +34,34 @@
             'include/llmr/shader/shaders.hpp',
             'src/shader/shaders.cpp'
           ],
-          'action': ['bin/build-shaders.js gl'],
+          'action': ['bin/build-shaders.js', 'gles2'],
+        }
+      ]
+    },
+    {
+      'target_name': 'build_stylesheet',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'Build Stylesheet',
+          'inputs': [
+            'bin/style.js'
+          ],
+          'outputs': [
+            'include/llmr/style/resources.hpp',
+            'src/style/resources.cpp'
+          ],
+          'action': ['bin/build-style.js']
         }
       ],
+    },
+    {
+      'target_name': 'llmr-x86',
+      'product_name': 'llmr-x86',
+      'type': 'static_library',
       'dependencies': [
-          'before_build_actions'
+          'build_stylesheet',
+          'shaders_gl',
       ],
       'sources': [
         '<!@(find src -name "*.cpp")',
@@ -96,21 +118,9 @@
       'target_name': 'llmr-ios',
       'product_name': 'llmr-ios',
       'type': 'static_library',
-      'actions': [
-        {
-          'action_name': 'Build Shaders',
-          'inputs': [
-            '<!@(find src -name "*.glsl")'
-          ],
-          'outputs': [
-            'include/llmr/shader/shaders.hpp',
-            'src/shader/shaders.cpp'
-          ],
-          'action': ['bin/build-shaders.js gles2'],
-        }
-      ],
       'dependencies': [
-          'before_build_actions'
+          'build_stylesheet',
+          'shaders_gles2',
       ],
       'sources': [
         '<!@(find src -name "*.cpp")',