7 files changed, 14 insertions, 36 deletions

diff --git a/tests/BoundingBox/CMakeLists.txt b/tests/BoundingBox/CMakeLists.txt
index f2dd42ee9..3de6b5ade 100644
--- a/tests/BoundingBox/CMakeLists.txt
+++ b/tests/BoundingBox/CMakeLists.txt
@@ -8,22 +8,19 @@ add_definitions(-DTEST_GLOBALS=1)
 set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/BoundingBox.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 )
 
 set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/BoundingBox.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h
 )
 
 set (SRCS
 	BoundingBoxTest.cpp
 )
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder / StackTracer sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
 
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
diff --git a/tests/ByteBuffer/CMakeLists.txt b/tests/ByteBuffer/CMakeLists.txt
index 49a3f7f75..12c2f6e3c 100644
--- a/tests/ByteBuffer/CMakeLists.txt
+++ b/tests/ByteBuffer/CMakeLists.txt
@@ -8,23 +8,19 @@ add_definitions(-DTEST_GLOBALS=1)
 set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/ByteBuffer.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 )
 
 set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/ByteBuffer.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h
 )
 
 set (SRCS
 	ByteBufferTest.cpp
 )
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder / StackTracer sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
-
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
 add_executable(ByteBuffer-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt
index 7666d992f..c168ebfd3 100644
--- a/tests/CompositeChat/CMakeLists.txt
+++ b/tests/CompositeChat/CMakeLists.txt
@@ -10,11 +10,13 @@ add_definitions(-DTEST_GLOBALS=1)
 set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/CompositeChat.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 )
 
 set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/CompositeChat.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 )
 
 set (SRCS
@@ -22,11 +24,6 @@ set (SRCS
 	ClientHandle.cpp
 )
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder / StackTracer sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
 
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
diff --git a/tests/FastRandom/CMakeLists.txt b/tests/FastRandom/CMakeLists.txt
index a9d62bf94..df7492c5f 100644
--- a/tests/FastRandom/CMakeLists.txt
+++ b/tests/FastRandom/CMakeLists.txt
@@ -8,22 +8,19 @@ add_definitions(-DTEST_GLOBALS=1)
 set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/FastRandom.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 )
 
 set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/FastRandom.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h
 )
 
 set (SRCS
 	FastRandomTest.cpp
 )
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder / StackTracer sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
 
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
diff --git a/tests/Generating/CMakeLists.txt b/tests/Generating/CMakeLists.txt
index 269ab50ab..979fa4f0e 100644
--- a/tests/Generating/CMakeLists.txt
+++ b/tests/Generating/CMakeLists.txt
@@ -30,6 +30,7 @@ set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/File.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.cpp
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.cpp
@@ -60,6 +61,7 @@ set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/File.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h
 
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.h
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h
@@ -79,11 +81,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 endif()
 
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
 
 add_library(GeneratorTestingSupport STATIC ${SHARED_SRCS} ${SHARED_HDRS} ${STUBS})
 target_link_libraries(GeneratorTestingSupport tolualib zlib)
diff --git a/tests/LuaThreadStress/CMakeLists.txt b/tests/LuaThreadStress/CMakeLists.txt
index dcadb34aa..25b245775 100644
--- a/tests/LuaThreadStress/CMakeLists.txt
+++ b/tests/LuaThreadStress/CMakeLists.txt
@@ -30,6 +30,7 @@ set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/File.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.cpp
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.cpp
@@ -60,6 +61,7 @@ set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/File.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h
 
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.h
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h
@@ -74,11 +76,6 @@ set (SRCS
 )
 
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
 
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})
diff --git a/tests/SchematicFileSerializer/CMakeLists.txt b/tests/SchematicFileSerializer/CMakeLists.txt
index 99589c999..1f3bcfc89 100644
--- a/tests/SchematicFileSerializer/CMakeLists.txt
+++ b/tests/SchematicFileSerializer/CMakeLists.txt
@@ -21,6 +21,7 @@ set (SHARED_SRCS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/File.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.cpp
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp
 
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.cpp
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.cpp
@@ -51,6 +52,7 @@ set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/OSSupport/File.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.h
 	${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h
+	${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h
 
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.h
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h
@@ -67,11 +69,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 endif()
 
 
-if (MSVC)
-	# Add the MSVC-specific LeakFinder sources:
-	list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp)
-	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
-endif()
 
 source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
 source_group("Sources" FILES ${SRCS})