commiting fixes from Ettore for building on linux & win 32

[blender.git] / intern / ghost / intern / GHOST_NDOFManager.cpp

diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index e4a3bc230d6b996bfa52c7c2f30b705ffa30bbcc..501d6c57dd577795e6f6a23154653679e42ec611 100644 (file)
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -27,6 +27,10 @@
 // the variable is outside the class because it must be accessed from plugin
 static volatile GHOST_TEventNDOFData currentNdofValues = {0,0,0,0,0,0,0,0,0,0,0};
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+#include "GHOST_SystemX11.h"
+#endif
+
 namespace
 {
     GHOST_NDOFLibraryInit_fp ndofLibraryInit = 0;
@@ -66,9 +70,6 @@ GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window,
     if (ndofLibraryInit  && ndofDeviceOpen)
     {
        printf("%i client \n", ndofLibraryInit());
-               
-               m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
-               
                #if defined(_WIN32) || defined(__APPLE__)
                        m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
                #else