osx: partly revert / add fixme / add warning

spring · Sep 3, 2017 · b1c4e46 · b1c4e46
1 parent 90fad3c
commit b1c4e46
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/rts/System/Platform/Linux/CrashHandler.cpp b/rts/System/Platform/Linux/CrashHandler.cpp
@@ -533,8 +533,6 @@ static void TranslateStackTrace(bool* aiCrash, StackTrace& stacktrace, const int
 	return;
 }
 
-#endif  // !(__APPLE__)
-
 static void LogStacktrace(const int logLevel, StackTrace& stacktrace)
 {
 	int colFileline = 0;
@@ -578,6 +576,7 @@ static void LogStacktrace(const int logLevel, StackTrace& stacktrace)
 	}
 }
 
+#endif  // !(__APPLE__)
 
 
 __FORCE_ALIGN_STACK__

diff --git a/rts/System/Platform/Mac/CrashHandler.cpp b/rts/System/Platform/Mac/CrashHandler.cpp
@@ -8,7 +8,7 @@
 #include <AvailabilityMacros.h>
 
 //! Same as Linux
-#include "System/Platform/Linux/CrashHandler.cpp"
+#include "System/Platform/Linux/CrashHandler.cpp" //FIXME: including .cpp
 #include <libproc.h>
 #include <limits.h>
 #include <unistd.h>
@@ -144,6 +144,8 @@ static void LogStacktrace(const int logLevel, StackTrace& stacktrace)
 #else
 // ### Fallback CrashHandler (old Apple) START
 
+#warning Fallback CrashHandler used
+
 namespace CrashHandler {
 	void Install() {}
 	void Remove() {}

diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
@@ -73,12 +73,11 @@ INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/lib/asio/include)
 
 
 ### Assemble sources
-IF	(UNIX)
+IF	(APPLE)
 	SET(sources_engine_Platform_CrashHandler
 		${ENGINE_SRC_ROOT_DIR}/System/Platform/CpuID.cpp
 		${ENGINE_SRC_ROOT_DIR}/System/Platform/Threading.cpp
-		${ENGINE_SRC_ROOT_DIR}/System/Platform/Linux/CrashHandler.cpp
-		${ENGINE_SRC_ROOT_DIR}/System/Platform/Linux/ThreadSupport.cpp)
+		${ENGINE_SRC_ROOT_DIR}/System/Platform/Mac/CrashHandler.cpp)
 ELSEIF	(WIN32)
 	SET(sources_engine_Platform_CrashHandler
 		${ENGINE_SRC_ROOT_DIR}/System/Platform/Win/seh.cpp
@@ -88,7 +87,7 @@ ELSE	()
 		${ENGINE_SRC_ROOT_DIR}/System/Platform/CpuID.cpp
 		${ENGINE_SRC_ROOT_DIR}/System/Platform/Threading.cpp
 		${ENGINE_SRC_ROOT_DIR}/System/Platform/Linux/CrashHandler.cpp
-		${ENGINE_SRC_ROOT_DIR}/System/Platform/Mac/CrashHandler.cpp)
+		${ENGINE_SRC_ROOT_DIR}/System/Platform/Linux/ThreadSupport.cpp)
 ENDIF	()
 
 SET(system_files