Changeset 5929 for code/trunk/src/external/ois

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/external/ois/CMakeLists.txt (modified) (3 diffs)
• src/external/ois/changes_orxonox.diff (modified) (1 diff)
• src/external/ois/linux/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/mac/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/win32/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/win32/Win32ForceFeedback.cpp (modified) (1 diff)

code/trunk/src/external/ois/CMakeLists.txt

@@ -34 +34 @@
   OISPrereqs.h
 
+COMPILATION_BEGIN OISCompilation.cpp
   OISEffect.cpp
   OISException.cpp
@@ -41 +42 @@
   OISKeyboard.cpp
   OISObject.cpp
+COMPILATION_END
 )
 IF(WIN32)
@@ -49 +51 @@
   ADD_SUBDIRECTORY(linux)
 ENDIF()
-
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
 
 INCLUDE_DIRECTORIES(.)

code/trunk/src/external/ois/changes_orxonox.diff

@@ -23 +23 @@
  
 
+--- win32/Win32ForceFeedback.cpp
++++ win32/Win32ForceFeedback.cpp
+@@ -25,7 +25,7 @@
+ #include <Math.h>
+ 
+ // 0 = No trace; 1 = Important traces; 2 = Debug traces
+-#define OIS_WIN32_JOYFF_DEBUG 1
++#define OIS_WIN32_JOYFF_DEBUG 0
+ 
+ #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
+   #include <iostream>

code/trunk/src/external/ois/linux/CMakeLists.txt

@@ -8 +8 @@
   LinuxPrereqs.h
 
+COMPILATION_BEGIN OISLinuxCompilation.cpp
   EventHelpers.cpp
   LinuxForceFeedback.cpp
@@ -14 +15 @@
   LinuxKeyboard.cpp
   LinuxMouse.cpp
+COMPILATION_END
 )

code/trunk/src/external/ois/mac/CMakeLists.txt

@@ -7 +7 @@
   MacPrereqs.h
 
+COMPILATION_BEGIN OISMacCompilation.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
@@ -12 +13 @@
   MacKeyboard.cpp
   MacMouse.cpp
+COMPILATION_END
 )

code/trunk/src/external/ois/win32/CMakeLists.txt

@@ -7 +7 @@
   Win32Prereqs.h
 
+COMPILATION_BEGIN OISWin32Compilation.cpp
   Win32ForceFeedback.cpp
   Win32InputManager.cpp
@@ -12 +13 @@
   Win32KeyBoard.cpp
   Win32Mouse.cpp
+COMPILATION_END
 )

code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp

@@ -26 +26 @@
 
 // 0 = No trace; 1 = Important traces; 2 = Debug traces
-#define OIS_WIN32_JOYFF_DEBUG 1
+#define OIS_WIN32_JOYFF_DEBUG 0
 
 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))