Changeset 8070 for code/branches/mac_osx/src/external
- Timestamp:
- Mar 13, 2011, 11:30:29 PM (14 years ago)
- Location:
- code/branches/mac_osx/src/external/ois
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mac_osx/src/external/ois/CMakeLists.txt
r8065 r8070 56 56 ADD_COMPILER_FLAGS("-D_WIN32_DCOM" MSVC8) 57 57 58 # MinGW doesn't come with some required Windows headers 59 IF(MINGW) 60 INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR}) 61 ENDIF() 62 58 63 ORXONOX_ADD_LIBRARY(ois_orxonox 59 64 ORXONOX_EXTERNAL … … 67 72 68 73 IF(WIN32) 69 TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES} )74 TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES} ${WMI_LIBRARY}) 70 75 ELSEIF(APPLE) 71 76 TARGET_LINK_LIBRARIES(ois_orxonox "/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/Carbon.framework") -
code/branches/mac_osx/src/external/ois/changes_orxonox.diff
r7516 r8070 49 49 50 50 51 --- win32/Win32JoyStick.cpp 52 +++ win32/Win32JoyStick.cpp 53 @@ -26,6 +26,14 @@ 54 #include "OISEvents.h" 55 #include "OISException.h" 56 57 +// (Orxonox): Required for MinGW to compile properly 58 +#ifdef __MINGW32__ 59 +# include <oaidl.h> 60 +# ifndef __MINGW_EXTENSION 61 +# define __MINGW_EXTENSION __extension__ 62 +# endif 63 +#endif 64 + 65 #include <cassert> 66 #include <wbemidl.h> 67 #include <oleauto.h> 68 @@ -39,6 +47,11 @@ 69 } 70 #endif 71 72 +// (Orxonox): MinGW doesn't have swscanf_s 73 +#ifdef __MINGW32__ 74 +# define swscanf_s swscanf 75 +#endif 76 + 77 #ifdef OIS_WIN32_XINPUT_SUPPORT 78 # pragma comment(lib, "xinput.lib") 79 #endif 80 @@ -583,7 +596,12 @@ 81 bool bCleanupCOM = SUCCEEDED(hr); 82 83 // Create WMI 84 + // (Orxonox): Fix for MinGW 85 +#ifdef __MINGW32__ 86 + hr = CoCreateInstance(CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID*)&pIWbemLocator); 87 +#else 88 hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator); 89 +#endif 90 if( FAILED(hr) || pIWbemLocator == NULL ) 91 goto LCleanup; 92 93 51 94 --- mac/MacHIDManager.cpp 52 95 +++ mac/MacHIDManager.cpp -
code/branches/mac_osx/src/external/ois/win32/Win32JoyStick.cpp
r8069 r8070 26 26 #include "OISEvents.h" 27 27 #include "OISException.h" 28 29 // (Orxonox): Required for MinGW to compile properly 30 #ifdef __MINGW32__ 31 # include <oaidl.h> 32 # ifndef __MINGW_EXTENSION 33 # define __MINGW_EXTENSION __extension__ 34 # endif 35 #endif 28 36 29 37 #include <cassert>
Note: See TracChangeset
for help on using the changeset viewer.