mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-24 13:53:36 +02:00
Update SFML version to 3.0.2
This commit is contained in:
1 parent
603122a631
commit
7b9c1038cd
8 files changed
+25
-12
No files matched your search
@@ -7,7 +7,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
env:
|
env:
|
||||||
SFML_VERSION: 3.0.1
|
SFML_VERSION: 3.0.2
|
||||||
|
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
@@ -109,6 +109,12 @@ jobs:
|
|||||||
runs-on: macos-14
|
runs-on: macos-14
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Get CMake and Ninja
|
||||||
|
uses: lukka/get-cmake@latest
|
||||||
|
with:
|
||||||
|
cmakeVersion: ${{ runner.os == 'Windows' && '3.25' || '3.22' }}
|
||||||
|
ninjaVersion: latest
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: |
|
run: |
|
||||||
brew update
|
brew update
|
||||||
@@ -144,6 +150,12 @@ jobs:
|
|||||||
runs-on: macos-14
|
runs-on: macos-14
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Get CMake and Ninja
|
||||||
|
uses: lukka/get-cmake@latest
|
||||||
|
with:
|
||||||
|
cmakeVersion: ${{ runner.os == 'Windows' && '3.25' || '3.22' }}
|
||||||
|
ninjaVersion: latest
|
||||||
|
|
||||||
- name: Install Doxygen
|
- name: Install Doxygen
|
||||||
run: |
|
run: |
|
||||||
brew update
|
brew update
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
env:
|
env:
|
||||||
SFML_VERSION: 3.0.1
|
SFML_VERSION: 3.0.2
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
windows-x86:
|
windows-x86:
|
||||||
|
|||||||
+1
-1
@@ -66,7 +66,7 @@ endif()
|
|||||||
if(CSFML_BUILD_NETWORK)
|
if(CSFML_BUILD_NETWORK)
|
||||||
list(PREPEND SFML_MODULES "Network")
|
list(PREPEND SFML_MODULES "Network")
|
||||||
endif()
|
endif()
|
||||||
find_package(SFML 3.0.0 COMPONENTS ${SFML_MODULES} REQUIRED)
|
find_package(SFML 3.0 COMPONENTS ${SFML_MODULES} REQUIRED)
|
||||||
|
|
||||||
# add the subdirectories
|
# add the subdirectories
|
||||||
add_subdirectory(src/CSFML)
|
add_subdirectory(src/CSFML)
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
VERSION="3.0.0"
|
VERSION="3.0.2"
|
||||||
VERSION_C="3.0.0"
|
VERSION_C="3.0.0"
|
||||||
# BUILD_CSFML=FALSE
|
# BUILD_CSFML=FALSE
|
||||||
BUILD_CSFML=TRUE
|
BUILD_CSFML=TRUE
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
# CSFML NuGet Packages
|
# CSFML NuGet Packages
|
||||||
|
|
||||||
This directory contains all the files needed to build and package the native CSFML libraries for [SFML.Net](github.com/SFML/SFML.Net).
|
This directory contains all the files needed to build and package the native CSFML libraries for [SFML.Net](github.com/SFML/SFML.Net).
|
||||||
**All scripts must be run from the directory they are located in**.
|
**All scripts must be run from the directory they are located in**.
|
||||||
That means that your current working directory (`$PWD`) must be the same where the script is.
|
That means that your current working directory (`$PWD`) must be the same where the script is.
|
||||||
|
|
||||||
All build scripts follow the same routine:
|
All build scripts follow the same routine:
|
||||||
1. Clone the SFML repository at `Build/SFML`, if it isn't already there
|
1. Clone the SFML repository at `Build/SFML`, if it isn't already there
|
||||||
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
|
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
|
||||||
1. Configure & compile CSFML with cmake inside of `Build/(RID)/CSFML`
|
3. Configure & compile CSFML with cmake inside of `Build/(RID)/CSFML`
|
||||||
1. Copy the resulting libraries to `CSFML/runtimes/(RID)/native/`
|
4. Copy the resulting libraries to `CSFML/runtimes/(RID)/native/`
|
||||||
|
|
||||||
|
|
||||||
* `build.win.ps1`
|
* `build.win.ps1`
|
||||||
@@ -23,7 +24,7 @@ All build scripts follow the same routine:
|
|||||||
Currently supported RIDs are:
|
Currently supported RIDs are:
|
||||||
* `osx-x64` (uses macOS SDK 10.12)
|
* `osx-x64` (uses macOS SDK 10.12)
|
||||||
* `osx.11.0-x64`
|
* `osx.11.0-x64`
|
||||||
* `osx.11.0-arm64` (requires SFML 2.6)
|
* `osx.11.0-arm64` (requires SFML 2.6+)
|
||||||
|
|
||||||
* `build.docker.sh`, `build.docker.ps1`
|
* `build.docker.sh`, `build.docker.ps1`
|
||||||
* 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:
|
* 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:
|
|||||||
* `alpine-x64`
|
* `alpine-x64`
|
||||||
* `debian-x64` (compatible with derivatives such as Ubuntu and Linux Mint)
|
* `debian-x64` (compatible with derivatives such as Ubuntu and Linux Mint)
|
||||||
* `ubuntu-x64`
|
* `ubuntu-x64`
|
||||||
* `fedora-x64`
|
* `fedora-x64` (not an official RID anymore)
|
||||||
|
|
||||||
* `pushnuget.ps1`, `pushnuget.sh`
|
* `pushnuget.ps1`, `pushnuget.sh`
|
||||||
* 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.
|
* 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.
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ echo "Please note that all SFML dependencies must be installed and available to
|
|||||||
|
|
||||||
RID="$1"
|
RID="$1"
|
||||||
|
|
||||||
SFMLBranch="3.0.1" # The branch or tag of the SFML repository to be cloned
|
SFMLBranch="3.0.2" # The branch or tag of the SFML repository to be cloned
|
||||||
CSFMLDir="$(realpath ../../)" # The directory of the source code of CSFML
|
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
|
OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to
|
|||||||
|
|
||||||
RID="$1"
|
RID="$1"
|
||||||
|
|
||||||
SFMLBranch="3.0.1" # The branch or tag of the SFML repository to be cloned
|
SFMLBranch="3.0.2" # 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
|
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
|
OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ Write-Output "Building $RID"
|
|||||||
Write-Output "Using $Generator as the cmake generator"
|
Write-Output "Using $Generator as the cmake generator"
|
||||||
Write-Output "Using architecture $ArchitectureCMake"
|
Write-Output "Using architecture $ArchitectureCMake"
|
||||||
|
|
||||||
$SFMLBranch = "3.0.1" # The branch or tag of the SFML repository to be cloned
|
$SFMLBranch = "3.0.2" # 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
|
$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
|
$OutDir = "./CSFML/runtimes/$RID/native" # The directory of all CSFML modules, used to copy the final dlls
|
||||||
|
|||||||
Reference in new issue
Block a user