Skip to content

Commit fb9b3ae

Browse files
committed
Update CSFML to 2.6.0
1 parent 160e764 commit fb9b3ae

9 files changed

+19
-31
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endmacro()
1313
csfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug or Release)")
1414

1515
# project name
16-
project(CSFML VERSION 2.5.2)
16+
project(CSFML VERSION 2.6.0)
1717

1818
# include the configuration file
1919
include(${PROJECT_SOURCE_DIR}/cmake/Config.cmake)

include/SFML/Config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
// Define the CSFML version
3131
////////////////////////////////////////////////////////////
3232
#define CSFML_VERSION_MAJOR 2
33-
#define CSFML_VERSION_MINOR 5
34-
#define CSFML_VERSION_PATCH 2
33+
#define CSFML_VERSION_MINOR 6
34+
#define CSFML_VERSION_PATCH 0
3535

3636

3737
////////////////////////////////////////////////////////////

tools/BuildMacOS.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

3-
VERSION="2.5.1"
4-
VERSION_C="2.5.1"
3+
VERSION="2.6.1"
4+
VERSION_C="2.6.0"
55
# BUILD_CSFML=FALSE
66
BUILD_CSFML=TRUE
77
BUILD_SFML=FALSE

tools/nuget/CSFML/CSFML.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66

7-
<Version>2.5.2</Version>
7+
<Version>2.6.0</Version>
88
<Authors>Laurent Gomila</Authors>
99
<PackageTags>sfml csfml</PackageTags>
1010
<Copyright>Copyright © Laurent Gomila</Copyright>

tools/nuget/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ All build scripts follow the same routine:
1616

1717
* `build.linux.sh`
1818
* A [Bash](https://www.gnu.org/software/bash/) script to build libraries for a generic Linux distribution. The [Runtime Identifier](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog) of the linux distribution must be specified as a parameter to the script.
19-
This generic script doesn't install any of its dependencies. As such, you must have cmake and make installed, as well as all [SFML Dependencies](https://www.sfml-dev.org/tutorials/2.5/compile-with-cmake.php#installing-dependencies) available to cmake.
19+
This generic script doesn't install any of its dependencies. As such, you must have cmake and make installed, as well as all [SFML Dependencies](https://www.sfml-dev.org/tutorials/2.6/compile-with-cmake.php#installing-dependencies) available to cmake.
2020

2121
* `build.macos.sh`
2222
* A [Bash](https://www.gnu.org/software/bash/) script to build libraries for macOS. The [Runtime Identifier](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#macos-rids) of the macOS distribution must be specified as parameter to the script. Latest macOS SDKs can be downloaded [here](https://github.com/phracker/MacOSX-SDKs/releases).

tools/nuget/build.docker.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ switch ($RID) {
4747
$Shell = '/bin/bash'
4848
}
4949
'linux-arm64' {
50-
$Image = 'arm64v8/ubuntu:22.04'
50+
$Image = 'arm64v8/ubuntu:24.04'
5151
$Shell = '/bin/bash'
5252
}
5353
Default {

tools/nuget/build.linux.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ echo "Please note that all SFML dependencies must be installed and available to
4242

4343
RID="$1"
4444

45-
SFMLBranch="2.5.1" # The branch or tag of the SFML repository to be cloned
45+
SFMLBranch="2.6.1" # The branch or tag of the SFML repository to be cloned
4646
CSFMLDir="$(realpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML
4747

4848
OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
@@ -137,7 +137,7 @@ copymodule()
137137

138138
# Note the wildcard at the end of the first argument
139139
# We are copying every versioned file here, not just the .so
140-
# (libsfml-audio.so, libsfml-audio.so.2, libsfml-audio.so.2.5, etc)
140+
# (libsfml-audio.so, libsfml-audio.so.2, libsfml-audio.so.2.6, etc)
141141
# This is needed because of the way linux searches for libraries based
142142
# one their SONAME
143143
cp "$SFMLLibDir/libsfml-$MODULE.so"* "$OutDir"

tools/nuget/build.macos.sh

+7-19
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to
4646

4747
RID="$1"
4848

49-
SFMLBranch="2.5.x" # The branch or tag of the SFML repository to be cloned
49+
SFMLBranch="2.6.1" # The branch or tag of the SFML repository to be cloned
5050
CSFMLDir="$(grealpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML
5151

5252
OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
@@ -92,20 +92,12 @@ SFMLLibDir="$(grealpath lib)"
9292

9393
if [ $RID == "osx-x64" ]; then
9494
ARCHITECTURE="x86_64"
95-
TARGET="10.12"
96-
SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/"
97-
elif [ $RID == "osx.11.0-x64" ]; then
98-
ARCHITECTURE="x86_64"
99-
TARGET="11.0"
100-
SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/"
101-
elif [ $RID == "osx.11.0-arm64" ]; then
95+
elif [ $RID == "osx-arm64" ]; then
10296
ARCHITECTURE="arm64"
103-
TARGET="11.0"
104-
SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/"
10597

10698
echo "Note: arm64 is only supported with SFML 2.6"
10799
else
108-
echo "Unsupported RID provided. Use 'osx.10.15-x64', 'osx.11.0-x64' or 'osx.11.0-arm64'"
100+
echo "Unsupported RID provided. Use 'osx-x64', 'osx-arm64'"
109101
exit 1
110102
fi
111103

@@ -115,8 +107,6 @@ cmake -E env \
115107
-D 'SFML_BUILD_FRAMEWORKS=OFF' \
116108
-D 'CMAKE_BUILD_TYPE=Release' \
117109
-D "CMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" \
118-
-D "CMAKE_OSX_DEPLOYMENT_TARGET=$TARGET" \
119-
-D "CMAKE_OSX_SYSROOT=$SYSROOT" \
120110
-D "CMAKE_LIBRARY_OUTPUT_DIRECTORY=$SFMLLibDir" \
121111
-D 'CMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
122112
-D 'CMAKE_INSTALL_RPATH=@loader_path' \
@@ -146,8 +136,6 @@ cmake -E env \
146136
-D 'BUILD_SHARED_LIBS=ON' \
147137
-D 'CMAKE_BUILD_TYPE=Release' \
148138
-D "CMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" \
149-
-D "CMAKE_OSX_DEPLOYMENT_TARGET=$TARGET" \
150-
-D "CMAKE_OSX_SYSROOT=$SYSROOT" \
151139
-D "CMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" \
152140
-D 'CMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
153141
-D 'CMAKE_INSTALL_RPATH=@loader_path' \
@@ -160,7 +148,7 @@ cmake --build . --config Release --target install
160148
# STEP 5: Fix RPATH references #
161149
# ============================ #
162150

163-
SFMLMajorMinor="2.5"
151+
SFMLMajorMinor="2.6"
164152
SFMLMajorMinorPatch="$SFMLMajorMinor.1"
165153

166154
# SFML's framework dependencies will always reference @rpath/../Frameworks/<depedency>
@@ -190,8 +178,8 @@ fixrpath graphics "@rpath/../Frameworks/freetype.framework/Versions/A/freetype"
190178
# STEP 6: Copy result to the NuGet folders #
191179
# ======================================== #
192180

193-
CSFMLMajorMinor="2.5"
194-
CSFMLMajorMinorPatch="$CSFMLMajorMinor.2"
181+
CSFMLMajorMinor="2.6"
182+
CSFMLMajorMinorPatch="$CSFMLMajorMinor.0"
195183

196184
# Copies one SFML and CSFML module into the NuGet package
197185
# The module name must be passed to this function as an argument, in lowercase
@@ -205,7 +193,7 @@ copymodule()
205193

206194
# Note the wildcard at the end of the first argument
207195
# We are copying every versioned file here, not just the .dylib
208-
# (libsfml-audio.dylib, libsfml-audio.2.dylib, libsfml-audio.2.5.dylib, etc)
196+
# (libsfml-audio.dylib, libsfml-audio.2.dylib, libsfml-audio.2.6.dylib, etc)
209197
# This is needed because of the way macOS searches for libraries based
210198
# one their SONAME
211199
cp "$SFMLLibDir/libsfml-$MODULE."* "$OutDir"

tools/nuget/build.win.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (-not $RID) {
1616
exit
1717
}
1818

19-
$Generator = 'Visual Studio 16 2019'
19+
$Generator = 'Visual Studio 17 2022'
2020

2121
switch ($RID) {
2222
'win-x86' {
@@ -35,7 +35,7 @@ Write-Output "Building $RID"
3535
Write-Output "Using $Generator as the cmake generator"
3636
Write-Output "Using architecture $Architecture"
3737

38-
$SFMLBranch = "2.5.1" # The branch or tag of the SFML repository to be cloned
38+
$SFMLBranch = "2.6.1" # The branch or tag of the SFML repository to be cloned
3939
$CSFMLDir = (Get-Item (git rev-parse --show-toplevel)).FullName # The directory of the source code of CSFML
4040

4141
$OutDir = "./CSFML/runtimes/$RID/native" # The directory of all CSFML modules, used to copy the final dlls

0 commit comments

Comments
 (0)