4 files changed, 10 insertions, 17 deletions

diff --git a/Tools/GrownBiomeGenVisualiser/CMakeLists.txt b/Tools/GrownBiomeGenVisualiser/CMakeLists.txt
index c84ab9426..0a8b7930e 100644
--- a/Tools/GrownBiomeGenVisualiser/CMakeLists.txt
+++ b/Tools/GrownBiomeGenVisualiser/CMakeLists.txt
@@ -49,6 +49,7 @@ set(SHARED_OSS_SRC
 	../../src/OSSupport/File.cpp
 	../../src/OSSupport/IsThread.cpp
 	../../src/OSSupport/StackTrace.cpp
+	../../src/OSSupport/WinStackWalker.cpp
 )
 
 set(SHARED_OSS_HDR
@@ -57,12 +58,9 @@ set(SHARED_OSS_HDR
 	../../src/OSSupport/File.h
 	../../src/OSSupport/IsThread.h
 	../../src/OSSupport/StackTrace.h
+	../../src/OSSupport/WinStackWalker.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/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt
index f8c8ac65a..42d6f7381 100644
--- a/Tools/MCADefrag/CMakeLists.txt
+++ b/Tools/MCADefrag/CMakeLists.txt
@@ -51,6 +51,7 @@ set(SHARED_OSS_SRC
 	../../src/OSSupport/File.cpp
 	../../src/OSSupport/IsThread.cpp
 	../../src/OSSupport/StackTrace.cpp
+	../../src/OSSupport/WinStackWalker.cpp
 )
 
 set(SHARED_OSS_HDR
@@ -59,12 +60,9 @@ set(SHARED_OSS_HDR
 	../../src/OSSupport/File.h
 	../../src/OSSupport/IsThread.h
 	../../src/OSSupport/StackTrace.h
+	../../src/OSSupport/WinStackWalker.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/NoiseSpeedTest/CMakeLists.txt b/Tools/NoiseSpeedTest/CMakeLists.txt
index 29163398b..09821bd47 100644
--- a/Tools/NoiseSpeedTest/CMakeLists.txt
+++ b/Tools/NoiseSpeedTest/CMakeLists.txt
@@ -18,9 +18,11 @@ set(SHARED_SRC
 	../../src/OSSupport/CriticalSection.cpp
 	../../src/OSSupport/File.cpp
 	../../src/OSSupport/StackTrace.cpp
+	../../src/OSSupport/WinStackWalker.cpp
 	../../src/Noise/Noise.cpp
 	../../src/StringUtils.cpp
 )
+
 set(SHARED_HDR
 	../../src/Noise/Noise.h
 	../../src/Noise/OctavedNoise.h
@@ -28,13 +30,10 @@ set(SHARED_HDR
 	../../src/OSSupport/CriticalSection.h
 	../../src/OSSupport/File.h
 	../../src/OSSupport/StackTrace.h
+	../../src/OSSupport/WinStackWalker.h
 	../../src/StringUtils.h
 )
 
-if(WIN32)
-	list (APPEND SHARED_SRC ../../src/StackWalker.cpp)
-	list (APPEND SHARED_HDR ../../src/StackWalker.h)
-endif()
 
 source_group("Shared" FILES ${SHARED_SRC} ${SHARED_HDR})
 
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt
index 5c83123c3..d20f570c3 100644
--- a/Tools/ProtoProxy/CMakeLists.txt
+++ b/Tools/ProtoProxy/CMakeLists.txt
@@ -54,20 +54,18 @@ set(SHARED_OSS_SRC
 	../../src/OSSupport/File.cpp
 	../../src/OSSupport/IsThread.cpp
 	../../src/OSSupport/StackTrace.cpp
+	../../src/OSSupport/WinStackWalker.cpp
 )
+
 set(SHARED_OSS_HDR
 	../../src/OSSupport/CriticalSection.h
 	../../src/OSSupport/Event.h
 	../../src/OSSupport/File.h
 	../../src/OSSupport/IsThread.h
 	../../src/OSSupport/StackTrace.h
+	../../src/OSSupport/WinStackWalker.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)