summaryrefslogtreecommitdiff
path: root/llmr.gyp
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-05-23 17:14:19 -0700
committerDane Springmeyer <dane@mapbox.com>2014-05-23 17:14:19 -0700
commit7f592ac2e715fc7c0d6e4c206144f03e4af18947 (patch)
treeb1cb411a1449b0d3899bd3b7891c8ed49e909f34 /llmr.gyp
parent9e7ee02fcdef3077bf3769fbed8748bef8b7ce1f (diff)
downloadqtlocation-mapboxgl-7f592ac2e715fc7c0d6e4c206144f03e4af18947.tar.gz
Address #151 at the same time
Diffstat (limited to 'llmr.gyp')
-rw-r--r--llmr.gyp23
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/',
]
}
},