Skip to content
Browse files

Merge pull request #1140 from Karlson2k/UseJoystick_Globals_Fix

Fix SystemGlobals.cpp - remove g_Joystick when not needed
  • Loading branch information...
2 parents 163195c + 068e213 commit 78ea7827c0ade4539742690009cea94272f5c2a7 @jmarshallnz jmarshallnz committed Jul 9, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/SystemGlobals.cpp
View
4 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;

0 comments on commit 78ea782

Please sign in to comment.
Something went wrong with that request. Please try again.