Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure.in: Make SDL depend on joystick #6168

Merged
merged 1 commit into from Jan 11, 2015
Merged

Conversation

mgehre
Copy link
Contributor

@mgehre mgehre commented Jan 9, 2015

Currently, when using --disable-sdl, the Joystick support is still enabled by default. This leads to

CPP     xbmc/input/ButtonTranslator.o
In file included from ButtonTranslator.cpp:44:0:
SDLJoystick.h:51:31: fatal error: SDL2/SDL_joystick.h: No such file or directory

This patch remove the disable-sdl switch. Instead, SDL2 is required
whenever joystick support is enabled.
If joystick support is left on auto (as it is the
default), they it is enabled when SDL2 is detected and disabled if no SDL2
is detected.

Currently, when using --disable-sdl, the Joystick support is still enabled by default. This leads to
```
CPP     xbmc/input/ButtonTranslator.o
In file included from ButtonTranslator.cpp:44:0:
SDLJoystick.h:51:31: fatal error: SDL2/SDL_joystick.h: No such file or directory
```

This patch remove the disable-sdl switch. Instead, SDL2 is required
whenever joystick support is enabled.
If joystick support is left on auto (as it is the
default), they it is enabled when SDL2 is detected and disabled if no SDL2
is detected.
@wsnipex
Copy link
Member

wsnipex commented Jan 10, 2015

jenkins build this please

wsnipex added a commit that referenced this pull request Jan 11, 2015
configure.in: Make SDL depend on joystick
@wsnipex wsnipex merged commit c53d69b into xbmc:master Jan 11, 2015
@mgehre mgehre deleted the patch-1 branch January 11, 2015 15:52
@MartijnKaijser MartijnKaijser modified the milestone: Helix 15.0-alpha1 Jan 11, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants