lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

further changes

Browse source
This commit is contained in:
David Carlier 2018-04-07 21:27:04 +01:00 • committed by Lukas Dürrenberger
parent 763a9fb44e
commit 9da895da8b
6 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SFML/Window/CMakeLists.txt
View file

@ -265,7 +265,7 @@ if(SFML_OS_LINUX)
target_link_libraries(sfml-window PRIVATE UDev)
elseif(SFML_OS_WINDOWS)
target_link_libraries(sfml-window PRIVATE winmm gdi32)
elseif(SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
elseif(SFML_OS_FREEBSD)
target_link_libraries(sfml-window PRIVATE usbhid)
elseif(SFML_OS_MACOSX)
target_link_libraries(sfml-window PRIVATE "-framework Foundation" "-framework AppKit" "-framework IOKit" "-framework Carbon")

6
src/SFML/Window/JoystickImpl.hpp
View file

@ -90,6 +90,10 @@ struct JoystickState
#include <SFML/Window/FreeBSD/JoystickImpl.hpp>
#elif defined(SFML_SYSTEM_OPENBSD)
#include <SFML/Window/OpenBSD/JoystickImpl.hpp>
#elif defined(SFML_SYSTEM_MACOS)
#include <SFML/Window/OSX/JoystickImpl.hpp>
@ -98,7 +102,7 @@ struct JoystickState
#include <SFML/Window/iOS/JoystickImpl.hpp>
#elif defined(SFML_SYSTEM_ANDROID) || defined(SFML_SYSTEM_OPENBSD)
#elif defined(SFML_SYSTEM_ANDROID)
#include <SFML/Window/Android/JoystickImpl.hpp>

2
src/SFML/Window/OpenBSD/JoystickImpl.hpp
View file

@ -31,7 +31,7 @@ namespace sf
namespace priv
{
////////////////////////////////////////////////////////////
/// \brief Android implementation of joysticks
/// \brief OpenBSD implementation of joysticks
///
////////////////////////////////////////////////////////////
class JoystickImpl