summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-11-30 19:38:52 +0100
committerHowaner <franzi.moos@googlemail.com>2014-11-30 19:38:52 +0100
commit6adf749164d7bc98bf34173b1f9d64804913d734 (patch)
treee15bd9dd8512fdbb61736db4d2d0b1f218bb81f0 /Tools
parentRemoved old MobType category. (diff)
parentHopefully fixed random build fails (diff)
downloadcuberite-6adf749164d7bc98bf34173b1f9d64804913d734.tar
cuberite-6adf749164d7bc98bf34173b1f9d64804913d734.tar.gz
cuberite-6adf749164d7bc98bf34173b1f9d64804913d734.tar.bz2
cuberite-6adf749164d7bc98bf34173b1f9d64804913d734.tar.lz
cuberite-6adf749164d7bc98bf34173b1f9d64804913d734.tar.xz
cuberite-6adf749164d7bc98bf34173b1f9d64804913d734.tar.zst
cuberite-6adf749164d7bc98bf34173b1f9d64804913d734.zip
Diffstat (limited to 'Tools')
-rw-r--r--Tools/MCADefrag/CMakeLists.txt8
-rw-r--r--Tools/ProtoProxy/CMakeLists.txt8
-rw-r--r--Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro19
3 files changed, 33 insertions, 2 deletions
diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt
index 42b42018b..618719d68 100644
--- a/Tools/MCADefrag/CMakeLists.txt
+++ b/Tools/MCADefrag/CMakeLists.txt
@@ -46,6 +46,7 @@ set(SHARED_HDR
../../src/ByteBuffer.h
../../src/StringUtils.h
)
+
flatten_files(SHARED_SRC)
flatten_files(SHARED_HDR)
source_group("Shared" FILES ${SHARED_SRC} ${SHARED_HDR})
@@ -54,15 +55,22 @@ set(SHARED_OSS_SRC
../../src/OSSupport/CriticalSection.cpp
../../src/OSSupport/File.cpp
../../src/OSSupport/IsThread.cpp
+ ../../src/OSSupport/StackTrace.cpp
../../src/OSSupport/Timer.cpp
)
set(SHARED_OSS_HDR
../../src/OSSupport/CriticalSection.h
../../src/OSSupport/File.h
../../src/OSSupport/IsThread.h
+ ../../src/OSSupport/StackTrace.h
../../src/OSSupport/Timer.h
)
+if(WIN32)
+ list (APPEND SHARED_OSS_SRC ../../src/StackWalker.cpp)
+ list (APPEND SHARED_OSS_HDR ../../src/StackWalker.h)
+endif()
+
flatten_files(SHARED_OSS_SRC)
flatten_files(SHARED_OSS_HDR)
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt
index bc3923d90..fc8721da0 100644
--- a/Tools/ProtoProxy/CMakeLists.txt
+++ b/Tools/ProtoProxy/CMakeLists.txt
@@ -57,14 +57,22 @@ set(SHARED_OSS_SRC
../../src/OSSupport/CriticalSection.cpp
../../src/OSSupport/File.cpp
../../src/OSSupport/IsThread.cpp
+ ../../src/OSSupport/StackTrace.cpp
../../src/OSSupport/Timer.cpp
)
set(SHARED_OSS_HDR
../../src/OSSupport/CriticalSection.h
../../src/OSSupport/File.h
../../src/OSSupport/IsThread.h
+ ../../src/OSSupport/StackTrace.h
../../src/OSSupport/Timer.h
)
+
+if(WIN32)
+ list (APPEND SHARED_OSS_SRC ../../src/StackWalker.cpp)
+ list (APPEND SHARED_OSS_HDR ../../src/StackWalker.h)
+endif()
+
flatten_files(SHARED_SRC)
flatten_files(SHARED_HDR)
flatten_files(SHARED_OSS_SRC)
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
+}
+
+
+
+