From b0c012fdc5979c158be2203c0970ab3d8d399fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 2 Apr 2019 14:11:37 +0200 Subject: [build] don't add gl to outputPath --- scripts/generate-shaders.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index fc9088fd21..df01ca4743 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -3,7 +3,7 @@ require('flow-remove-types/register'); const path = require('path'); -const outputPath = 'src/mbgl/programs/gl'; +const outputPath = 'src/mbgl/programs'; const zlib = require('zlib'); const crypto = require('crypto'); @@ -79,7 +79,7 @@ const compressed = zlib.deflateSync(concatenated, {level: zlib.Z_BEST_COMPRESSIO .join(',\n ') .trim(); -writeIfModified(path.join(outputPath, 'shader_source.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. +writeIfModified(path.join(outputPath, 'gl', 'shader_source.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. #pragma once @@ -97,7 +97,7 @@ struct ShaderSource; } // namespace mbgl `); -writeIfModified(path.join(outputPath, 'shader_source.cpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. +writeIfModified(path.join(outputPath, 'gl', 'shader_source.cpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. #include #include @@ -122,7 +122,7 @@ const char* shaderSource() { } // namespace mbgl `); -writeIfModified(path.join(outputPath, 'preludes.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. +writeIfModified(path.join(outputPath, 'gl', 'preludes.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. #pragma once @@ -147,7 +147,7 @@ for (const key in offsets) { const { shaderName, ShaderName, originalKey } = offsets[key]; - writeIfModified(path.join(outputPath, `${shaderName}.cpp`), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. + writeIfModified(path.join(outputPath, 'gl', `${shaderName}.cpp`), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. #include #include -- cgit v1.2.1