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

Fix joystick support for Qt build #9268

Merged
merged 2 commits into from
Feb 1, 2017
Merged

Conversation

zhykzhykzhyk
Copy link
Contributor

@zhykzhykzhyk zhykzhykzhyk commented Feb 1, 2017

Define SDL macro in CMakeLists.txt

SDL_WaitEvent can only be called from main thread on MacOS Sierra, use SDL_AddEventWatch and SDL_PumpEvents instead.

Fixes #9157.

@hrydgard hrydgard merged commit 75dbdb1 into hrydgard:master Feb 1, 2017
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.

2 participants