Merge pull request #1140 from Karlson2k/UseJoystick_Globals_Fix

Fix SystemGlobals.cpp - remove g_Joystick when not needed
xbmc · Jul 9, 2012 · 78ea782 · 78ea782
2 parents 163195c + 068e213
commit 78ea782
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xbmc/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp
@@ -43,7 +43,7 @@
 #endif
 #if defined(TARGET_WINDOWS)
 #include "input/windows/WINJoystick.h"
-#elif defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
+#elif defined(HAS_SDL_JOYSTICK) 
 #include "input/SDLJoystick.h"
 #endif
 
@@ -64,7 +64,7 @@
   CGUITextureManager g_TextureManager;
   CGUILargeTextureManager g_largeTextureManager;
   CMouseStat         g_Mouse;
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
+#if defined(HAS_SDL_JOYSTICK) 
   CJoystick          g_Joystick; 
 #endif
   CGUIPassword       g_passwordManager;