[Orxonox-commit 5006] r9672 - in code/trunk: cmake src/external/ois/linux src/libraries/util src/orxonox/chat

[smerkli at orxonox.net]

Author: smerkli
Date: 2013-09-17 13:40:31 +0200 (Tue, 17 Sep 2013)
New Revision: 9672

Modified:
   code/trunk/cmake/CompilerConfigGCC.cmake
   code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp
   code/trunk/src/libraries/util/SignalHandler.cc
   code/trunk/src/orxonox/chat/ChatInputHandler.cc
Log:
Added a few includes that were necessary with the switch to GCC > 4.7
as well as a small define that lets boost work with threads on this
new GCC version. Things compile now, but have not been tested to be running 
yet. 


Modified: code/trunk/cmake/CompilerConfigGCC.cmake
===================================================================
--- code/trunk/cmake/CompilerConfigGCC.cmake	2013-09-08 17:30:20 UTC (rev 9671)
+++ code/trunk/cmake/CompilerConfigGCC.cmake	2013-09-17 11:40:31 UTC (rev 9672)
@@ -123,3 +123,10 @@
 
   ADD_LINKER_FLAGS("-enable-auto-import" CACHE)
 ENDIF()
+
+
+# Sandro fix: add flag that re-enables boost threads. This makes the combination
+#             of GCC version > 4.7 and older libboost work. See 
+# http://stackoverflow.com/questions/5389853/doesnt-compile-if-included-boost-thread-in-linux-ubuntu10-10
+#             for more information.
+ADD_COMPILER_FLAGS("-D_GLIBCXX__PTHREADS=1" CXX CACHE)

Modified: code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp
===================================================================
--- code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp	2013-09-08 17:30:20 UTC (rev 9671)
+++ code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp	2013-09-17 11:40:31 UTC (rev 9672)
@@ -26,6 +26,7 @@
 #include <cstdlib>
 #include <errno.h>
 #include <memory.h>
+#include <unistd.h>
 
 using namespace OIS;
 

Modified: code/trunk/src/libraries/util/SignalHandler.cc
===================================================================
--- code/trunk/src/libraries/util/SignalHandler.cc	2013-09-08 17:30:20 UTC (rev 9671)
+++ code/trunk/src/libraries/util/SignalHandler.cc	2013-09-17 11:40:31 UTC (rev 9672)
@@ -39,6 +39,7 @@
 #include <cstring>
 #include <cstdio>
 
+#include <unistd.h>
 #include "Output.h"
 
 namespace orxonox

Modified: code/trunk/src/orxonox/chat/ChatInputHandler.cc
===================================================================
--- code/trunk/src/orxonox/chat/ChatInputHandler.cc	2013-09-08 17:30:20 UTC (rev 9671)
+++ code/trunk/src/orxonox/chat/ChatInputHandler.cc	2013-09-17 11:40:31 UTC (rev 9672)
@@ -29,6 +29,7 @@
 #include "ChatInputHandler.h"
 
 #include <cassert>
+#include <cstddef>
 #include <string>
 #include <CEGUIWindow.h>
 #include <CEGUIWindowManager.h>