Move g_Joystick to SystemGlobals.cpp

diff --git a/xbmc/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp
index 19a0d84..c6acf3a 100644 (file)
--- a/xbmc/SystemGlobals.cpp
+++ b/xbmc/SystemGlobals.cpp
@@ -41,6 +41,13 @@
 #ifdef HAS_PYTHON
 #include "interfaces/python/XBPython.h"
 #endif
+#if defined(TARGET_WINDOWS)
+#include "input/windows/WINJoystick.h"
+#elif defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
+#include "input/SDLJoystick.h"
+#endif
+
+
 
   CGUISettings       g_guiSettings;
   CSettings          g_settings;
@@ -57,6 +64,9 @@
   CGUITextureManager g_TextureManager;
   CGUILargeTextureManager g_largeTextureManager;
   CMouseStat         g_Mouse;
+#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
+  CJoystick          g_Joystick; 
+#endif
   CGUIPassword       g_passwordManager;
   CGUIInfoManager    g_infoManager;
 

diff --git a/xbmc/input/SDLJoystick.cpp b/xbmc/input/SDLJoystick.cpp
index 4eedbb8..df7fc8d 100644 (file)
--- a/xbmc/input/SDLJoystick.cpp
+++ b/xbmc/input/SDLJoystick.cpp
@@ -32,8 +32,6 @@
 
 using namespace std;
 
-CJoystick g_Joystick; // global
-
 CJoystick::CJoystick()
 {
   Reset(true);

diff --git a/xbmc/input/windows/WINJoystick.cpp b/xbmc/input/windows/WINJoystick.cpp
index e0a11f7..6194104 100644 (file)
--- a/xbmc/input/windows/WINJoystick.cpp
+++ b/xbmc/input/windows/WINJoystick.cpp
@@ -31,8 +31,6 @@
 
 using namespace std;
 
-CJoystick g_Joystick; // global
-
 extern HWND g_hWnd;
 
 #define MAX_AXISAMOUNT  32768