Changeset 8073 for code/branches/kicklib/src/external/ois

Timestamp:

Mar 14, 2011, 4:08:06 AM (14 years ago)

Author:

rgrieder

Message:

Merged mac_osx branch (after renaming it from ois_update) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/external/ois/CMakeLists.txt (modified) (5 diffs)
• src/external/ois/OISPrereqs.h (modified) (1 diff)
• src/external/ois/VERSION (modified) (1 diff)
• src/external/ois/changes_orxonox.diff (modified) (1 diff)
• src/external/ois/linux/LinuxKeyboard.cpp (modified) (1 diff)
• src/external/ois/mac/CMakeLists.txt (modified) (2 diffs)
• src/external/ois/win32/Win32JoyStick.cpp (modified) (3 diffs)

code/branches/kicklib/src/external/ois/CMakeLists.txt

@@ -35 +35 @@
   OISPrereqs.h
 
-  #COMPILATION_BEGIN OISCompilation.cpp
+#COMPILATION_BEGIN OISCompilation.cpp
   OISEffect.cpp
   OISException.cpp
@@ -43 +43 @@
   OISKeyboard.cpp
   OISObject.cpp
-  #COMPILATION_END
+#COMPILATION_END
 )
 IF(WIN32)
@@ -53 +53 @@
 ENDIF()
 
+# Some unexplained hackery for Visual Studio 2005
+ADD_COMPILER_FLAGS("-D_WIN32_DCOM" MSVC8)
+
+# MinGW doesn't come with some required Windows headers
+IF(MINGW)
+  INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})
+ENDIF()
+
 ORXONOX_ADD_LIBRARY(ois_orxonox
   ORXONOX_EXTERNAL
@@ -58 +66 @@
     "OIS_NONCLIENT_BUILD"
   VERSION
-    1.2
+    1.3
   SOURCE_FILES
     ${OIS_FILES}
@@ -64 +72 @@
 
 IF(WIN32)
-  TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
+  TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES} ${WMI_LIBRARY})
 ELSEIF(APPLE)
   TARGET_LINK_LIBRARIES(ois_orxonox "/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/Carbon.framework")

code/branches/kicklib/src/external/ois/OISPrereqs.h

@@ -101 +101 @@
 //-------------- Common Classes, Enums, and Typdef's -------------------------//
 #define OIS_VERSION_MAJOR 1
-#define OIS_VERSION_MINOR 4
+#define OIS_VERSION_MINOR 3
 #define OIS_VERSION_PATCH 0
-#define OIS_VERSION_NAME "1.4.0"
+#define OIS_VERSION_NAME "1.3.0"
 
 #define OIS_VERSION ((OIS_VERSION_MAJOR << 16) | (OIS_VERSION_MINOR << 8) | OIS_VERSION_PATCH)

code/branches/kicklib/src/external/ois/VERSION

@@ -1 @@
-OIS SVN trunk updated on 2010/10/07 (revision 26)
-https://wgois.svn.sourceforge.net/svnroot/wgois/ois/trunk/
+OIS SVN v1.3 branch updated on 2011/02/20 (revision 32)
+https://wgois.svn.sourceforge.net/svnroot/wgois/ois/branches/v1-3/

code/branches/kicklib/src/external/ois/changes_orxonox.diff

@@ -49 +49 @@
 
 
+--- win32/Win32JoyStick.cpp
++++ win32/Win32JoyStick.cpp
+@@ -26,6 +26,14 @@
+ #include "OISEvents.h"
+ #include "OISException.h"
+ 
++// (Orxonox): Required for MinGW to compile properly
++#ifdef __MINGW32__
++#  include <oaidl.h>
++#  ifndef __MINGW_EXTENSION
++#    define __MINGW_EXTENSION __extension__
++#  endif
++#endif
++
+ #include <cassert>
+ #include <wbemidl.h>
+ #include <oleauto.h>
+@@ -39,6 +47,11 @@
+    }
+ #endif
+ 
++// (Orxonox): MinGW doesn't have swscanf_s
++#ifdef __MINGW32__
++#      define swscanf_s swscanf
++#endif
++
+ #ifdef OIS_WIN32_XINPUT_SUPPORT
+ #      pragma comment(lib, "xinput.lib")
+ #endif
+@@ -583,7 +596,12 @@
+     bool bCleanupCOM = SUCCEEDED(hr);
+ 
+     // Create WMI
++    // (Orxonox): Fix for MinGW
++#ifdef __MINGW32__
++    hr = CoCreateInstance(CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID*)&pIWbemLocator);
++#else
+     hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator);
++#endif
+     if( FAILED(hr) || pIWbemLocator == NULL )
+         goto LCleanup;
+ 
+
 --- mac/MacHIDManager.cpp
 +++ mac/MacHIDManager.cpp

code/branches/kicklib/src/external/ois/linux/LinuxKeyboard.cpp

@@ -284 +284 @@
         while( XPending(display) > 0 )
         {
-                XNextEvent(display, &event);            if(KeyPress == event.type)
+                XNextEvent(display, &event);
+
+                if(KeyPress == event.type)
                 {
                         unsigned int character = 0;

code/branches/kicklib/src/external/ois/mac/CMakeLists.txt

@@ -8 +8 @@
   MacPrereqs.h
 
-  #COMPILATION_BEGIN OISMacCompilation.cpp
+#COMPILATION_BEGIN OISMacCompilation.cpp
   MacHelpers.cpp
   MacHIDManager.cpp
@@ -15 +15 @@
   MacKeyboard.cpp
   MacMouse.cpp
-  #COMPILATION_END
+#COMPILATION_END
 )

code/branches/kicklib/src/external/ois/win32/Win32JoyStick.cpp

@@ -26 +26 @@
 #include "OISEvents.h"
 #include "OISException.h"
+
+// (Orxonox): Required for MinGW to compile properly
+#ifdef __MINGW32__
+#  include <oaidl.h>
+#  ifndef __MINGW_EXTENSION
+#    define __MINGW_EXTENSION __extension__
+#  endif
+#endif
 
 #include <cassert>
@@ -38 +46 @@
       x = NULL;         \
    }
+#endif
+
+// (Orxonox): MinGW doesn't have swscanf_s
+#ifdef __MINGW32__
+#       define swscanf_s swscanf
 #endif
 
@@ -584 +597 @@
 
     // Create WMI
+    // (Orxonox): Fix for MinGW
+#ifdef __MINGW32__
+    hr = CoCreateInstance(CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID*)&pIWbemLocator);
+#else
     hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator);
+#endif
     if( FAILED(hr) || pIWbemLocator == NULL )
         goto LCleanup;