[Orxonox-commit 3382] r8069 - code/branches/mac_osx/src/external/ois/win32

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-13 22:05:11 +0100 (Sun, 13 Mar 2011)
New Revision: 8069

Modified:
   code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp
Log:
MinGW quick fix for OIS (doesn't yet work though).

Modified: code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp
===================================================================
--- code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp	2011-03-13 14:54:54 UTC (rev 8068)
+++ code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp	2011-03-13 21:05:11 UTC (rev 8069)
@@ -39,6 +39,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 +588,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;