mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into master

Browse Source
This commit is contained in:
Lukas Dürrenberger 2023-06-21 09:25:30 +02:00
commit 48fde44047
4 changed files with 520 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

891
changelog.md
View File

File diff suppressed because it is too large Load Diff

2
cmake/SFMLConfig.cmake.in
View File

@ -14,7 +14,7 @@
# example: # example:
# find_package(SFML COMPONENTS ...) # no specific version required # find_package(SFML COMPONENTS ...) # no specific version required
# find_package(SFML 3 COMPONENTS ...) # any 3.x version # find_package(SFML 3 COMPONENTS ...) # any 3.x version
# find_package(SFML 2.4 COMPONENTS ...) # version 2.4 or greater with the same major version # find_package(SFML 2.6 COMPONENTS ...) # version 2.6 or greater with the same major version
# #
# By default, the dynamic libraries of SFML will be found. To find the static ones instead, # By default, the dynamic libraries of SFML will be found. To find the static ones instead,
# you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...). # you must set the SFML_STATIC_LIBRARIES variable to TRUE before calling find_package(SFML ...).

2
doc/doxyfile.in
View File

@ -193,7 +193,7 @@ STRIP_FROM_PATH =
# specify the list of include paths that are normally passed to the compiler # specify the list of include paths that are normally passed to the compiler
# using the -I flag. # using the -I flag.
STRIP_FROM_INC_PATH = STRIP_FROM_INC_PATH = "@DOXYGEN_INPUT_DIR@/include"
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
# less readable) file names. This can be useful is your file systems doesn't # less readable) file names. This can be useful is your file systems doesn't

1
src/SFML/Audio/SoundFileReaderMp3.cpp
View File

@ -56,6 +56,7 @@
#include <algorithm> #include <algorithm>
#include <cstdint>
#include <cstring> #include <cstring>