1
0

QtBiomeVisualiser: Fixed confusion about Globals.h.

This commit is contained in:
madmaxoft 2014-09-23 12:39:09 +02:00
parent 5f6bac2091
commit de163f0134
5 changed files with 21 additions and 21 deletions

View File

@ -1,10 +1,10 @@
#include "Globals.h"
#include "ChunkSource.h"
#include <QThread>
#include "Generating/BioGen.h"
#include "src/Generating/BioGen.h"
#include "inifile/iniFile.h"
#include "StringCompression.h"
#include "WorldStorage/FastNBT.h"
#include "src/StringCompression.h"
#include "src/WorldStorage/FastNBT.h"

View File

@ -2,7 +2,7 @@
#include "GeneratorSetup.h"
#include <QLabel>
#include <QLineEdit>
#include "Generating/BioGen.h"
#include "src/Generating/BioGen.h"
#include "inifile/iniFile.h"

View File

@ -238,14 +238,14 @@ template class SizeChecker<UInt16, 2>;
#ifndef TEST_GLOBALS
// Common headers (part 1, without macros):
#include "StringUtils.h"
#include "OSSupport/Sleep.h"
#include "OSSupport/CriticalSection.h"
#include "OSSupport/Semaphore.h"
#include "OSSupport/Event.h"
#include "OSSupport/Thread.h"
#include "OSSupport/File.h"
#include "Logger.h"
#include "src/StringUtils.h"
#include "src/OSSupport/Sleep.h"
#include "src/OSSupport/CriticalSection.h"
#include "src/OSSupport/Semaphore.h"
#include "src/OSSupport/Event.h"
#include "src/OSSupport/Thread.h"
#include "src/OSSupport/File.h"
#include "src/Logger.h"
#else
// Logging functions
void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1, 2);
@ -375,10 +375,10 @@ T Clamp(T a_Value, T a_Min, T a_Max)
// Common headers (part 2, with macros):
#include "ChunkDef.h"
#include "BiomeDef.h"
#include "BlockID.h"
#include "BlockInfo.h"
#include "src/ChunkDef.h"
#include "src/BiomeDef.h"
#include "src/BlockID.h"
#include "src/BlockInfo.h"

View File

@ -9,9 +9,9 @@
#include <QDirIterator>
#include "inifile/iniFile.h"
#include "ChunkSource.h"
#include "Generating/BioGen.h"
#include "StringCompression.h"
#include "WorldStorage/FastNBT.h"
#include "src/Generating/BioGen.h"
#include "src/StringCompression.h"
#include "src/WorldStorage/FastNBT.h"
#include "GeneratorSetup.h"

View File

@ -83,8 +83,8 @@ HEADERS += MainWindow.h \
GeneratorSetup.h
INCLUDEPATH += $$_PRO_FILE_PWD_ \
$$_PRO_FILE_PWD_/../../src \
$$_PRO_FILE_PWD_/../../lib
$$_PRO_FILE_PWD_/../../lib \
$$_PRO_FILE_PWD_/../../
CONFIG += C++11