diff options
| author | Mattes D <github@xoft.cz> | 2014-11-29 23:55:06 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-11-29 23:55:06 +0100 |
| commit | abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de (patch) | |
| tree | ae3070b36b7fd2eb0df1d2da0723390c222eb7a4 | |
| parent | Fixed missing files in ProtoProxy. (diff) | |
| download | cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.tar cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.tar.gz cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.tar.bz2 cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.tar.lz cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.tar.xz cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.tar.zst cuberite-abbe18c0ab8a9966ffc2a2d86cbac7bc79cd77de.zip | |
| -rw-r--r-- | Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro | 19 | ||||
| -rw-r--r-- | src/Noise/Noise.cpp | 1 |
2 files changed, 17 insertions, 3 deletions
diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro index 9522491a8..cccee1305 100644 --- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro +++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro @@ -17,7 +17,7 @@ SOURCES += \ BiomeView.cpp \ ../../src/Generating/BioGen.cpp \ ../../src/VoronoiMap.cpp \ - ../../src/Noise.cpp \ + ../../src/Noise/Noise.cpp \ ../../src/StringUtils.cpp \ ../../src/LoggerListeners.cpp \ ../../src/Logger.cpp \ @@ -25,7 +25,9 @@ SOURCES += \ ../../src/OSSupport/File.cpp \ ../../src/OSSupport/CriticalSection.cpp \ ../../src/OSSupport/IsThread.cpp \ + ../../src/OSSupport/StackTrace.cpp \ ../../src/BiomeDef.cpp \ + ../../src/StackWalker.cpp \ ../../src/StringCompression.cpp \ ../../src/WorldStorage/FastNBT.cpp \ ../../lib/zlib/adler32.c \ @@ -62,7 +64,7 @@ HEADERS += \ ../../src/Generating/IntGen.h \ ../../src/Generating/ProtIntGen.h \ ../../src/VoronoiMap.h \ - ../../src/Noise.h \ + ../../src/Noise/Noise.h \ ../../src/StringUtils.h \ ../../src/LoggerListeners.h \ ../../src/Logger.h \ @@ -70,7 +72,9 @@ HEADERS += \ ../../src/OSSupport/File.h \ ../../src/OSSupport/CriticalSection.h \ ../../src/OSSupport/IsThread.h \ + ../../src/OSSupport/StackTrace.h \ ../../src/BiomeDef.h \ + ../../src/StackWalker.h \ ../../src/StringCompression.h \ ../../src/WorldStorage/FastNBT.h \ ../../lib/zlib/crc32.h \ @@ -107,4 +111,15 @@ CONFIG += C++11 OTHER_FILES += +win* { + # Add the advapi32 library for windows compiles; needed for the StackWalker: + LIBS += advapi32.lib + + # StackWalker doesn't like how Qt inconsistently defines only UNICODE, but not _UNICODE: + DEFINES -= UNICODE +} + + + + diff --git a/src/Noise/Noise.cpp b/src/Noise/Noise.cpp index 509be7d6c..0249ab6c1 100644 --- a/src/Noise/Noise.cpp +++ b/src/Noise/Noise.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Noise.h" -#include "OSSupport/Timer.h" #define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x)) |