diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2012-07-09 14:04:34 -0700 |
|---|---|---|
| committer | jmarshallnz <jcmarsha@gmail.com> | 2012-07-09 14:04:34 -0700 |
| commit | 78ea7827c0ade4539742690009cea94272f5c2a7 (patch) | |
| tree | 252c230f457122dab874441b070392c0d9f6cdb1 | |
| parent | 163195cb184862171f2f83b4371fdee0775a5fd6 (diff) | |
| parent | 068e213016af926213da8c26448f9a4e2598b7a8 (diff) | |
Merge pull request #1140 from Karlson2k/UseJoystick_Globals_Fix
Fix SystemGlobals.cpp - remove g_Joystick when not needed
| -rw-r--r-- | xbmc/SystemGlobals.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp index c6acf3ac2a..0d4bfbb378 100644 --- 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; |