Assaf Raman wrote:1.8 and the trunk are the same.
Regarding the issue - I will fix it in both.
Did you get everything to compile and run in the end?
If so - can you post the steps?
Sorry I didn't manage to compile, still problems linking.
I do not know enough about nacl but I'm probably wrongly assuming that nacl is just a derivative of mingw.
I've built the dependencies with nacl (not sure about OIS) but I don't understand how this works since OIS is built against Xlib (X11) on Linux. Surely I can't mix the libraries I link against i.e. nacl/system.
I've cross-compiled before on Linux against a vanilla mingw and as with ncal the CMake build is a pain, each change invoking a complete rebuild.
After a recent Ubuntu update for Chromium the nacl samples don't even run, they did previously so I'm not sure how I will test this even if I manage to build. Anyway any help/suggestions would be appreciated.
These are the changes that I made:
Code: Select all
diff --git a/Samples/Browser/include/SampleBrowser_NaCl.h b/Samples/Browser/include/SampleBrowser_NaCl.h
--- a/Samples/Browser/include/SampleBrowser_NaCl.h
+++ b/Samples/Browser/include/SampleBrowser_NaCl.h
@@ -63,7 +63,8 @@
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/cpp/input_event.h"
#include "OgreZip.h"
-#include <GLES2\gl2.h>
+#include <GLES2/gl2.h>
+//#include <gl2.h>
namespace
{
@@ -836,9 +837,9 @@
void capture(){};
OIS::Interface* queryInterface(OIS::Interface::IType) {return NULL;};
void _initialize(){};
- bool isKeyDown(OIS::KeyCode){return false;};
+ bool isKeyDown(OIS::KeyCode) const {return false;};
const std::string& getAsString(OIS::KeyCode){return "";};
- void copyKeyStates(char*){};
+ void copyKeyStates(char*) const {};
bool HandleInputEvent(const pp::InputEvent& event)
{
const pp::KeyboardInputEvent *keyboardEvent =
diff --git a/Samples/Browser/src/FileSystemLayerImpl_NaCl.cpp b/Samples/Browser/src/FileSystemLayerImpl_NaCl.cpp
--- a/Samples/Browser/src/FileSystemLayerImpl_NaCl.cpp
+++ b/Samples/Browser/src/FileSystemLayerImpl_NaCl.cpp
@@ -27,9 +27,9 @@
*/
#include "FileSystemLayerImpl.h"
#include <sys/types.h>
-#include <ppapi\cpp\file_system.h>
-#include <ppapi\cpp\file_ref.h>
-#include <ppapi\cpp\file_io.h>
+#include <ppapi/cpp/file_system.h>
+#include <ppapi/cpp/file_ref.h>
+#include <ppapi/cpp/file_io.h>
namespace OgreBites
{