Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/kicklib/src/external/ois/changes_orxonox.diff @ 8598

Last change on this file since 8598 was 8073, checked in by rgrieder, 14 years ago

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

  • Property svn:eol-style set to native
File size: 2.6 KB
  • OISPrereqs.h

     
    6060#               define OIS_XBOX_PLATFORM
    6161#       else
    6262#               define OIS_WIN32_PLATFORM
    63 #               if defined( OIS_DYNAMIC_LIB )
     63#               if !defined( OIS_STATIC_LIB )
    6464#                       undef _OISExport
    6565                        //Ignorable Dll interface warning...
    6666#           if !defined(OIS_MINGW_COMPILER)
  • linux/EventHelpers.cpp

    
            
     
    3535# include <iostream>
    3636#endif
    3737
     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
    3852using namespace std;
    3953using namespace OIS;
    4054
  • win32/Win32ForceFeedback.cpp

     
    2525#include <math.h>
    2626
    2727// 0 = No trace; 1 = Important traces; 2 = Debug traces
    28 #define OIS_WIN32_JOYFF_DEBUG 1
     28#define OIS_WIN32_JOYFF_DEBUG 0
    2929
    3030#if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
    3131  #include <iostream>
  • win32/Win32JoyStick.cpp

    
            
     
    2626#include "OISEvents.h"
    2727#include "OISException.h"
    2828
     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
    2937#include <cassert>
    3038#include <wbemidl.h>
    3139#include <oleauto.h>
     
    3947   }
    4048#endif
    4149
     50// (Orxonox): MinGW doesn't have swscanf_s
     51#ifdef __MINGW32__
     52#       define swscanf_s swscanf
     53#endif
     54
    4255#ifdef OIS_WIN32_XINPUT_SUPPORT
    4356#       pragma comment(lib, "xinput.lib")
    4457#endif
     
    583596    bool bCleanupCOM = SUCCEEDED(hr);
    584597
    585598    // 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
    586603    hr = CoCreateInstance(__uuidof(WbemLocator), NULL, CLSCTX_INPROC_SERVER, __uuidof(IWbemLocator), (LPVOID*)&pIWbemLocator);
     604#endif
    587605    if( FAILED(hr) || pIWbemLocator == NULL )
    588606        goto LCleanup;
    589607
  • mac/MacHIDManager.cpp

     
    406406                        switch(iType)
    407407                        {
    408408                                case OISJoyStick:
     409                {
    409410                                        int totalDevs = totalDevices(iType);
    410411                                        int freeDevs = freeDevices(iType);
    411412                                        int devID = totalDevs - freeDevs;
     
    413414                                        obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID);
    414415                                        (*it)->inUse = true;
    415416                                        return obj;
     417                }
    416418                                case OISTablet:
    417419                                        //Create MacTablet
    418420                                        break;
Note: See TracBrowser for help on using the repository browser.