Skip to content

Commit 3c2ee44

Browse files
committed
Update SFML version to 3.0.2
1 parent 603122a commit 3c2ee44

File tree

8 files changed

+25
-12
lines changed

8 files changed

+25
-12
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
cancel-in-progress: true
88

99
env:
10-
SFML_VERSION: 3.0.1
10+
SFML_VERSION: 3.0.2
1111

1212
defaults:
1313
run:
@@ -109,6 +109,12 @@ jobs:
109109
runs-on: macos-14
110110

111111
steps:
112+
- name: Get CMake and Ninja
113+
uses: lukka/get-cmake@latest
114+
with:
115+
cmakeVersion: ${{ runner.os == 'Windows' && '3.25' || '3.22' }}
116+
ninjaVersion: latest
117+
112118
- name: Install Dependencies
113119
run: |
114120
brew update
@@ -144,6 +150,12 @@ jobs:
144150
runs-on: macos-14
145151

146152
steps:
153+
- name: Get CMake and Ninja
154+
uses: lukka/get-cmake@latest
155+
with:
156+
cmakeVersion: ${{ runner.os == 'Windows' && '3.25' || '3.22' }}
157+
ninjaVersion: latest
158+
147159
- name: Install Doxygen
148160
run: |
149161
brew update

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
env:
17-
SFML_VERSION: 3.0.1
17+
SFML_VERSION: 3.0.2
1818

1919
jobs:
2020
windows-x86:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ endif()
6666
if(CSFML_BUILD_NETWORK)
6767
list(PREPEND SFML_MODULES "Network")
6868
endif()
69-
find_package(SFML 3.0.0 COMPONENTS ${SFML_MODULES} REQUIRED)
69+
find_package(SFML 3.0 COMPONENTS ${SFML_MODULES} REQUIRED)
7070

7171
# add the subdirectories
7272
add_subdirectory(src/CSFML)

tools/BuildMacOS.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VERSION="3.0.0"
3+
VERSION="3.0.2"
44
VERSION_C="3.0.0"
55
# BUILD_CSFML=FALSE
66
BUILD_CSFML=TRUE

tools/nuget/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# CSFML NuGet Packages
2+
23
This directory contains all the files needed to build and package the native CSFML libraries for [SFML.Net](github.com/SFML/SFML.Net).
34
**All scripts must be run from the directory they are located in**.
45
That means that your current working directory (`$PWD`) must be the same where the script is.
56

67
All build scripts follow the same routine:
78
1. Clone the SFML repository at `Build/SFML`, if it isn't already there
8-
1. Configure & compile SFML with cmake inside of `Build/(RID)/SFML`, where `(RID)` is the [Runtime Identifier](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog) for the target of the libraries being built
9-
1. Configure & compile CSFML with cmake inside of `Build/(RID)/CSFML`
10-
1. Copy the resulting libraries to `CSFML/runtimes/(RID)/native/`
9+
2. Configure & compile SFML with cmake inside of `Build/(RID)/SFML`, where `(RID)` is the [Runtime Identifier](https://docs.microsoft.com/en-us/dotnet/core/rid-catalog) for the target of the libraries being built
10+
3. Configure & compile CSFML with cmake inside of `Build/(RID)/CSFML`
11+
4. Copy the resulting libraries to `CSFML/runtimes/(RID)/native/`
1112

1213

1314
* `build.win.ps1`
@@ -23,7 +24,7 @@ All build scripts follow the same routine:
2324
Currently supported RIDs are:
2425
* `osx-x64` (uses macOS SDK 10.12)
2526
* `osx.11.0-x64`
26-
* `osx.11.0-arm64` (requires SFML 2.6)
27+
* `osx.11.0-arm64` (requires SFML 2.6+)
2728

2829
* `build.docker.sh`, `build.docker.ps1`
2930
* A script to build the native libraries for a Linux distribution in a Docker container. If no RID is specified as a parameter, all supported RIDs will be built. Currently, the supported RIDs are:
@@ -34,7 +35,7 @@ All build scripts follow the same routine:
3435
* `alpine-x64`
3536
* `debian-x64` (compatible with derivatives such as Ubuntu and Linux Mint)
3637
* `ubuntu-x64`
37-
* `fedora-x64`
38+
* `fedora-x64` (not an official RID anymore)
3839

3940
* `pushnuget.ps1`, `pushnuget.sh`
4041
* A script to automatically build and push the NuGet package to nuget.org. Make sure that all the native libraries are in `CSFML/runtimes/` before running this.

tools/nuget/build.linux.sh

Lines changed: 1 addition & 1 deletion
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="3.0.1" # The branch or tag of the SFML repository to be cloned
45+
SFMLBranch="3.0.2" # The branch or tag of the SFML repository to be cloned
4646
CSFMLDir="$(realpath ../../)" # 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

tools/nuget/build.macos.sh

Lines changed: 1 addition & 1 deletion
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="3.0.1" # The branch or tag of the SFML repository to be cloned
49+
SFMLBranch="3.0.2" # 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

tools/nuget/build.win.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Write-Output "Building $RID"
4343
Write-Output "Using $Generator as the cmake generator"
4444
Write-Output "Using architecture $ArchitectureCMake"
4545

46-
$SFMLBranch = "3.0.1" # The branch or tag of the SFML repository to be cloned
46+
$SFMLBranch = "3.0.2" # The branch or tag of the SFML repository to be cloned
4747
$CSFMLDir = (Get-Item (git rev-parse --show-toplevel)).FullName # The directory of the source code of CSFML
4848

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

0 commit comments

Comments
 (0)