Changeset 8069 for code/branches/mac_osx/src

Timestamp:

Mar 13, 2011, 10:05:11 PM (14 years ago)

Author:

rgrieder

Message:

MinGW quick fix for OIS (doesn't yet work though).

File:

• code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp (modified) (2 diffs)

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

@@ -38 +38 @@
       x = NULL;         \
    }
+#endif
+
+// (Orxonox): MinGW doesn't have swscanf_s
+#ifdef __MINGW32__
+#       define swscanf_s swscanf
 #endif
 
@@ -584 +589 @@
 
     // 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;