diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-17 12:44:45 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-17 12:44:45 -0400 |
| commit | 4cb9972278c2121a87161e3b02b2071acc1ca8e1 (patch) | |
| tree | b0f017fda1740503c1bd7d5e3a28e586648d2e77 /bin | |
| parent | 056f9e88d5214ae5752ec946666c756e2bf3d72b (diff) | |
| parent | fa4133a094a084527633038d2de1982ed4898a08 (diff) | |
| download | qtlocation-mapboxgl-4cb9972278c2121a87161e3b02b2071acc1ca8e1.tar.gz | |
Merge branch 'master' into fuzz-pipe
Conflicts:
bin/package.json
src/style/style_parser.cpp
test/fixtures/fixture_log.cpp
test/test.gyp
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-shaders.js | 17 | ||||
| -rw-r--r-- | bin/package.json | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/bin/build-shaders.js b/bin/build-shaders.js index 61d182b03f..38aa753730 100755 --- a/bin/build-shaders.js +++ b/bin/build-shaders.js @@ -83,10 +83,10 @@ module.exports = function(shader_type, prefix, suffix) { } var header = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n\n'; - header += '#ifndef LLMR_SHADER_SHADERS\n'; - header += '#define LLMR_SHADER_SHADERS\n'; + header += '#ifndef MBGL_SHADER_SHADERS\n'; + header += '#define MBGL_SHADER_SHADERS\n'; header += '\n'; - header += 'namespace llmr {\n'; + header += 'namespace mbgl {\n'; header += '\n'; header += 'struct shader_source {\n'; header += ' const char *vertex;\n'; @@ -106,18 +106,19 @@ module.exports = function(shader_type, prefix, suffix) { var code = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n'; - code += '#include <llmr/platform/gl.hpp>\n'; + code += '#include <mbgl/platform/gl.hpp>\n'; code += prefix + '\n'; - code += '#include <llmr/shader/shaders.hpp>\n'; + code += '#include <mbgl/shader/shaders.hpp>\n'; code += '\n'; - code += 'using namespace llmr;\n'; + code += 'namespace mbgl {\n'; code += '\n'; - code += 'const shader_source llmr::shaders[SHADER_COUNT] = {\n'; + code += 'const shader_source shaders[SHADER_COUNT] = {\n'; code += lines.join(',\n'); code += '\n};\n'; + code += '\n}\n'; code += suffix + '\n'; - var header_path = path.join(process.argv[2], 'include/llmr/shader/shaders.hpp'); + var header_path = path.join(process.argv[2], 'include/mbgl/shader/shaders.hpp'); mkdirp.sync(path.dirname(header_path)); fs.writeFileSync(header_path, header); console.warn('wrote file ' + header_path); diff --git a/bin/package.json b/bin/package.json index 77edcb9bfa..50843fa4b8 100644 --- a/bin/package.json +++ b/bin/package.json @@ -1,5 +1,5 @@ { - "name": "llmr-native", + "name": "mbgl-native", "version": "0.0.1", "dependencies": { "brfs": "^1.1.2", |