From 34b83656b3dc0da7deb69851f6b8239e492d2862 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 24 Sep 2014 11:21:59 +0200
Subject: [PATCH] QtBiomeVisualiser: Fixed MSVC path-crossing.

MSVC would occasionally compile the wrong CPP file - the same name, but wrong path.
---
 Tools/QtBiomeVisualiser/BiomeView.cpp            |  2 +-
 Tools/QtBiomeVisualiser/ChunkSource.cpp          |  2 +-
 Tools/QtBiomeVisualiser/ChunkSource.h            |  2 +-
 .../{main.cpp => QtBiomeVisualiser.cpp}          |  0
 Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro    | 16 +++++++++++-----
 .../QtBiomeVisualiser/{Chunk.cpp => QtChunk.cpp} |  3 +--
 Tools/QtBiomeVisualiser/{Chunk.h => QtChunk.h}   |  0
 7 files changed, 15 insertions(+), 10 deletions(-)
 rename Tools/QtBiomeVisualiser/{main.cpp => QtBiomeVisualiser.cpp} (100%)
 rename Tools/QtBiomeVisualiser/{Chunk.cpp => QtChunk.cpp} (87%)
 rename Tools/QtBiomeVisualiser/{Chunk.h => QtChunk.h} (100%)

diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index bbaccb369..ce5a870cd 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"
 #include "BiomeView.h"
-#include "Chunk.h"
+#include "QtChunk.h"
 #include <QPainter>
 #include <QResizeEvent>
 
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index 28d184615..bebf89a0a 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -2,9 +2,9 @@
 #include "ChunkSource.h"
 #include <QThread>
 #include "src/Generating/BioGen.h"
-#include "inifile/iniFile.h"
 #include "src/StringCompression.h"
 #include "src/WorldStorage/FastNBT.h"
+#include "inifile/iniFile.h"
 
 
 
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h
index 05e8ac5de..7bd1865ff 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.h
+++ b/Tools/QtBiomeVisualiser/ChunkSource.h
@@ -2,7 +2,7 @@
 #include "Globals.h"
 #include <QString>
 #include <QMutex>
-#include "Chunk.h"
+#include "QtChunk.h"
 
 
 
diff --git a/Tools/QtBiomeVisualiser/main.cpp b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.cpp
similarity index 100%
rename from Tools/QtBiomeVisualiser/main.cpp
rename to Tools/QtBiomeVisualiser/QtBiomeVisualiser.cpp
diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
index d6630bd34..9e5d1303c 100644
--- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
+++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
@@ -12,7 +12,7 @@ TARGET = QtBiomeVisualiser
 TEMPLATE = app
 
 
-SOURCES += main.cpp\
+SOURCES +=\
 		MainWindow.cpp \
     BiomeView.cpp \
     ../../src/Generating/BioGen.cpp \
@@ -27,7 +27,6 @@ SOURCES += main.cpp\
     ../../src/OSSupport/IsThread.cpp \
     ../../src/BiomeDef.cpp \
     ChunkCache.cpp \
-    Chunk.cpp \
     ChunkSource.cpp \
     ChunkLoader.cpp \
     ../../src/StringCompression.cpp \
@@ -47,7 +46,9 @@ SOURCES += main.cpp\
     ../../lib/zlib/trees.c \
     ../../lib/zlib/uncompr.c \
     ../../lib/zlib/zutil.c \
-    GeneratorSetup.cpp
+    GeneratorSetup.cpp \
+    QtBiomeVisualiser.cpp \
+    QtChunk.cpp
 
 HEADERS  += MainWindow.h \
 		Globals.h \
@@ -64,7 +65,6 @@ HEADERS  += MainWindow.h \
     ../../src/OSSupport/IsThread.h \
     ../../src/BiomeDef.h \
     ChunkCache.h \
-    Chunk.h \
     ChunkSource.h \
     ChunkLoader.h \
     ../../src/StringCompression.h \
@@ -80,13 +80,19 @@ HEADERS  += MainWindow.h \
     ../../lib/zlib/zconf.h \
     ../../lib/zlib/zlib.h \
     ../../lib/zlib/zutil.h \
-    GeneratorSetup.h
+    GeneratorSetup.h \
+    QtChunk.h
 
 INCLUDEPATH += $$_PRO_FILE_PWD_ \
 	$$_PRO_FILE_PWD_/../../lib \
+	$$_PRO_FILE_PWD_/../../lib/jsoncpp/include \
+	$$_PRO_FILE_PWD_/../../lib/polarssl/include \
+	$$_PRO_FILE_PWD_/../../lib/sqlite \
+	$$_PRO_FILE_PWD_/../../lib/SQLiteCpp/include \
 	$$_PRO_FILE_PWD_/../../
 
 
+
 CONFIG += C++11
 
 OTHER_FILES +=
diff --git a/Tools/QtBiomeVisualiser/Chunk.cpp b/Tools/QtBiomeVisualiser/QtChunk.cpp
similarity index 87%
rename from Tools/QtBiomeVisualiser/Chunk.cpp
rename to Tools/QtBiomeVisualiser/QtChunk.cpp
index d3419af9c..80109b2f8 100644
--- a/Tools/QtBiomeVisualiser/Chunk.cpp
+++ b/Tools/QtBiomeVisualiser/QtChunk.cpp
@@ -1,6 +1,5 @@
 #include "Globals.h"
-#include "Globals.h"
-#include "Chunk.h"
+#include "QtChunk.h"
 
 
 
diff --git a/Tools/QtBiomeVisualiser/Chunk.h b/Tools/QtBiomeVisualiser/QtChunk.h
similarity index 100%
rename from Tools/QtBiomeVisualiser/Chunk.h
rename to Tools/QtBiomeVisualiser/QtChunk.h