flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed QtBiomeVisualiser compilation.

Browse Source
This commit is contained in:
Mattes D 2014-11-29 23:55:06 +01:00
parent 8e6f98eb40
commit abbe18c0ab
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
View File

@ -17,7 +17,7 @@ SOURCES += \
BiomeView.cpp \ BiomeView.cpp \
../../src/Generating/BioGen.cpp \ ../../src/Generating/BioGen.cpp \
../../src/VoronoiMap.cpp \ ../../src/VoronoiMap.cpp \
../../src/Noise.cpp \ ../../src/Noise/Noise.cpp \
../../src/StringUtils.cpp \ ../../src/StringUtils.cpp \
../../src/LoggerListeners.cpp \ ../../src/LoggerListeners.cpp \
../../src/Logger.cpp \ ../../src/Logger.cpp \
@ -25,7 +25,9 @@ SOURCES += \
../../src/OSSupport/File.cpp \ ../../src/OSSupport/File.cpp \
../../src/OSSupport/CriticalSection.cpp \ ../../src/OSSupport/CriticalSection.cpp \
../../src/OSSupport/IsThread.cpp \ ../../src/OSSupport/IsThread.cpp \
../../src/OSSupport/StackTrace.cpp \
../../src/BiomeDef.cpp \ ../../src/BiomeDef.cpp \
../../src/StackWalker.cpp \
../../src/StringCompression.cpp \ ../../src/StringCompression.cpp \
../../src/WorldStorage/FastNBT.cpp \ ../../src/WorldStorage/FastNBT.cpp \
../../lib/zlib/adler32.c \ ../../lib/zlib/adler32.c \
@ -62,7 +64,7 @@ HEADERS += \
../../src/Generating/IntGen.h \ ../../src/Generating/IntGen.h \
../../src/Generating/ProtIntGen.h \ ../../src/Generating/ProtIntGen.h \
../../src/VoronoiMap.h \ ../../src/VoronoiMap.h \
../../src/Noise.h \ ../../src/Noise/Noise.h \
../../src/StringUtils.h \ ../../src/StringUtils.h \
../../src/LoggerListeners.h \ ../../src/LoggerListeners.h \
../../src/Logger.h \ ../../src/Logger.h \
@ -70,7 +72,9 @@ HEADERS += \
../../src/OSSupport/File.h \ ../../src/OSSupport/File.h \
../../src/OSSupport/CriticalSection.h \ ../../src/OSSupport/CriticalSection.h \
../../src/OSSupport/IsThread.h \ ../../src/OSSupport/IsThread.h \
../../src/OSSupport/StackTrace.h \
../../src/BiomeDef.h \ ../../src/BiomeDef.h \
../../src/StackWalker.h \
../../src/StringCompression.h \ ../../src/StringCompression.h \
../../src/WorldStorage/FastNBT.h \ ../../src/WorldStorage/FastNBT.h \
../../lib/zlib/crc32.h \ ../../lib/zlib/crc32.h \
@ -107,4 +111,15 @@ CONFIG += C++11
OTHER_FILES += 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
}

1
src/Noise/Noise.cpp
View File

@ -2,7 +2,6 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Noise.h" #include "Noise.h"
#include "OSSupport/Timer.h"
#define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x)) #define FAST_FLOOR(x) (((x) < 0) ? (((int)x) - 1) : ((int)x))