Changeset 5935 for code/branches/pickup/src/external/ois/win32

Timestamp:

Oct 13, 2009, 5:05:17 PM (15 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

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

code/branches/pickup/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/branches/pickup/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))