[Orxonox-commit 5008] r9674 - in code/trunk: cmake src/external/ois/win32

[landauf at orxonox.net]

Author: landauf
Date: 2013-09-26 22:37:57 +0200 (Thu, 26 Sep 2013)
New Revision: 9674

Modified:
   code/trunk/cmake/CompilerConfigGCC.cmake
   code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp
   code/trunk/src/external/ois/win32/Win32JoyStick.cpp
   code/trunk/src/external/ois/win32/Win32Mouse.cpp
Log:
fixed build for MinGW with GCC 4.6

Modified: code/trunk/cmake/CompilerConfigGCC.cmake
===================================================================
--- code/trunk/cmake/CompilerConfigGCC.cmake	2013-09-25 20:52:39 UTC (rev 9673)
+++ code/trunk/cmake/CompilerConfigGCC.cmake	2013-09-26 20:37:57 UTC (rev 9674)
@@ -121,5 +121,5 @@
 IF (MINGW)
   ADD_COMPILER_FLAGS("-gstabs+" Debug RelForDevs RelWithDebInfo CACHE)
 
-  ADD_LINKER_FLAGS("-enable-auto-import" CACHE)
+  ADD_LINKER_FLAGS("-Wl,--enable-auto-import" CACHE)
 ENDIF()

Modified: code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp
===================================================================
--- code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp	2013-09-25 20:52:39 UTC (rev 9673)
+++ code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp	2013-09-26 20:37:57 UTC (rev 9674)
@@ -23,6 +23,7 @@
 #include "win32/Win32ForceFeedback.h"
 #include "OISException.h"
 #include <math.h>
+#include <cstddef>
 
 // 0 = No trace; 1 = Important traces; 2 = Debug traces
 #define OIS_WIN32_JOYFF_DEBUG 0

Modified: code/trunk/src/external/ois/win32/Win32JoyStick.cpp
===================================================================
--- code/trunk/src/external/ois/win32/Win32JoyStick.cpp	2013-09-25 20:52:39 UTC (rev 9673)
+++ code/trunk/src/external/ois/win32/Win32JoyStick.cpp	2013-09-26 20:37:57 UTC (rev 9674)
@@ -35,6 +35,7 @@
 #endif
 
 #include <cassert>
+#include <cstddef>
 #include <wbemidl.h>
 #include <oleauto.h>
 //#include <wmsstd.h>

Modified: code/trunk/src/external/ois/win32/Win32Mouse.cpp
===================================================================
--- code/trunk/src/external/ois/win32/Win32Mouse.cpp	2013-09-25 20:52:39 UTC (rev 9673)
+++ code/trunk/src/external/ois/win32/Win32Mouse.cpp	2013-09-26 20:37:57 UTC (rev 9674)
@@ -24,6 +24,7 @@
 #include "win32/Win32InputManager.h"
 #include "OISException.h"
 #include "OISEvents.h"
+#include <cstddef>
 
 using namespace OIS;