Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/external/ois/changes_orxonox.diff @ 12048

Last change on this file since 12048 was 8351, checked in by rgrieder, 14 years ago

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

  • *Support for Mac OS X*
  • Visual Studio 2010 support
  • Bullet library update to 2.77
  • OIS library update to 1.3
  • Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
  • Improved install target
  • Compiles now with GCC 4.6
  • Ogre Cg Shader plugin activated for Linux if available
  • And of course lots of bug fixes

There are also some regressions:

  • No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
  • In game console is not working in main menu for CEGUI 0.7
  • Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
  • And of course lots of new bugs we don't yet know about
  • Property svn:eol-style set to native
File size: 2.6 KB
RevLine 
[7163]1--- OISPrereqs.h        (revision 7141)
2+++ OISPrereqs.h        (working copy)
3@@ -60,7 +60,7 @@
4 #              define OIS_XBOX_PLATFORM
5 #      else
6 #              define OIS_WIN32_PLATFORM
7-#              if defined( OIS_DYNAMIC_LIB )
8+#              if !defined( OIS_STATIC_LIB )
9 #                      undef _OISExport
10                        //Ignorable Dll interface warning...
11 #           if !defined(OIS_MINGW_COMPILER)
[8351]12
13
[5695]14--- linux/EventHelpers.cpp      (revision 5668)
15+++ linux/EventHelpers.cpp      (working copy)
16@@ -35,6 +35,20 @@
17 # include <iostream>
18 #endif
19 
20+// Fixes for missing macros in input.h
21+#ifndef FF_EFFECT_MIN
22+#define FF_EFFECT_MIN FF_RUMBLE
23+#endif
24+#ifndef FF_EFFECT_MAX
25+#define FF_EFFECT_MAX FF_RAMP
26+#endif
27+#ifndef FF_WAVEFORM_MIN
28+#define FF_WAVEFORM_MIN FF_SQUARE
29+#endif
30+#ifndef FF_WAVEFORM_MAX
31+#define FF_WAVEFORM_MAX FF_CUSTOM
32+#endif
33+
34 using namespace std;
35 using namespace OIS;
36 
37
[5929]38--- win32/Win32ForceFeedback.cpp
39+++ win32/Win32ForceFeedback.cpp
40@@ -25,7 +25,7 @@
[8351]41 #include <math.h>
[5929]42 
43 // 0 = No trace; 1 = Important traces; 2 = Debug traces
44-#define OIS_WIN32_JOYFF_DEBUG 1
45+#define OIS_WIN32_JOYFF_DEBUG 0
46 
47 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
48   #include <iostream>
[8351]49
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
94--- mac/MacHIDManager.cpp
95+++ mac/MacHIDManager.cpp
96@@ -406,6 +406,7 @@
97                        switch(iType)
98                        {
99                                case OISJoyStick:
100+                {
101                                        int totalDevs = totalDevices(iType);
102                                        int freeDevs = freeDevices(iType);
103                                        int devID = totalDevs - freeDevs;
104@@ -413,6 +414,7 @@
105                                        obj = new MacJoyStick((*it)->combinedKey, bufferMode, *it, creator, devID);
106                                        (*it)->inUse = true;
107                                        return obj;
108+                }
109                                case OISTablet:
110                                        //Create MacTablet
111                                        break;
Note: See TracBrowser for help on using the repository browser.