Permalink
Browse files

Move g_Joystick to SystemGlobals.cpp

  • Loading branch information...
1 parent 2773173 commit e00733fbdb336fb02aa4a32cc8389abb1b7a210a @Karlson2k committed Jul 6, 2012
Showing with 10 additions and 4 deletions.
  1. +10 −0 xbmc/SystemGlobals.cpp
  2. +0 −2 xbmc/input/SDLJoystick.cpp
  3. +0 −2 xbmc/input/windows/WINJoystick.cpp
View
@@ -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;
@@ -32,8 +32,6 @@
using namespace std;
-CJoystick g_Joystick; // global
-
CJoystick::CJoystick()
{
Reset(true);
@@ -31,8 +31,6 @@
using namespace std;
-CJoystick g_Joystick; // global
-
extern HWND g_hWnd;
#define MAX_AXISAMOUNT 32768

0 comments on commit e00733f

Please sign in to comment.