Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -143,7 +143,7 @@ endif()
# For miscellaneous files # For miscellaneous files
if(SFML_OS_WINDOWS OR SFML_OS_IOS) if(SFML_OS_WINDOWS OR SFML_OS_IOS)
set(DEFAULT_INSTALL_MISC_DIR .) set(DEFAULT_INSTALL_MISC_DIR .)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD) elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
set(DEFAULT_INSTALL_MISC_DIR share/SFML) set(DEFAULT_INSTALL_MISC_DIR share/SFML)
elseif(SFML_OS_MACOSX) elseif(SFML_OS_MACOSX)
set(DEFAULT_INSTALL_MISC_DIR /usr/local/share/SFML) set(DEFAULT_INSTALL_MISC_DIR /usr/local/share/SFML)

9
cmake/Config.cmake
View File

@ -121,12 +121,3 @@ else()
message(FATAL_ERROR "Unsupported compiler") message(FATAL_ERROR "Unsupported compiler")
return() return()
endif() endif()
# define the install directory for miscellaneous files
if(SFML_OS_WINDOWS OR SFML_OS_IOS)
set(INSTALL_MISC_DIR .)
elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX OR SFML_OS_OPENBSD)
set(INSTALL_MISC_DIR share/SFML)
elseif(SFML_OS_ANDROID)
set(INSTALL_MISC_DIR ${ANDROID_NDK}/sources/sfml)
endif()

1
include/SFML/Config.hpp
View File

@ -85,6 +85,7 @@
// FreeBSD // FreeBSD
#define SFML_SYSTEM_FREEBSD #define SFML_SYSTEM_FREEBSD
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
// OpenBSD // OpenBSD

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

@ -265,7 +265,7 @@ if(SFML_OS_LINUX)
target_link_libraries(sfml-window PRIVATE UDev) target_link_libraries(sfml-window PRIVATE UDev)
elseif(SFML_OS_WINDOWS) elseif(SFML_OS_WINDOWS)
target_link_libraries(sfml-window PRIVATE winmm gdi32) 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) target_link_libraries(sfml-window PRIVATE usbhid)
elseif(SFML_OS_MACOSX) elseif(SFML_OS_MACOSX)
target_link_libraries(sfml-window PRIVATE "-framework Foundation" "-framework AppKit" "-framework IOKit" "-framework Carbon") 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> #include <SFML/Window/FreeBSD/JoystickImpl.hpp>
#elif defined(SFML_SYSTEM_OPENBSD)
#include <SFML/Window/OpenBSD/JoystickImpl.hpp>
#elif defined(SFML_SYSTEM_MACOS) #elif defined(SFML_SYSTEM_MACOS)
#include <SFML/Window/OSX/JoystickImpl.hpp> #include <SFML/Window/OSX/JoystickImpl.hpp>
@ -98,7 +102,7 @@ struct JoystickState
#include <SFML/Window/iOS/JoystickImpl.hpp> #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> #include <SFML/Window/Android/JoystickImpl.hpp>

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

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