Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/presentation3/src/external/ois/changes_orxonox.diff @ 7181

Last change on this file since 7181 was 7142, checked in by rgrieder, 14 years ago

Changed default linking behaviour of OIS to dynamic. That causes less confusions because all other libraries link dynamically per default (or don't require any macros because there is no DLL interface).
  • Property svn:eol-style set to native
File size: 1.1 KB
RevLine 
[7142]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)
[5695]12--- linux/EventHelpers.cpp      (revision 5668)
13+++ linux/EventHelpers.cpp      (working copy)
14@@ -35,6 +35,20 @@
15 # include <iostream>
16 #endif
17 
18+// Fixes for missing macros in input.h
19+#ifndef FF_EFFECT_MIN
20+#define FF_EFFECT_MIN FF_RUMBLE
21+#endif
22+#ifndef FF_EFFECT_MAX
23+#define FF_EFFECT_MAX FF_RAMP
24+#endif
25+#ifndef FF_WAVEFORM_MIN
26+#define FF_WAVEFORM_MIN FF_SQUARE
27+#endif
28+#ifndef FF_WAVEFORM_MAX
29+#define FF_WAVEFORM_MAX FF_CUSTOM
30+#endif
31+
32 using namespace std;
33 using namespace OIS;
34 
35
[5929]36--- win32/Win32ForceFeedback.cpp
37+++ win32/Win32ForceFeedback.cpp
38@@ -25,7 +25,7 @@
39 #include <Math.h>
40 
41 // 0 = No trace; 1 = Important traces; 2 = Debug traces
42-#define OIS_WIN32_JOYFF_DEBUG 1
43+#define OIS_WIN32_JOYFF_DEBUG 0
44 
45 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG))
46   #include <iostream>
Note: See TracBrowser for help on using the repository browser.