mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.6.x' into feature/backmerge

Browse Source
This commit is contained in:
Chris Thrasher 2023-02-09 20:22:56 -07:00
commit 5e75336753
No known key found for this signature in database
GPG Key ID: 56FB686C9DFC8E2C
8 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/SFMLConfigDependencies.cmake.in
View File

@ -7,6 +7,10 @@ if(SFML_STATIC_LIBRARIES)
set(FIND_SFML_OS_WINDOWS 1) set(FIND_SFML_OS_WINDOWS 1)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(FIND_SFML_OS_LINUX 1) set(FIND_SFML_OS_LINUX 1)
if(@SFML_USE_DRM@)
set(FIND_SFML_USE_DRM 1)
endif()
elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set(FIND_SFML_OS_FREEBSD 1) set(FIND_SFML_OS_FREEBSD 1)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@ -41,7 +45,10 @@ if(SFML_STATIC_LIBRARIES)
# SFML::Window # SFML::Window
list(FIND SFML_FIND_COMPONENTS "Window" FIND_SFML_WINDOW_COMPONENT_INDEX) list(FIND SFML_FIND_COMPONENTS "Window" FIND_SFML_WINDOW_COMPONENT_INDEX)
if(FIND_SFML_WINDOW_COMPONENT_INDEX GREATER -1) if(FIND_SFML_WINDOW_COMPONENT_INDEX GREATER -1)
if(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD) if(FIND_SFML_USE_DRM)
sfml_bind_dependency(TARGET DRM FRIENDLY_NAME "drm" SEARCH_NAMES "drm")
sfml_bind_dependency(TARGET GBM FRIENDLY_NAME "gbm" SEARCH_NAMES "gbm")
elseif(FIND_SFML_OS_LINUX OR FIND_SFML_OS_FREEBSD)
find_dependency(X11 REQUIRED COMPONENTS Xrandr Xcursor) find_dependency(X11 REQUIRED COMPONENTS Xrandr Xcursor)
endif() endif()

3
src/SFML/Main/CMakeLists.txt
View File

@ -18,6 +18,9 @@ endif()
sfml_add_library(Main STATIC SOURCES ${SRC}) sfml_add_library(Main STATIC SOURCES ${SRC})
if(SFML_OS_ANDROID) if(SFML_OS_ANDROID)
# ensure that linking into shared libraries doesn't fail
set_target_properties(sfml-main PROPERTIES POSITION_INDEPENDENT_CODE ON)
# glad sources # glad sources
target_include_directories(sfml-main SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include") target_include_directories(sfml-main SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/glad/include")
endif() endif()

2
src/SFML/Window/DRM/DRMContext.cpp
View File

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2020 Andrew Mickelson // Copyright (C) 2023 Andrew Mickelson
// 2013 Jonathan De Wachter (dewachter.jonathan@gmail.com) // 2013 Jonathan De Wachter (dewachter.jonathan@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warranty. // This software is provided 'as-is', without any express or implied warranty.

2
src/SFML/Window/DRM/DRMContext.hpp
View File

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2020 Andrew Mickelson // Copyright (C) 2023 Andrew Mickelson
// 2013 Jonathan De Wachter (dewachter.jonathan@gmail.com) // 2013 Jonathan De Wachter (dewachter.jonathan@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warranty. // This software is provided 'as-is', without any express or implied warranty.

2
src/SFML/Window/DRM/VideoModeImpl.cpp
View File

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2020 Andrew Mickelson // Copyright (C) 2023 Andrew Mickelson
// //
// This software is provided 'as-is', without any express or implied warranty. // This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.

2
src/SFML/Window/DRM/WindowImplDRM.cpp
View File

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2020 Andrew Mickelson // Copyright (C) 2023 Andrew Mickelson
// //
// This software is provided 'as-is', without any express or implied warranty. // This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.

2
src/SFML/Window/DRM/WindowImplDRM.hpp
View File

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2020 Andrew Mickelson // Copyright (C) 2023 Andrew Mickelson
// //
// This software is provided 'as-is', without any express or implied warranty. // This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.