Changeset 9672 for code/trunk

Timestamp:

Sep 17, 2013, 1:40:31 PM (11 years ago)

Author:

smerkli

Message:

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.

Location:

code/trunk

Files:

• cmake/CompilerConfigGCC.cmake (modified) (1 diff)
• src/external/ois/linux/LinuxForceFeedback.cpp (modified) (1 diff)
• src/libraries/util/SignalHandler.cc (modified) (1 diff)
• src/orxonox/chat/ChatInputHandler.cc (modified) (1 diff)

code/trunk/cmake/CompilerConfigGCC.cmake

@@ -124 +124 @@
   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)

code/trunk/src/external/ois/linux/LinuxForceFeedback.cpp

@@ -27 +27 @@
 #include <errno.h>
 #include <memory.h>
+#include <unistd.h>
 
 using namespace OIS;

code/trunk/src/libraries/util/SignalHandler.cc

@@ -40 +40 @@
 #include <cstdio>
 
+#include <unistd.h>
 #include "Output.h"
 

code/trunk/src/orxonox/chat/ChatInputHandler.cc

@@ -30 +30 @@
 
 #include <cassert>
+#include <cstddef>
 #include <string>
 #include <CEGUIWindow.h>