Address #151 at the same time

1 files changed, 15 insertions, 8 deletions

diff --git a/llmr.gyp b/llmr.gyp
index a76ef225c7..a32a598f53 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -19,14 +19,17 @@
             'src/shader/shaders_gl.cpp',
             'src/shader/shaders_gles2.cpp',
           ],
-          'action': ['<@(node)', 'bin/build-shaders.js'],
+          'action': ['<@(node)', 'bin/build-shaders.js', '<(SHARED_INTERMEDIATE_DIR)'],
         }
       ],
       'direct_dependent_settings': {
         'sources': [
-            'include/llmr/shader/shaders.hpp',
-            'src/shader/shaders_gl.cpp',
-            'src/shader/shaders_gles2.cpp'
+            '<(SHARED_INTERMEDIATE_DIR)/include/llmr/shader/shaders.hpp',
+            '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
+            '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp'
+        ],
+        'include_dirs':[
+          '<(SHARED_INTERMEDIATE_DIR)/include/',
         ]
       }
     },
@@ -41,15 +44,19 @@
             'bin/style.js',
           ],
           'outputs': [
-            'include/llmr/style/resources.hpp',
-            'src/style/resources.cpp'
+            '<(SHARED_INTERMEDIATE_DIR)/include/llmr/style/resources.hpp',
+            '<(SHARED_INTERMEDIATE_DIR)/src/style/resources.cpp'
           ],
-          'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)']
+          'action': ['<@(node)', 'bin/build-style.js', '<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)']
         }
       ],
       'direct_dependent_settings': {
         'sources': [
-          'src/style/resources.cpp'
+          '<(SHARED_INTERMEDIATE_DIR)/include/llmr/style/resources.hpp',
+          '<(SHARED_INTERMEDIATE_DIR)/src/style/resources.cpp'
+        ],
+        'include_dirs':[
+          '<(SHARED_INTERMEDIATE_DIR)/include/',
         ]
       }
     },