source:
code/branches/planetLevelHS15/src/external/ois/changes_orxonox.diff
@
10828
Last change on this file since 10828 was 8351, checked in by rgrieder, 14 years ago | |
---|---|
|
|
File size: 2.6 KB |
-
OISPrereqs.h
60 60 # define OIS_XBOX_PLATFORM 61 61 # else 62 62 # define OIS_WIN32_PLATFORM 63 # if defined( OIS_DYNAMIC_LIB )63 # if !defined( OIS_STATIC_LIB ) 64 64 # undef _OISExport 65 65 //Ignorable Dll interface warning... 66 66 # if !defined(OIS_MINGW_COMPILER) -
linux/EventHelpers.cpp
35 35 # include <iostream> 36 36 #endif 37 37 38 // Fixes for missing macros in input.h 39 #ifndef FF_EFFECT_MIN 40 #define FF_EFFECT_MIN FF_RUMBLE 41 #endif 42 #ifndef FF_EFFECT_MAX 43 #define FF_EFFECT_MAX FF_RAMP 44 #endif 45 #ifndef FF_WAVEFORM_MIN 46 #define FF_WAVEFORM_MIN FF_SQUARE 47 #endif 48 #ifndef FF_WAVEFORM_MAX 49 #define FF_WAVEFORM_MAX FF_CUSTOM 50 #endif 51 38 52 using namespace std; 39 53 using namespace OIS; 40 54 -
win32/Win32ForceFeedback.cpp
25 25 #include <math.h> 26 26 27 27 // 0 = No trace; 1 = Important traces; 2 = Debug traces 28 #define OIS_WIN32_JOYFF_DEBUG 128 #define OIS_WIN32_JOYFF_DEBUG 0 29 29 30 30 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG)) 31 31 #include <iostream> -
win32/Win32JoyStick.cpp
26 26 #include "OISEvents.h" 27 27 #include "OISException.h" 28 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 36 29 37 #include <cassert> 30 38 #include <wbemidl.h> 31 39 #include <oleauto.h> … … 39 47 } 40 48 #endif 41 49 50 // (Orxonox): MinGW doesn't have swscanf_s 51 #ifdef __MINGW32__ 52 # define swscanf_s swscanf 53 #endif 54 42 55 #ifdef OIS_WIN32_XINPUT_SUPPORT 43 56 # pragma comment(lib, "xinput.lib") 44 57 #endif … … 583 596 bool bCleanupCOM = SUCCEEDED(hr); 584 597 585 598 // Create WMI 599 // (Orxonox): Fix for MinGW 600 #ifdef __MINGW32__ 601 hr = CoCreateInstance(CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID*)&pIWbemLocator); 602 #else 586 603 hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator); 604 #endif 587 605 if( FAILED(hr) || pIWbemLocator == NULL ) 588 606 goto LCleanup; 589 607 -
mac/MacHIDManager.cpp
406 406 switch(iType) 407 407 { 408 408 case OISJoyStick: 409 { 409 410 int totalDevs = totalDevices(iType); 410 411 int freeDevs = freeDevices(iType); 411 412 int devID = totalDevs - freeDevs; … … 413 414 obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID); 414 415 (*it)->inUse = true; 415 416 return obj; 417 } 416 418 case OISTablet: 417 419 //Create MacTablet 418 420 break;
Note: See TracBrowser
for help on using the repository browser.