diff --git a/bin/build-style.js b/bin/build-style.js index 26445ab26..3931d00d9 100755 --- a/bin/build-style.js +++ b/bin/build-style.js @@ -9,8 +9,8 @@ var data = fs.readFileSync('resources/style.pbf'); var length = data.length; var header = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n\n'; -header += '#ifndef LLMR_RESOURCE_' + name.toUpperCase() + '\n'; -header += '#define LLMR_RESOURCE_' + name.toUpperCase() + '\n'; +header += '#ifndef LLMR_STYLE_RESOURCES\n'; +header += '#define LLMR_STYLE_RESOURCES\n'; header += '\n'; header += 'namespace llmr {\n'; header += 'namespace resources {\n'; @@ -22,10 +22,10 @@ header += '}\n'; header += '}\n'; header += '\n'; header += '#endif\n'; -fs.writeFileSync('include/llmr/resources/' + name + '.hpp', header); +fs.writeFileSync('include/llmr/style/resources.hpp', header); var code = '// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.\n'; -code += '#include \n'; +code += '#include \n'; code += '\n'; code += 'using namespace llmr;\n'; code += '\n'; @@ -42,5 +42,5 @@ for (var i = 0; i < data.length; i += 16) { code += '\n};\n'; code += 'const unsigned long resources::' + name + '_size = sizeof(resources::' + name + ');\n'; -fs.writeFileSync('src/resources/' + name + '.cpp', code); +fs.writeFileSync('src/style/resources.cpp', code); diff --git a/include/llmr/resources/style.hpp b/include/llmr/style/resources.hpp similarity index 77% rename from include/llmr/resources/style.hpp rename to include/llmr/style/resources.hpp index 684de3d54..59a184243 100644 --- a/include/llmr/resources/style.hpp +++ b/include/llmr/style/resources.hpp @@ -1,7 +1,7 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. -#ifndef LLMR_RESOURCE_STYLE -#define LLMR_RESOURCE_STYLE +#ifndef LLMR_STYLE_RESOURCES +#define LLMR_STYLE_RESOURCES namespace llmr { namespace resources { diff --git a/src/map/map.cpp b/src/map/map.cpp index fa6f2a616..c19d390f8 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -2,7 +2,7 @@ #include //#include -#include +#include #include #include diff --git a/src/style/resources.cpp b/src/style/resources.cpp index 8bd1ca129..cfdc0d7ce 100644 --- a/src/style/resources.cpp +++ b/src/style/resources.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. -#include +#include using namespace llmr; diff --git a/src/style/style.cpp b/src/style/style.cpp index 3f6982feb..7a3c0602b 100644 --- a/src/style/style.cpp +++ b/src/style/style.cpp @@ -1,7 +1,5 @@ #include -#include - using namespace llmr; Style::Style() {