diff --git a/CMakeLists.txt b/CMakeLists.txt
index fad3e25..09cadae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ endmacro()
csfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug or Release)")
# project name
-project(CSFML VERSION 2.5.2)
+project(CSFML VERSION 2.6.0)
# include the configuration file
include(${PROJECT_SOURCE_DIR}/cmake/Config.cmake)
diff --git a/include/SFML/Config.h b/include/SFML/Config.h
index d6f74bf..c7a455f 100644
--- a/include/SFML/Config.h
+++ b/include/SFML/Config.h
@@ -30,8 +30,8 @@
// Define the CSFML version
////////////////////////////////////////////////////////////
#define CSFML_VERSION_MAJOR 2
-#define CSFML_VERSION_MINOR 5
-#define CSFML_VERSION_PATCH 2
+#define CSFML_VERSION_MINOR 6
+#define CSFML_VERSION_PATCH 0
////////////////////////////////////////////////////////////
diff --git a/tools/BuildMacOS.sh b/tools/BuildMacOS.sh
index 9b2179b..7bfe9ff 100644
--- a/tools/BuildMacOS.sh
+++ b/tools/BuildMacOS.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-VERSION="2.5.1"
-VERSION_C="2.5.1"
+VERSION="2.6.1"
+VERSION_C="2.6.0"
# BUILD_CSFML=FALSE
BUILD_CSFML=TRUE
BUILD_SFML=FALSE
diff --git a/tools/nuget/CSFML/CSFML.csproj b/tools/nuget/CSFML/CSFML.csproj
index ec8ce03..c731c06 100644
--- a/tools/nuget/CSFML/CSFML.csproj
+++ b/tools/nuget/CSFML/CSFML.csproj
@@ -4,7 +4,7 @@
netstandard2.0
true
- 2.5.2
+ 2.6.0
Laurent Gomila
sfml csfml
Copyright © Laurent Gomila
diff --git a/tools/nuget/README.md b/tools/nuget/README.md
index 8e8a5b0..32c1821 100644
--- a/tools/nuget/README.md
+++ b/tools/nuget/README.md
@@ -16,7 +16,7 @@ All build scripts follow the same routine:
* `build.linux.sh`
* 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.
- 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.
+ 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.
* `build.macos.sh`
* 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).
diff --git a/tools/nuget/build.docker.ps1 b/tools/nuget/build.docker.ps1
index de8e3b9..2a4f123 100644
--- a/tools/nuget/build.docker.ps1
+++ b/tools/nuget/build.docker.ps1
@@ -47,7 +47,7 @@ switch ($RID) {
$Shell = '/bin/bash'
}
'linux-arm64' {
- $Image = 'arm64v8/ubuntu:22.04'
+ $Image = 'arm64v8/ubuntu:24.04'
$Shell = '/bin/bash'
}
Default {
diff --git a/tools/nuget/build.linux.sh b/tools/nuget/build.linux.sh
index 2795fe9..0a8079f 100755
--- a/tools/nuget/build.linux.sh
+++ b/tools/nuget/build.linux.sh
@@ -42,7 +42,7 @@ echo "Please note that all SFML dependencies must be installed and available to
RID="$1"
-SFMLBranch="2.5.1" # The branch or tag of the SFML repository to be cloned
+SFMLBranch="2.6.1" # The branch or tag of the SFML repository to be cloned
CSFMLDir="$(realpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML
OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
@@ -137,7 +137,7 @@ copymodule()
# Note the wildcard at the end of the first argument
# We are copying every versioned file here, not just the .so
- # (libsfml-audio.so, libsfml-audio.so.2, libsfml-audio.so.2.5, etc)
+ # (libsfml-audio.so, libsfml-audio.so.2, libsfml-audio.so.2.6, etc)
# This is needed because of the way linux searches for libraries based
# one their SONAME
cp "$SFMLLibDir/libsfml-$MODULE.so"* "$OutDir"
diff --git a/tools/nuget/build.macos.sh b/tools/nuget/build.macos.sh
index 800a4a3..de7efa2 100755
--- a/tools/nuget/build.macos.sh
+++ b/tools/nuget/build.macos.sh
@@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to
RID="$1"
-SFMLBranch="2.5.x" # The branch or tag of the SFML repository to be cloned
+SFMLBranch="2.6.1" # The branch or tag of the SFML repository to be cloned
CSFMLDir="$(grealpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML
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)"
if [ $RID == "osx-x64" ]; then
ARCHITECTURE="x86_64"
- TARGET="10.12"
- SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/"
-elif [ $RID == "osx.11.0-x64" ]; then
- ARCHITECTURE="x86_64"
- TARGET="11.0"
- SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/"
-elif [ $RID == "osx.11.0-arm64" ]; then
+elif [ $RID == "osx-arm64" ]; then
ARCHITECTURE="arm64"
- TARGET="11.0"
- SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/"
echo "Note: arm64 is only supported with SFML 2.6"
else
- echo "Unsupported RID provided. Use 'osx.10.15-x64', 'osx.11.0-x64' or 'osx.11.0-arm64'"
+ echo "Unsupported RID provided. Use 'osx-x64', 'osx-arm64'"
exit 1
fi
@@ -115,8 +107,6 @@ cmake -E env \
-D 'SFML_BUILD_FRAMEWORKS=OFF' \
-D 'CMAKE_BUILD_TYPE=Release' \
-D "CMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" \
- -D "CMAKE_OSX_DEPLOYMENT_TARGET=$TARGET" \
- -D "CMAKE_OSX_SYSROOT=$SYSROOT" \
-D "CMAKE_LIBRARY_OUTPUT_DIRECTORY=$SFMLLibDir" \
-D 'CMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
-D 'CMAKE_INSTALL_RPATH=@loader_path' \
@@ -146,8 +136,6 @@ cmake -E env \
-D 'BUILD_SHARED_LIBS=ON' \
-D 'CMAKE_BUILD_TYPE=Release' \
-D "CMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" \
- -D "CMAKE_OSX_DEPLOYMENT_TARGET=$TARGET" \
- -D "CMAKE_OSX_SYSROOT=$SYSROOT" \
-D "CMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" \
-D 'CMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
-D 'CMAKE_INSTALL_RPATH=@loader_path' \
@@ -160,7 +148,7 @@ cmake --build . --config Release --target install
# STEP 5: Fix RPATH references #
# ============================ #
-SFMLMajorMinor="2.5"
+SFMLMajorMinor="2.6"
SFMLMajorMinorPatch="$SFMLMajorMinor.1"
# SFML's framework dependencies will always reference @rpath/../Frameworks/
@@ -190,8 +178,8 @@ fixrpath graphics "@rpath/../Frameworks/freetype.framework/Versions/A/freetype"
# STEP 6: Copy result to the NuGet folders #
# ======================================== #
-CSFMLMajorMinor="2.5"
-CSFMLMajorMinorPatch="$CSFMLMajorMinor.2"
+CSFMLMajorMinor="2.6"
+CSFMLMajorMinorPatch="$CSFMLMajorMinor.0"
# Copies one SFML and CSFML module into the NuGet package
# The module name must be passed to this function as an argument, in lowercase
@@ -205,7 +193,7 @@ copymodule()
# Note the wildcard at the end of the first argument
# We are copying every versioned file here, not just the .dylib
- # (libsfml-audio.dylib, libsfml-audio.2.dylib, libsfml-audio.2.5.dylib, etc)
+ # (libsfml-audio.dylib, libsfml-audio.2.dylib, libsfml-audio.2.6.dylib, etc)
# This is needed because of the way macOS searches for libraries based
# one their SONAME
cp "$SFMLLibDir/libsfml-$MODULE."* "$OutDir"
diff --git a/tools/nuget/build.win.ps1 b/tools/nuget/build.win.ps1
index 0722be1..fa31809 100644
--- a/tools/nuget/build.win.ps1
+++ b/tools/nuget/build.win.ps1
@@ -16,7 +16,7 @@ if (-not $RID) {
exit
}
-$Generator = 'Visual Studio 16 2019'
+$Generator = 'Visual Studio 17 2022'
switch ($RID) {
'win-x86' {
@@ -35,7 +35,7 @@ Write-Output "Building $RID"
Write-Output "Using $Generator as the cmake generator"
Write-Output "Using architecture $Architecture"
-$SFMLBranch = "2.5.1" # The branch or tag of the SFML repository to be cloned
+$SFMLBranch = "2.6.1" # The branch or tag of the SFML repository to be cloned
$CSFMLDir = (Get-Item (git rev-parse --show-toplevel)).FullName # The directory of the source code of CSFML
$OutDir = "./CSFML/runtimes/$RID/native" # The directory of all CSFML modules, used to copy the final dlls