I updated my copy of OISB from your mercurial repository. You missed some necessary fixes:
Code: Select all
diff -r bf2af303811d -r a8036d384b1b include/OISBPropertySet.h
--- a/include/OISBPropertySet.h Sun Mar 06 12:58:37 2011 +0100
+++ b/include/OISBPropertySet.h Sun Mar 06 18:05:10 2011 +0200
@@ -57,9 +57,9 @@
* @brief gets property of given name and the result is returned as given type
*/
template<typename T>
- inline typename T getProperty(const String& name) const
+ inline T getProperty(const String& name) const
{
- return fromString<typename T>(impl_getProperty(name));
+ return fromString<T>(impl_getProperty(name));
}
// stub method, compiler will pick this up if possible (it has priority over the templated variant)
diff -r bf2af303811d -r a8036d384b1b src/OISBAnalogAxisState.cpp
--- a/src/OISBAnalogAxisState.cpp Sun Mar 06 12:58:37 2011 +0100
+++ b/src/OISBAnalogAxisState.cpp Sun Mar 06 18:05:10 2011 +0200
@@ -23,6 +23,9 @@
#include "OISBAnalogAxisState.h"
+#include <cmath>
+#include <limits>
+
namespace OISB
{
AnalogAxisState::AnalogAxisState(Device* parent, const String& name):
diff -r bf2af303811d -r a8036d384b1b src/OISBSystem.cpp
--- a/src/OISBSystem.cpp Sun Mar 06 12:58:37 2011 +0100
+++ b/src/OISBSystem.cpp Sun Mar 06 18:05:10 2011 +0200
@@ -24,7 +24,7 @@
#include "OISBSystem.h"
#include "OISBMouse.h"
#include "OISBKeyboard.h"
-#include "OISBJoystick.h"
+#include "OISBJoyStick.h"
#include "OISBActionSchema.h"
#include "OISBAction.h"
#include "OISBState.h"
@@ -42,6 +42,7 @@
#include <strstream>
#include <fstream>
#include <iostream>
+#include <cstring>
using namespace rapidxml;
Also, the header file strstream is deprecated and we should use sstream.
And here are the 'simple' demo error messages:
I didn't try to fix any of those - I just disabled it in the cmake file for now.oisb/demos/simple/OISBConsole.cpp: In function ‘void doStartup()’:
oisb/demos/simple/OISBConsole.cpp:269: warning: cannot pass objects of non-POD type ‘struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >’ through ‘...’; call will abort at runtime
oisb/demos/simple/OISBConsole.cpp: In function ‘void checkX11Events()’:
oisb/demos/simple/OISBConsole.cpp:296: error: ‘g_m’ was not declared in this scope
oisb/demos/simple/OISBConsole.cpp:298: error: expected initializer before ‘&’ token
oisb/demos/simple/OISBConsole.cpp:299: error: ‘ms’ was not declared in this scope