fix errors from rename of style.hpp to resources.hpp

This commit is contained in:
Konstantin Käfer
2014-01-30 11:24:39 +01:00
parent b70788a6f1
commit a8b1df403c
5 changed files with 9 additions and 11 deletions

View File

@@ -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 <llmr/resources/' + name + '.hpp>\n';
code += '#include <llmr/style/resources.hpp>\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);

View File

@@ -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 {

View File

@@ -2,7 +2,7 @@
#include <llmr/map/tile.hpp>
//#include <llmr/util/vec2.hpp>
#include <llmr/resources/style.hpp>
#include <llmr/style/resources.hpp>
#include <iostream>
#include <thread>

View File

@@ -1,5 +1,5 @@
// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
#include <llmr/resources/style.hpp>
#include <llmr/style/resources.hpp>
using namespace llmr;

View File

@@ -1,7 +1,5 @@
#include <llmr/style/style.hpp>
#include <llmr/resources/style.hpp>
using namespace llmr;
Style::Style() {