mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 13:36:12 +01:00
Update to SFML 3.1.0
- Require CMake 3.28 to match SFML - Install HarfBuzz, MbedTLS and libssh2 for Linux CI builds - Bump CSFML and NuGet package version to 3.1.0
This commit is contained in:
10 files changed
+24
-25
No files matched your search
@@ -4,7 +4,7 @@
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
|
||||
<Version>3.0.0</Version>
|
||||
<Version>3.1.0</Version>
|
||||
<Authors>Laurent Gomila</Authors>
|
||||
<PackageTags>sfml csfml</PackageTags>
|
||||
<Copyright>Copyright © Laurent Gomila</Copyright>
|
||||
|
||||
@@ -58,7 +58,7 @@ if [[ -n "$CXX_COMPILER" ]]; then
|
||||
echo "Using custom compilers: CXX=$CXX_COMPILER, CC=$C_COMPILER"
|
||||
fi
|
||||
|
||||
SFMLBranch="3.0.2" # The branch or tag of the SFML repository to be cloned
|
||||
SFMLBranch="3.1.0" # The branch or tag of the SFML repository to be cloned
|
||||
CSFMLDir="$(realpath ../../)" # 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
|
||||
@@ -145,8 +145,8 @@ cmake --build . --config Release
|
||||
# STEP 5: Copy result to the NuGet folders #
|
||||
# ======================================== #
|
||||
|
||||
SFMLMajorMinor="3.0"
|
||||
CSFMLMajorMinor="3.0"
|
||||
SFMLMajorMinor="3.1"
|
||||
CSFMLMajorMinor="3.1"
|
||||
|
||||
# Copies one SFML and CSFML module into the NuGet package
|
||||
# The module name must be passed to this function as an argument, in lowercase
|
||||
@@ -161,7 +161,7 @@ copymodule()
|
||||
# SFML.Net only searches for the name with common pre- and suffixes
|
||||
# As such we need to ship e.g. libcsfml-graphics.so
|
||||
# But the CSFML libs will look for the major.minor version
|
||||
# As such we also need to ship e.g. libcsfml-graphics.so.3.0
|
||||
# As such we also need to ship e.g. libcsfml-graphics.so.3.1
|
||||
# Unfortunately NuGet package don't support symlinks: https://github.com/NuGet/Home/issues/10734
|
||||
# For SFML, we can just ship one version that CSFML will be looking for
|
||||
cp "$SFMLLibDir/libsfml-$MODULE.so.$SFMLMajorMinor" "$OutDir"
|
||||
|
||||
@@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to
|
||||
|
||||
RID="$1"
|
||||
|
||||
SFMLBranch="3.0.2" # The branch or tag of the SFML repository to be cloned
|
||||
SFMLBranch="3.1.0" # 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
|
||||
@@ -150,9 +150,9 @@ cmake --build . --config Release --target install
|
||||
# STEP 5: Copy result to the NuGet folders #
|
||||
# ======================================== #
|
||||
|
||||
SFMLMajorMinor="3.0"
|
||||
SFMLMajorMinor="3.1"
|
||||
SFMLMajorMinorPatch="$SFMLMajorMinor.0"
|
||||
CSFMLMajorMinor="3.0"
|
||||
CSFMLMajorMinor="3.1"
|
||||
CSFMLMajorMinorPatch="$CSFMLMajorMinor.0"
|
||||
|
||||
# Copies one SFML and CSFML module into the NuGet package
|
||||
@@ -168,7 +168,7 @@ copymodule()
|
||||
# SFML.Net only searches for the name with common pre- and suffixes
|
||||
# As such we need to ship e.g. libcsfml-graphics.dylib
|
||||
# But the CSFML libs will look for the major.minor version
|
||||
# As such we also need to ship e.g. libcsfml-graphics.3.0.dylib
|
||||
# As such we also need to ship e.g. libcsfml-graphics.3.1.dylib
|
||||
# Unfortunately NuGet package don't support symlinks: https://github.com/NuGet/Home/issues/10734
|
||||
# For SFML, we can just ship one version that CSFML will be looking for
|
||||
cp "$SFMLLibDir/libsfml-$MODULE.$SFMLMajorMinor.dylib" "$OutDir"
|
||||
|
||||
@@ -43,7 +43,7 @@ Write-Output "Building $RID"
|
||||
Write-Output "Using $Generator as the cmake generator"
|
||||
Write-Output "Using architecture $ArchitectureCMake"
|
||||
|
||||
$SFMLBranch = "3.0.2" # The branch or tag of the SFML repository to be cloned
|
||||
$SFMLBranch = "3.1.0" # 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
|
||||
|
||||
Reference in new issue
Block a user