Correct macOS rpath reference for vorbisenc

Update macOS image version for CI
Add missing sfSoundBufferRecorder functions inherited from sf::SoundRecorder
2026-10-24 21:53:37 +02:00 · 2025-01-08 14:04:00 +00:00 · 2025-01-08 14:04:00 +00:00 · 2024-09-03 16:49:38 -06:00 · 2024-08-26 09:10:13 -06:00 · 2024-05-19 23:14:45 +02:00
250 changed files with 9930 additions and 2113 deletions
@@ -0,0 +1,67 @@
+name: CI
+
+on: [push, pull_request, workflow_dispatch]
+
+concurrency:
+  group: environment-${{github.ref}}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: ${{ matrix.platform.name }} ${{ matrix.type.name }}
+    runs-on: ${{ matrix.platform.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        - { name: Windows VS2019 x86,  os: windows-2019, flags: -AWin32 }
+        - { name: Windows VS2019 x64,  os: windows-2019, flags: -Ax64 }
+        - { name: Windows VS2022 x86,  os: windows-2022, flags: -AWin32 }
+        - { name: Windows VS2022 x64,  os: windows-2022, flags: -Ax64 }
+        - { name: Windows ClangCL,     os: windows-2022, flags: -T ClangCL }
+        - { name: Windows Clang,       os: windows-2022, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
+        - { name: Linux GCC,           os: ubuntu-22.04, flags: -GNinja }
+        - { name: Linux Clang,         os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
+        - { name: MacOS,               os: macos-13,     flags: -GNinja }
+        type:
+        - { name: Debug }
+        - { name: Release }
+
+    steps:
+    - name: Get CMake and Ninja
+      uses: lukka/get-cmake@latest
+      with:
+        ninjaVersion: latest
+
+    - name: Install Linux Dependencies
+      if: runner.os == 'Linux'
+      run: sudo apt-get update && sudo apt-get install libxrandr-dev libxcursor-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev
+
+    - name: Checkout SFML
+      uses: actions/checkout@v4
+      with:
+        repository: SFML/SFML
+        ref: 2.6.2
+        path: SFML
+
+    - name: Configure SFML CMake
+      shell: bash
+      run: cmake -S $GITHUB_WORKSPACE/SFML -B $GITHUB_WORKSPACE/SFML/build -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/SFML/install -DBUILD_SHARED_LIBS=TRUE -DSFML_BUILD_EXAMPLES=FALSE -DSFML_BUILD_TEST_SUITE=FALSE -DCMAKE_VERBOSE_MAKEFILE=ON ${{matrix.platform.flags}} -DCMAKE_BUILD_TYPE=${{matrix.type.name}}
+
+    - name: Build SFML
+      shell: bash
+      run: cmake --build $GITHUB_WORKSPACE/SFML/build --config ${{matrix.type.name}} --target install
+
+    - name: Checkout CSFML
+      uses: actions/checkout@v4
+      with:
+        path: CSFML
+
+    - name: Configure CSFML CMake
+      shell: bash
+      run: cmake -S $GITHUB_WORKSPACE/CSFML -B $GITHUB_WORKSPACE/CSFML/build -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/CSFML/install -DBUILD_SHARED_LIBS=TRUE -DCSFML_BUILD_EXAMPLES=TRUE -DCSFML_LINK_SFML_STATICALLY=FALSE -DSFML_DIR=$GITHUB_WORKSPACE/SFML/install/lib/cmake/SFML -DCMAKE_VERBOSE_MAKEFILE=ON -DWARNINGS_AS_ERRORS=TRUE ${{matrix.platform.flags}} -DCMAKE_BUILD_TYPE=${{matrix.type.name}}
+
+    - name: Build CSFML
+      shell: bash
+      run: cmake --build $GITHUB_WORKSPACE/CSFML/build --config ${{matrix.type.name}} --target install
@@ -0,0 +1,252 @@
+name: NuGet Release
+
+on:
+    push:
+        branches:
+            - master
+            - 2.6.x
+    workflow_dispatch: {}
+
+concurrency:
+    group: nuget-${{github.ref}}
+    cancel-in-progress: true
+
+env:
+    DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+jobs:
+    windows:
+        name: Windows VS2022
+        runs-on: windows-2022
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build x86
+              shell: pwsh
+              run: |
+                  cd CSFML/tools/nuget
+                  ./build.win.ps1 "win-x86"
+
+            - name: Build x64
+              shell: pwsh
+              run: |
+                  cd CSFML/tools/nuget
+                  ./build.win.ps1 "win-x64"
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-win-x86-x64
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    linux-x64:
+        name: Linux x64
+        runs-on: ubuntu-22.04
+        container:
+            image: ubuntu:22.04
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build
+              shell: bash
+              run: |
+                  cd ./CSFML/tools/nuget
+                  chmod +x ./docker.linux-x64.sh
+                  ./docker.linux-x64.sh
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-linux-x64
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    linux-arm:
+        name: Linux ARM
+        runs-on: ubuntu-22.04
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build in an ARM container
+              uses: uraimo/run-on-arch-action@v2.7.2
+              with:
+                  arch: armv7
+                  distro: ubuntu22.04
+                  githubToken: ${{ github.token }}
+                  dockerRunArgs: |
+                      --volume "${PWD}/CSFML:/CSFML"
+                  install: |
+                      apt-get update -y
+                      apt-get install -y git libfreetype6-dev xorg-dev libxrandr-dev libxcursor-dev libudev-dev libgl1-mesa-dev libflac-dev libogg-dev libvorbis-dev libopenal-dev cmake g++
+                  run: |
+                      cd /CSFML/tools/nuget
+                      chmod +x ./build.linux.sh
+                      ./build.linux.sh linux-arm
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-linux-arm
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    linux-arm64:
+        name: Linux ARM64
+        runs-on: ubuntu-22.04
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build in an ARM64 container
+              uses: uraimo/run-on-arch-action@v2.7.2
+              with:
+                  arch: aarch64
+                  distro: ubuntu22.04
+                  githubToken: ${{ github.token }}
+                  dockerRunArgs: |
+                      --volume "${PWD}/CSFML:/CSFML"
+                  install: |
+                      apt-get update -y
+                      apt-get install -y git libfreetype6-dev xorg-dev libxrandr-dev libxcursor-dev libudev-dev libgl1-mesa-dev libflac-dev libogg-dev libvorbis-dev libopenal-dev cmake g++
+                  run: |
+                      cd /CSFML/tools/nuget
+                      chmod +x ./build.linux.sh
+                      ./build.linux.sh linux-arm64
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-linux-arm64
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    linux-musl-x64:
+        name: Linux MUSL x64
+        runs-on: ubuntu-22.04
+        container:
+            image: alpine:3.15
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build
+              shell: sh
+              run: |
+                  cd ./CSFML/tools/nuget
+                  chmod +x ./docker.linux-musl-x64.sh
+                  ./docker.linux-musl-x64.sh
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-linux-musl-x64
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    fedora-x64:
+        name: Fedora x64
+        runs-on: ubuntu-22.04
+        container:
+            image: fedora:37
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build
+              shell: bash
+              run: |
+                  cd ./CSFML/tools/nuget
+                  chmod +x ./docker.fedora-x64.sh
+                  ./docker.fedora-x64.sh
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-fedora-x64
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    macos:
+        name: macOS
+        runs-on: macos-14
+
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Install necessary tooling
+              run: brew install coreutils
+
+            - name: Build x64
+              run: |
+                  cd CSFML/tools/nuget
+                  ./build.macos.sh "osx-x64"
+
+            - name: Build ARM64
+              run: |
+                  cd CSFML/tools/nuget
+                  ./build.macos.sh "osx-arm64"
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-macOS-x64-arm64
+                  path: CSFML/tools/nuget/CSFML/runtimes
+
+    package:
+        name: Package Builds
+        runs-on: ubuntu-22.04
+        needs:
+            - windows
+            - linux-x64
+            - linux-arm
+            - linux-arm64
+            - linux-musl-x64
+            - fedora-x64
+            - macos
+        steps:
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+            - name: Download Artifacts
+              uses: actions/download-artifact@v4
+              with:
+                  path: CSFML/tools/nuget/CSFML/runtimes
+                  merge-multiple: true
+            - name: Setup .NET 8 SDK
+              id: setup-dotnet
+              uses: actions/setup-dotnet@v4
+              with:
+                  dotnet-version: 8.0.x
+            - name: Enforce SDK Version
+              run: dotnet new globaljson --sdk-version ${{ steps.setup-dotnet.outputs.dotnet-version }} --force
+            - name: Verify SDK Installation
+              run: dotnet --info
+            - name: Build NuGet Package
+              run: |
+                  cd CSFML/tools/nuget
+                  dotnet build --configuration Release --verbosity detailed
+            - name: Upload NuGet Package
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-NuGet-Package
+                  path: CSFML/tools/nuget/CSFML/bin/Release/*.nupkg
@@ -0,0 +1,316 @@
+name: Release Builds
+
+on:
+    push:
+        branches:
+            - master
+            - 2.6.x
+        tags:
+            - "**"
+    workflow_dispatch: {}
+
+concurrency:
+    group: release-${{github.ref}}
+    cancel-in-progress: true
+
+jobs:
+    windows-x86:
+        name: Windows x86
+        runs-on: windows-2022
+
+        steps:
+            - name: Cache MinGW x86
+              id: mingw-x86-cache
+              uses: actions/cache@v4
+              with:
+                  path: ${{ github.workspace }}/mingw32
+                  key: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1-x86
+
+            - name: Install MinGW x86
+              if: steps.mingw-x86-cache.outputs.cache-hit != 'true'
+              uses: bwoodsend/setup-winlibs-action@v1
+              id: winlibs-32
+              with:
+                  tag: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1
+                  with_clang: false
+                  architecture: 32
+                  destination: ${{ github.workspace }}
+                  add_to_path: false
+
+            - name: Checkout SFML
+              uses: actions/checkout@v4
+              with:
+                  repository: SFML/SFML
+                  ref: 2.6.1
+                  path: SFML
+
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build SFML
+              run: |
+                  cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build SFML-build --config Release --target install
+
+            - name: Build CSFML
+              run: |
+                  cmake -S CSFML -B CSFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build CSFML-build --config Release --target install
+            
+            - name: Add MinGW to PATH
+              shell: bash
+              run: echo "${{ github.workspace }}\mingw32\bin" >> $GITHUB_PATH
+
+            - name: Generate Import Libs for MinGW
+              shell: pwsh
+              run: |
+                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\gcc"
+                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\msvc"
+                  Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
+
+                  Push-Location CSFML-install\lib\gcc
+                  & gendef.exe "..\..\bin\csfml-graphics-2.dll"
+                  & dlltool.exe -d "csfml-graphics-2.def" -D "..\..\bin\csfml-graphics-2.dll" -l "libcsfml-graphics.a"
+                  Remove-Item -Path "csfml-graphics-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-window-2.dll"
+                  & dlltool.exe -d "csfml-window-2.def" -D "..\..\bin\bin\csfml-window-2.dll" -l "libcsfml-window.a"
+                  Remove-Item -Path "csfml-window-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-audio-2.dll"
+                  & dlltool.exe -d "csfml-audio-2.def" -D "..\..\bin\bin\csfml-audio-2.dll" -l "libcsfml-audio.a"
+                  Remove-Item -Path "csfml-audio-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-network-2.dll"
+                  & dlltool.exe -d "csfml-network-2.def" -D "..\..\bin\bin\csfml-network-2.dll" -l "libcsfml-network.a"
+                  Remove-Item -Path "csfml-network-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-system-2.dll"
+                  & dlltool.exe -d "csfml-system-2.def" -D "..\..\bin\bin\csfml-system-2.dll" -l "libcsfml-system.a"
+                  Remove-Item -Path "csfml-system-2.def"
+                  Pop-Location
+
+                  New-Item -ItemType "directory" -PATH "install"
+                  Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-windows-32-bit
+                  path: install/CSFML
+
+    windows-x64:
+        name: Windows x64
+        runs-on: windows-2022
+
+        steps:
+            - name: Cache MinGW x64
+              id: mingw-x64-cache
+              uses: actions/cache@v4
+              with:
+                  path: ${{ github.workspace }}/mingw64
+                  key: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1-x64
+
+            - name: Install MinGW x64
+              if: steps.mingw-x64-cache.outputs.cache-hit != 'true'
+              uses: bwoodsend/setup-winlibs-action@v1
+              id: winlibs-64
+              with:
+                  tag: 14.1.0posix-18.1.5-11.0.1-msvcrt-r1
+                  with_clang: false
+                  architecture: 64
+                  destination: ${{ github.workspace }}
+                  add_to_path: false
+
+            - name: Checkout SFML
+              uses: actions/checkout@v4
+              with:
+                  repository: SFML/SFML
+                  ref: 2.6.1
+                  path: SFML
+
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build SFML
+              run: |
+                  cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build SFML-build --config Release --target install
+
+            - name: Build CSFML
+              run: |
+                  cmake -S CSFML -B CSFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build CSFML-build --config Release --target install
+
+            - name: Add MinGW to PATH
+              shell: bash
+              run: echo "${{ github.workspace }}\mingw64\bin" >> $GITHUB_PATH
+
+            - name: Generate Import Libs for MinGW
+              shell: pwsh
+              run: |
+                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\gcc"
+                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\msvc"
+                  Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
+
+                  Push-Location CSFML-install\lib\gcc
+                  & gendef.exe "..\..\bin\csfml-graphics-2.dll"
+                  & dlltool.exe -d "csfml-graphics-2.def" -D "..\..\bin\csfml-graphics-2.dll" -l "libcsfml-graphics.a"
+                  Remove-Item -Path "csfml-graphics-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-window-2.dll"
+                  & dlltool.exe -d "csfml-window-2.def" -D "..\..\bin\bin\csfml-window-2.dll" -l "libcsfml-window.a"
+                  Remove-Item -Path "csfml-window-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-audio-2.dll"
+                  & dlltool.exe -d "csfml-audio-2.def" -D "..\..\bin\bin\csfml-audio-2.dll" -l "libcsfml-audio.a"
+                  Remove-Item -Path "csfml-audio-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-network-2.dll"
+                  & dlltool.exe -d "csfml-network-2.def" -D "..\..\bin\bin\csfml-network-2.dll" -l "libcsfml-network.a"
+                  Remove-Item -Path "csfml-network-2.def"
+                  
+                  & gendef.exe "..\..\bin\csfml-system-2.dll"
+                  & dlltool.exe -d "csfml-system-2.def" -D "..\..\bin\bin\csfml-system-2.dll" -l "libcsfml-system.a"
+                  Remove-Item -Path "csfml-system-2.def"
+                  Pop-Location
+
+                  New-Item -ItemType "directory" -PATH "install"
+                  Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-windows-64-bit
+                  path: install/CSFML
+
+    macos-x64:
+        name: macOS x64
+        runs-on: macos-12
+
+        steps:
+            - name: Checkout SFML
+              uses: actions/checkout@v4
+              with:
+                  repository: SFML/SFML
+                  ref: 2.6.1
+                  path: SFML
+
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+
+            - name: Build SFML
+              run: |
+                  cmake -S SFML -B SFML-build -G "Unix Makefiles" \
+                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
+                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
+                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
+                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
+                        -DBUILD_SHARED_LIBS=TRUE \
+                        -DCMAKE_BUILD_TYPE=Release \
+                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
+                        -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+                        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
+                        -DSFML_BUILD_FRAMEWORKS=TRUE \
+                        -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build SFML-build --config Release --target install
+
+            - name: Build CSFML
+              run: |
+                  cmake -S CSFML -B CSFML-build -G "Unix Makefiles" \
+                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
+                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
+                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
+                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
+                        -DBUILD_SHARED_LIBS=TRUE \
+                        -DCSFML_LINK_SFML_STATICALLY=FALSE \
+                        -DCMAKE_BUILD_TYPE=Release \
+                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
+                        -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+                        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
+                        -DSFML_DIR=${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
+                        -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build CSFML-build --config Release --target install
+
+            - name: Create Archive
+              run: |
+                  mkdir CSFML-macOS-clang-64-bit
+                  cp -R CSFML-install/include CSFML-macOS-clang-64-bit
+                  cp -R CSFML-install/lib CSFML-macOS-clang-64-bit
+                  cp CSFML-install/share/CSFML/* CSFML-macOS-clang-64-bit
+                  tar -zcvf CSFML-macOS-clang-64-bit.tar.gz CSFML-macOS-clang-64-bit
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-macOS-clang-64-bit
+                  path: CSFML-macOS-clang-64-bit.tar.gz
+
+    macos-arm64:
+        name: macOS ARM64
+        runs-on: macos-14
+
+        steps:
+            - name: Checkout SFML
+              uses: actions/checkout@v4
+              with:
+                  repository: SFML/SFML
+                  ref: 2.6.1
+                  path: SFML
+
+            - name: Checkout CSFML
+              uses: actions/checkout@v4
+              with:
+                  path: CSFML
+            - name: Build SFML
+              run: |
+                  cmake -S SFML -B SFML-build -G "Unix Makefiles" \
+                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
+                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
+                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
+                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
+                        -DBUILD_SHARED_LIBS=TRUE \
+                        -DCMAKE_BUILD_TYPE=Release \
+                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install/Library/Frameworks \
+                        -DCMAKE_OSX_ARCHITECTURES=arm64 \
+                        -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
+                        -DSFML_BUILD_FRAMEWORKS=TRUE \
+                        -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build SFML-build --config Release --target install
+
+            - name: Build CSFML
+              run: |
+                  cmake -S CSFML -B CSFML-build -G "Unix Makefiles" \
+                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
+                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
+                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
+                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
+                        -DBUILD_SHARED_LIBS=TRUE \
+                        -DCSFML_LINK_SFML_STATICALLY=FALSE \
+                        -DCMAKE_BUILD_TYPE=Release \
+                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
+                        -DCMAKE_OSX_ARCHITECTURES=arm64 \
+                        -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
+                        -DSFML_DIR=${{ github.workspace }}/SFML-install/Library/Frameworks/SFML.framework/Resources/CMake \
+                        -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake --build CSFML-build --config Release --target install
+
+            - name: Create Archive
+              run: |
+                  mkdir CSFML-macOS-clang-arm64
+                  cp -R CSFML-install/include CSFML-macOS-clang-arm64
+                  cp -R CSFML-install/lib CSFML-macOS-clang-arm64
+                  cp CSFML-install/share/CSFML/* CSFML-macOS-clang-arm64
+                  tar -zcvf CSFML-macOS-clang-arm64.tar.gz CSFML-macOS-clang-arm64
+
+            - name: Upload Artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: CSFML-macOS-clang-arm64
+                  path: CSFML-macOS-clang-arm64.tar.gz
@@ -0,0 +1,45 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Build folders
+build/
+cmake-build-*/
+
+# Cache/IDE folders
+.cache/
+.vscode/
+.idea/
+.vs/
+
+# System files
+.DS_Store
@@ -1,5 +1,4 @@
-
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.7.2)

 # define a macro that helps defining an option
 macro(csfml_set_option var default type docstring)
@@ -14,18 +13,21 @@ endmacro()
 csfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug or Release)")

 # project name
-project(CSFML)
+project(CSFML VERSION 2.6.1)
+
+# we use the paths from the cmake GNUInstallDirs module as defaults
+# you can override these if you like
+# https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
+include(GNUInstallDirs)

 # include the configuration file
-include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/Config.cmake)

-# setup version numbers
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 4)
-set(VERSION_PATCH 0)
-
-# add the CSFML header path
-include_directories(${CMAKE_SOURCE_DIR}/include)
+# add options to select which modules to build
+csfml_set_option(CSFML_BUILD_WINDOW TRUE BOOL "TRUE to build CSFML's Window module. This setting is ignored, if the graphics module is built.")
+csfml_set_option(CSFML_BUILD_GRAPHICS TRUE BOOL "TRUE to build CSFML's Graphics module.")
+csfml_set_option(CSFML_BUILD_AUDIO TRUE BOOL "TRUE to build CSFML's Audio module.")
+csfml_set_option(CSFML_BUILD_NETWORK TRUE BOOL "TRUE to build CSFML's Network module.")

 # add an option for choosing the build type (shared or static)
 csfml_set_option(BUILD_SHARED_LIBS TRUE BOOL "TRUE to build CSFML as shared libraries, FALSE to build it as static libraries")
@@ -34,7 +36,13 @@ csfml_set_option(BUILD_SHARED_LIBS TRUE BOOL "TRUE to build CSFML as shared libr
 csfml_set_option(CSFML_BUILD_DOC FALSE BOOL "TRUE to generate the API documentation, FALSE to ignore it")

 # add an option for linking to sfml either statically or dynamically
-csfml_set_option(CSFML_LINK_SFML_STATICALLY TRUE BOOL "TRUE to link to a static version of SFML, FALSE to link dynamically")
+# default on windows to static and on other platforms to dynamic
+if(SFML_OS_WINDOWS)
+    set(LINK_STATICALLY_DEFAULT TRUE)
+else()
+    set(LINK_STATICALLY_DEFAULT FALSE)
+endif()
+csfml_set_option(CSFML_LINK_SFML_STATICALLY ${LINK_STATICALLY_DEFAULT} BOOL "TRUE to link to a static version of SFML, FALSE to link dynamically")

 # disable the rpath stuff
 set(CMAKE_SKIP_BUILD_RPATH TRUE)
@@ -42,7 +50,7 @@ set(CMAKE_SKIP_BUILD_RPATH TRUE)
 # define an option for choosing between static and dynamic C runtime (Windows only)
 if(SFML_OS_WINDOWS)
    set(STATIC_STD_LIBS FALSE CACHE BOOL "TRUE to statically link to the standard libraries, FALSE to use them as DLLs")
-    
+
    # for VC++, we can apply it globally by modifying the compiler flags
    if(SFML_COMPILER_MSVC AND STATIC_STD_LIBS)
        foreach(flag
@@ -61,10 +69,37 @@ if(CSFML_BUILD_DOC)
    add_subdirectory(doc)
 endif()

+# on Linux and BSD-like OS, install pkg-config files by default
+set(CSFML_INSTALL_PKGCONFIG_DEFAULT FALSE)
+
+if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
+    set(CSFML_INSTALL_PKGCONFIG_DEFAULT TRUE)
+endif()
+
+csfml_set_option(CSFML_INSTALL_PKGCONFIG_FILES ${CSFML_INSTALL_PKGCONFIG_DEFAULT} BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
+
+if(CSFML_INSTALL_PKGCONFIG_FILES)
+    csfml_set_option(CSFML_PKGCONFIG_INSTALL_DIR "${CSFML_PKGCONFIG_DIR}" PATH "Install directory for CSFML's pkg-config .pc files")
+
+    foreach(csfml_module IN ITEMS all system window graphics audio network)
+        configure_file(
+            "tools/pkg-config/csfml-${csfml_module}.pc.in"
+            "tools/pkg-config/csfml-${csfml_module}.pc"
+            @ONLY)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/csfml-${csfml_module}.pc"
+            DESTINATION "${CSFML_PKGCONFIG_INSTALL_DIR}")
+    endforeach()
+endif()
+
 # setup the install rules
-install(DIRECTORY include
-        DESTINATION .
-        COMPONENT devel
-        PATTERN ".svn" EXCLUDE)
-install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})
-install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})
+install(DIRECTORY include/
+        DESTINATION include
+        COMPONENT devel)
+install(FILES license.md DESTINATION ${INSTALL_MISC_DIR})
+install(FILES readme.md DESTINATION ${INSTALL_MISC_DIR})
+
+# add an option for building the examples
+csfml_set_option(CSFML_BUILD_EXAMPLES FALSE BOOL "TRUE to build the CSFML examples, FALSE to ignore them")
+if(CSFML_BUILD_EXAMPLES)
+    add_subdirectory(examples)
+endif()
@@ -0,0 +1,104 @@
+# from here:
+#
+# https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
+
+# Helper function to enable compiler warnings for a specific set of files
+function(set_file_warnings)
+    option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors" FALSE)
+
+    set(MSVC_WARNINGS
+        /W4 # Baseline reasonable warnings
+        /w14242 # 'identifier': conversion from 'type1' to 'type1', possible loss of data
+        /w14254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
+        /w14263 # 'function': member function does not override any base class virtual member function
+        /w14265 # 'classname': class has virtual functions, but destructor is not virtual instances of this class may not be destructed correctly
+        /w14287 # 'operator': unsigned/negative constant mismatch
+        /we4289 # nonstandard extension used: 'variable': loop control variable declared in the for-loop is used outside the for-loop scope
+        /w14296 # 'operator': expression is always 'boolean_value'
+        /w14311 # 'variable': pointer truncation from 'type1' to 'type2'
+        /w14545 # expression before comma evaluates to a function which is missing an argument list
+        /w14546 # function call before comma missing argument list
+        /w14547 # 'operator': operator before comma has no effect; expected operator with side-effect
+        /w14549 # 'operator': operator before comma has no effect; did you intend 'operator'?
+        /w14555 # expression has no effect; expected expression with side- effect
+        /w14619 # pragma warning: there is no warning number 'number'
+        /w14640 # Enable warning on thread un-safe static member initialization
+        /w14826 # Conversion from 'type1' to 'type_2' is sign-extended. This may cause unexpected runtime behavior.
+        /w14905 # wide string literal cast to 'LPSTR'
+        /w14906 # string literal cast to 'LPWSTR'
+        /w14928 # illegal copy-initialization; more than one user-defined conversion has been implicitly applied
+        # /permissive- # standards conformance mode for MSVC compiler. Disabled until all out-of-the-box Windows SDKs can successfully build with it.
+
+        # Disables, remove when appropriate
+        /wd4996 # disable warnings about deprecated functions
+        /wd4068 # disable warnings about unknown pragmas (e.g. #pragma GCC)
+        /wd4505 # disable warnings about unused functions that might be platform-specific
+        /wd4800 # disable warnings regarding implicit conversions to bool
+    )
+
+    set(CLANG_AND_GCC_WARNINGS
+        -Wall
+        -Wextra # reasonable and standard
+        $<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor> # warn the user if a class with virtual functions has a non-virtual destructor. This helps catch hard to track down memory errors
+        -Wcast-align # warn for potential performance problem casts
+        -Wunused # warn on anything being unused
+        $<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual> # warn if you overload (not override) a virtual function
+        -Wconversion # warn on type conversions that may lose data
+        -Wsign-conversion # warn on sign conversions
+        -Wdouble-promotion # warn if float is implicit promoted to double
+        -Wformat=2 # warn on security issues around functions that format output (ie printf)
+        # -Wimplicit-fallthrough # warn when a missing break causes control flow to continue at the next case in a switch statement (disabled until better compiler support for explicit fallthrough is available)
+        -Wnull-dereference # warn if a null dereference is detected
+        $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast> # warn for c-style casts
+        -Wpedantic # warn if non-standard C++ is used
+        -Wno-deprecated-declarations # do not warning about deprecated declarations
+        -Wno-language-extension-token # ignore use of __int64 compiler extension
+    )
+
+    # Disable warnings as errors when using Clang on Windows to work around deprecation warnings in Windows APIs
+    if(SFML_OS_WINDOWS AND (SFML_COMPILER_CLANG OR SFML_COMPILER_CLANG_CL))
+        set(WARNINGS_AS_ERRORS FALSE)
+    endif()
+
+    if(WARNINGS_AS_ERRORS)
+        set(CLANG_AND_GCC_WARNINGS ${CLANG_AND_GCC_WARNINGS} -Werror)
+        set(MSVC_WARNINGS ${MSVC_WARNINGS} /WX)
+    endif()
+
+    set(CLANG_WARNINGS
+        ${CLANG_AND_GCC_WARNINGS}
+        -Wno-unknown-warning-option # do not warn on GCC-specific warning diagnostic pragmas
+        -Wno-c++11-long-long # do not warn on uses of long long
+    )
+
+    set(GCC_WARNINGS
+        ${CLANG_AND_GCC_WARNINGS}
+        -Wmisleading-indentation # warn if indentation implies blocks where blocks do not exist
+        -Wduplicated-cond # warn if if / else chain has duplicated conditions
+        -Wlogical-op # warn about logical operations being used where bitwise were probably wanted
+        # -Wuseless-cast # warn if you perform a cast to the same type (disabled because it is not portable as some typedefs might vary between platforms)
+    )
+
+    # Don't enable -Wduplicated-branches for GCC < 8.1 since it will lead to false positives
+    # https://github.com/gcc-mirror/gcc/commit/6bebae75035889a4844eb4d32a695bebf412bcd7
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1)
+        set(GCC_WARNINGS
+            ${GCC_WARNINGS}
+            -Wduplicated-branches # warn if if / else branches have duplicated code
+        )
+    endif()
+
+    if(MSVC)
+        set(FILE_WARNINGS ${MSVC_WARNINGS})
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
+        set(FILE_WARNINGS ${CLANG_WARNINGS})
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        set(FILE_WARNINGS ${GCC_WARNINGS})
+    else()
+        message(AUTHOR_WARNING "No compiler warnings set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
+    endif()
+
+    foreach(WARNING ${FILE_WARNINGS})
+        set_property(SOURCE ${ARGV} APPEND_STRING PROPERTY COMPILE_FLAGS " ${WARNING}")
+    endforeach()
+endfunction()
@@ -32,39 +32,42 @@ else()
    return()
 endif()

+# set pkgconfig install directory
+# this could be e.g. macports on mac or msys2 on windows etc.
+set(CSFML_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
+if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
+    set(CSFML_PKGCONFIG_DIR "libdata/pkgconfig")
+endif()
+
 # detect the compiler and its version
-# Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true
-# even when CLANG is used, therefore the Clang test is done first
-if(CMAKE_CXX_COMPILER MATCHES ".*clang[+][+]" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-   # CMAKE_CXX_COMPILER_ID is an internal CMake variable subject to change,
-   # but there is no other way to detect CLang at the moment
-   set(SFML_COMPILER_CLANG 1)
-   execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE CLANG_VERSION_OUTPUT)
-   string(REGEX REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" SFML_CLANG_VERSION "${CLANG_VERSION_OUTPUT}")
+# Note: The detection is order is important because:
+# - Visual Studio can both use MSVC and Clang
+# - GNUCXX can still be set on macOS when using Clang
+if(MSVC)
+    set(SFML_COMPILER_MSVC 1)
+
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        set(SFML_COMPILER_CLANG_CL 1)
+    endif()
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(SFML_COMPILER_CLANG 1)
+
+    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE CLANG_VERSION_OUTPUT)
+    string(REGEX REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" SFML_CLANG_VERSION "${CLANG_VERSION_OUTPUT}")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
    set(SFML_COMPILER_GCC 1)
+
    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpversion" OUTPUT_VARIABLE GCC_VERSION_OUTPUT)
    string(REGEX REPLACE "([0-9]+\\.[0-9]+).*" "\\1" SFML_GCC_VERSION "${GCC_VERSION_OUTPUT}")
    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "--version" OUTPUT_VARIABLE GCC_COMPILER_VERSION)
    string(REGEX MATCHALL ".*(tdm[64]*-[1-9]).*" SFML_COMPILER_GCC_TDM "${GCC_COMPILER_VERSION}")
    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-dumpmachine" OUTPUT_VARIABLE GCC_MACHINE)
    string(STRIP "${GCC_MACHINE}" GCC_MACHINE)
-    if(${GCC_MACHINE} MATCHES ".*w64.*")
+
+    if(GCC_MACHINE MATCHES ".*w64.*")
        set(SFML_COMPILER_GCC_W64 1)
    endif()
-elseif(MSVC)
-    set(SFML_COMPILER_MSVC 1)
-    if(MSVC_VERSION EQUAL 1400)
-        set(SFML_MSVC_VERSION 8)
-    elseif(MSVC_VERSION EQUAL 1500)
-        set(SFML_MSVC_VERSION 9)
-    elseif(MSVC_VERSION EQUAL 1600)
-        set(SFML_MSVC_VERSION 10)
-    elseif(MSVC_VERSION EQUAL 1700)
-        set(SFML_MSVC_VERSION 11)
-    elseif(MSVC_VERSION EQUAL 1800)
-        set(SFML_MSVC_VERSION 12)
-    endif()
 else()
    message(FATAL_ERROR "Unsupported compiler")
    return()
@@ -1,4 +1,5 @@
 include(CMakeParseArguments)
+include(${PROJECT_SOURCE_DIR}/cmake/CompilerWarnings.cmake)

 # add a new target which is a CSFML library
 # ex: csfml_add_library(csfml-graphics
@@ -12,6 +13,12 @@ macro(csfml_add_library target)
    # create the target
    add_library(${target} ${THIS_SOURCES})

+    # add the CSFML header path
+    target_include_directories(${target} PUBLIC ${PROJECT_SOURCE_DIR}/include)
+
+    # add warnings
+    set_file_warnings(${THIS_SOURCES})
+
    # define the export symbol of the module
    string(REPLACE "-" "_" NAME_UPPER "${target}")
    string(TOUPPER "${NAME_UPPER}" NAME_UPPER)
@@ -20,7 +27,7 @@ macro(csfml_add_library target)
    if(SFML_OS_WINDOWS)
        # include the major version number in Windows shared library names (but not import library names)
        set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -d)
-        set_target_properties(${target} PROPERTIES SUFFIX "-${VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+        set_target_properties(${target} PROPERTIES SUFFIX "-${PROJECT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
    else()
        set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -d)
    endif()
@@ -32,8 +39,8 @@ macro(csfml_add_library target)
    endif()

    # set the version and soversion of the target (for compatible systems -- mostly Linuxes)
-    set_target_properties(${target} PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR})
-    set_target_properties(${target} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+    set_target_properties(${target} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
+    set_target_properties(${target} PROPERTIES VERSION ${PROJECT_VERSION})

    # set the target's folder (for IDEs that support it, e.g. Visual Studio)
    set_target_properties(${target} PROPERTIES FOLDER "CSFML")
@@ -54,7 +61,7 @@ macro(csfml_add_library target)
    endif()

    # link the target to its external dependencies (C++ SFML libraries)
-    target_link_libraries(${target} ${THIS_DEPENDS})
+    target_link_libraries(${target} PRIVATE ${THIS_DEPENDS})

    # build dylibs
    if(SFML_OS_MACOSX AND BUILD_SHARED_LIBS)
@@ -67,7 +74,7 @@ macro(csfml_add_library target)
    # add the install rule
    install(TARGETS ${target}
            RUNTIME DESTINATION bin COMPONENT bin
-            LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT bin 
+            LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT bin
            ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT devel)

 endmacro()
@@ -3,7 +3,7 @@
 find_package(Doxygen REQUIRED)

 # set the input and output documentation paths
-set(DOXYGEN_INPUT_DIR ${CMAKE_SOURCE_DIR})
+set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR})
 set(DOXYGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/doc)

 # see if we can generate the CHM documentation
@@ -11,10 +11,15 @@ if(SFML_OS_WINDOWS)
    # if HHC is found, we can generate the CHM (compressed HTML) output
    find_program(DOXYGEN_HHC_PROGRAM
                 NAMES hhc.exe
-                 PATHS "c:/Program Files/HTML Help Workshop"
+                 PATHS "C:/Program Files/HTML Help Workshop" "C:/Program Files (x86)/HTML Help Workshop"
                 DOC "HTML Help Compiler program")
    if(DOXYGEN_HHC_PROGRAM)
-        set(DOXYGEN_GENERATE_HTMLHELP YES)
+        if(DOXYGEN_VERSION VERSION_LESS "1.10.0")
+            set(DOXYGEN_GENERATE_HTMLHELP YES)
+        else()
+            message("Due to conflicts with the HTML output settings in Doxygen ${DOXYGEN_VERSION}, the HTML Help generation will be disabled")
+            set(DOXYGEN_GENERATE_HTMLHELP NO)
+        endif()
    else()
        set(DOXYGEN_GENERATE_HTMLHELP NO)
    endif()
@@ -26,9 +31,11 @@ endif()
 # configure the source Doxyfile by copying it and replacing all @variables@
 set(DOXYGEN_CONFIGURED_INPUT ${DOXYGEN_OUTPUT_DIR}/doxyfile)
 configure_file(${DOXYGEN_INPUT_DIR}/doc/doxyfile.in ${DOXYGEN_CONFIGURED_INPUT} @ONLY)
+configure_file(${DOXYGEN_INPUT_DIR}/doc/header.html.in ${DOXYGEN_OUTPUT_DIR}/header.html @ONLY)

 # copy the files needed by the documentation
 configure_file(${DOXYGEN_INPUT_DIR}/doc/doxygen.css ${DOXYGEN_OUTPUT_DIR}/html/doxygen.css COPYONLY)
+configure_file(${DOXYGEN_INPUT_DIR}/doc/searchOverrides.css ${DOXYGEN_OUTPUT_DIR}/html/searchOverrides.css COPYONLY)

 # target setup
 add_custom_target(doc ALL
@@ -41,7 +48,7 @@ add_custom_target(doc ALL
 install(DIRECTORY ${DOXYGEN_OUTPUT_DIR}/html
        DESTINATION ${INSTALL_MISC_DIR}/doc
        COMPONENT doc)
-if(DOXYGEN_HHC_PROGRAM)
+if(DOXYGEN_GENERATE_HTMLHELP)
    install(FILES ${DOXYGEN_OUTPUT_DIR}/CSFML.chm
            DESTINATION ${INSTALL_MISC_DIR}/doc
            COMPONENT doc)
@@ -1,9 +0,0 @@
-        </div>
-        <div id="footer-container">
-            <div id="footer">
-                Copyright © Laurent Gomila &nbsp;::&nbsp;
-                Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
-            </div>
-        </div>
-    </body>
-</html>
@@ -0,0 +1,10 @@
+        </div>
+        <div id="footer-container">
+            <div id="footer">
+                CSFML is licensed under the terms and conditions of the <a href="https://www.sfml-dev.org/license.php">zlib/png license</a>.<br />
+                Copyright &copy; Laurent Gomila &nbsp;::&nbsp;
+                Documentation generated by <a href="https://www.doxygen.nl/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
+            </div>
+        </div>
+    </body>
+</html>
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSFML - C binding of the Simple and Fast Multimedia Library</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-        <!--<link rel='stylesheet' type='text/css' href="http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
-        <link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
-    </head>
-    <body>
-        <div id="banner-container">
-            <div id="banner">
-                <span id="sfml">CSFML</span>
-            </div>
-        </div>
-        <div id="content">
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSFML - C binding of the Simple and Fast Multimedia Library</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+        <!--<link rel='stylesheet' type='text/css' href="http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
+        <link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="dynsections.js"></script>
+        <script type="text/javascript" src="clipboard.js"></script>
+        <script type="text/javascript" src="cookie.js"></script>
+        <link rel="stylesheet" type="text/css" href="search/search.css" />
+        <link rel="stylesheet" type="text/css" href="searchOverrides.css" />
+        <script type="text/javascript" src="search/searchdata.js"></script>
+        <script type="text/javascript" src="search/search.js"></script>
+        <script type="text/javascript">
+        /* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+          $(document).ready(function() { init_search(); });
+        /* @license-end */
+        </script>
+    </head>
+    <body>
+        <div id="banner-container">
+            <div id="banner">
+                <span id="sfml">CSFML @PROJECT_VERSION@</span>
+            </div>
+        </div>
+        <div id="content">
+            <div>
@@ -3,9 +3,9 @@
 ///
 /// \section welcome Welcome
 /// Welcome to the official SFML documentation for C. Here you will find a detailed
-/// view of all the SFML <a href="./globals_func.htm">functions</a>.<br/>
+/// view of all the SFML <a href="./globals_func.html">functions</a>.<br/>
 /// If you are looking for tutorials, you can visit the official website
-/// at <a href="http://www.sfml-dev.org/">www.sfml-dev.org</a>.
+/// at <a href="https://www.sfml-dev.org/">www.sfml-dev.org</a>.
 ///
 /// \section example Short example
 /// Here is a short example, to show you how simple it is to use SFML in C :
@@ -0,0 +1,45 @@
+/* Override search/search.css rules to adjust seach box placement */
+#MSearchBox {
+    position: relative;
+    display: block;
+    border-radius: 0;
+    box-shadow: none;
+    border-width: 1px;
+    border-color: #BBB;
+    border-style: solid;
+}
+.right #MSearchClose {
+    margin: 0;
+    right: auto;
+}
+#MSearchResultsWindow {
+    background-color: #EAF5DB;
+    border-color: #999;
+}
+#MSearchResults > .SRPage {
+    background-color: #EAF5DB;
+}
+a.SRSymbol {
+    color: rgb(70, 100, 30);
+}
+a.SRSymbol:hover {
+    text-decoration: underline;
+}
+a.SRScope {
+    color: rgb(70, 100, 30);
+}
+a.SRScope:hover {
+    text-decoration: underline;
+}
+#MSearchSelectWindow {
+    background-color: #EAF5DB;
+}
+#MSearchSelectWindow > a.SelectItem {
+    color: #333;
+    text-decoration: none;
+}
+#MSearchSelectWindow > a.SelectItem:hover {
+    color: white;
+    background-color: #8CC841;
+    text-decoration: none;
+}
@@ -0,0 +1,5 @@
+set(SRC example.c)
+
+add_executable(example ${SRC})
+target_link_libraries(example PRIVATE csfml-graphics csfml-audio)
+set_file_warnings(${SRC})
@@ -0,0 +1,89 @@
+#include <SFML/Audio.h>
+#include <SFML/Graphics.h>
+
+#include <stdlib.h>
+
+int main(void)
+{
+    // Create the main window
+    const sfVideoMode mode = {800, 600, 32};
+    sfRenderWindow* window = sfRenderWindow_create(mode, "SFML window", sfResize | sfClose, NULL);
+    if (!window)
+        return EXIT_FAILURE;
+
+    // Load a sprite to display
+    sfTexture* texture = sfTexture_createFromFile("sfml_logo.png", NULL);
+    if (!texture)
+    {
+        sfRenderWindow_destroy(window);
+        return EXIT_FAILURE;
+    }
+    sfSprite* sprite = sfSprite_create();
+    sfSprite_setTexture(sprite, texture, sfTrue);
+    const sfVector2f spritePosition = {200, 200};
+    sfSprite_setPosition(sprite, spritePosition);
+
+    // Create a graphical text to display
+    sfFont* font = sfFont_createFromFile("tuffy.ttf");
+    if (!font)
+    {
+        sfSprite_destroy(sprite);
+        sfTexture_destroy(texture);
+        sfRenderWindow_destroy(window);
+        return EXIT_FAILURE;
+    }
+    sfText* text = sfText_create();
+    sfText_setString(text, "Hello, SFML!");
+    sfText_setFont(text, font);
+    sfText_setCharacterSize(text, 50);
+
+    // Load a music to play
+    sfMusic* music = sfMusic_createFromFile("doodle_pop.ogg");
+    if (!music)
+    {
+        sfText_destroy(text);
+        sfFont_destroy(font);
+        sfSprite_destroy(sprite);
+        sfTexture_destroy(texture);
+        sfRenderWindow_destroy(window);
+        return EXIT_FAILURE;
+    }
+
+    // Play the music
+    sfMusic_play(music);
+
+    // Start the game loop
+    sfEvent event;
+    while (sfRenderWindow_isOpen(window))
+    {
+        // Process events
+        while (sfRenderWindow_pollEvent(window, &event))
+        {
+            // Close window : exit
+            if (event.type == sfEvtClosed)
+                sfRenderWindow_close(window);
+        }
+
+        // Clear the screen
+        sfRenderWindow_clear(window, sfBlack);
+
+        // Draw the sprite
+        sfRenderWindow_drawSprite(window, sprite, NULL);
+
+        // Draw the text
+        sfRenderWindow_drawText(window, text, NULL);
+
+        // Update the window
+        sfRenderWindow_display(window);
+    }
+
+    // Cleanup resources
+    sfMusic_destroy(music);
+    sfText_destroy(text);
+    sfFont_destroy(font);
+    sfSprite_destroy(sprite);
+    sfTexture_destroy(texture);
+    sfRenderWindow_destroy(window);
+
+    return EXIT_SUCCESS;
+}
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -68,7 +68,7 @@ CSFML_AUDIO_API void sfListener_setPosition(sfVector3f position);
 /// \return The listener's position
 ///
 ////////////////////////////////////////////////////////////
-CSFML_AUDIO_API sfVector3f sfListener_getPosition();
+CSFML_AUDIO_API sfVector3f sfListener_getPosition(void);

 ////////////////////////////////////////////////////////////
 /// \brief Set the orientation of the forward vector in the scene
@@ -91,7 +91,7 @@ CSFML_AUDIO_API void sfListener_setDirection(sfVector3f direction);
 /// \return Listener's forward vector (not normalized)
 ///
 ////////////////////////////////////////////////////////////
-CSFML_AUDIO_API sfVector3f sfListener_getDirection();
+CSFML_AUDIO_API sfVector3f sfListener_getDirection(void);

 ////////////////////////////////////////////////////////////
 /// \brief Set the upward vector of the listener in the scene
@@ -114,7 +114,7 @@ CSFML_AUDIO_API void sfListener_setUpVector(sfVector3f upVector);
 /// \return Listener's upward vector (not normalized)
 ///
 ////////////////////////////////////////////////////////////
-CSFML_AUDIO_API sfVector3f sfListener_getUpVector();
+CSFML_AUDIO_API sfVector3f sfListener_getUpVector(void);


 #endif // SFML_LISTENER_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -37,13 +37,24 @@
 #include <stddef.h>


+////////////////////////////////////////////////////////////
+/// \brief Structure defining a time range
+///
+////////////////////////////////////////////////////////////
+typedef struct
+{
+    sfTime offset; ///< The beginning offset of the time range
+    sfTime length; ///< The length of the time range
+} sfTimeSpan;
+
+
 ////////////////////////////////////////////////////////////
 /// \brief Create a new music and load it from a file
 ///
 /// This function doesn't start playing the music (call
 /// sfMusic_play to do so).
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param filename Path of the music file to open
@@ -59,7 +70,7 @@ CSFML_AUDIO_API sfMusic* sfMusic_createFromFile(const char* filename);
 /// This function doesn't start playing the music (call
 /// sfMusic_play to do so).
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param data        Pointer to the file data in memory
@@ -76,7 +87,7 @@ CSFML_AUDIO_API sfMusic* sfMusic_createFromMemory(const void* data, size_t sizeI
 /// This function doesn't start playing the music (call
 /// sfMusic_play to do so).
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param stream Source stream to read from
@@ -128,6 +139,45 @@ CSFML_AUDIO_API sfBool sfMusic_getLoop(const sfMusic* music);
 ////////////////////////////////////////////////////////////
 CSFML_AUDIO_API sfTime sfMusic_getDuration(const sfMusic* music);

+////////////////////////////////////////////////////////////
+/// \brief Get the positions of the of the sound's looping sequence
+///
+/// \return Loop Time position class.
+///
+/// \warning Since sfMusic_setLoopPoints() performs some adjustments on the
+/// provided values and rounds them to internal samples, a call to
+/// sfMusic_getLoopPoints() is not guaranteed to return the same times passed
+/// into a previous call to sfMusic_setLoopPoints(). However, it is guaranteed
+/// to return times that will map to the valid internal samples of
+/// this Music if they are later passed to sfMusic_setLoopPoints().
+///
+/// \see setLoopPoints
+///
+////////////////////////////////////////////////////////////
+CSFML_AUDIO_API sfTimeSpan sfMusic_getLoopPoints(const sfMusic* music);
+
+////////////////////////////////////////////////////////////
+/// \brief Sets the beginning and end of the sound's looping sequence using sf::Time
+///
+/// Loop points allow one to specify a pair of positions such that, when the music
+/// is enabled for looping, it will seamlessly seek to the beginning whenever it
+/// encounters the end. Valid ranges for timePoints.offset and timePoints.length are
+/// [0, Dur) and (0, Dur-offset] respectively, where Dur is the value returned by sfMusic_getDuration().
+/// Note that the EOF "loop point" from the end to the beginning of the stream is still honored,
+/// in case the caller seeks to a point after the end of the loop range. This function can be
+/// safely called at any point after a stream is opened, and will be applied to a playing sound
+/// without affecting the current playing offset.
+///
+/// \warning Setting the loop points while the stream's status is Paused
+/// will set its status to Stopped. The playing offset will be unaffected.
+///
+/// \param timePoints The definition of the loop. Can be any time points within the sound's length
+///
+/// \see getLoopPoints
+///
+////////////////////////////////////////////////////////////
+CSFML_AUDIO_API void sfMusic_setLoopPoints(sfMusic* music, sfTimeSpan timePoints);
+
 ////////////////////////////////////////////////////////////
 /// \brief Start or resume playing a music
 ///
@@ -246,7 +296,7 @@ CSFML_AUDIO_API void sfMusic_setVolume(sfMusic* music, float volume);
 ///
 /// \param music    Music object
 /// \param position Position of the music in the scene
-//
+///
 ////////////////////////////////////////////////////////////
 CSFML_AUDIO_API void sfMusic_setPosition(sfMusic* music, sfVector3f position);

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -39,7 +39,7 @@
 /// \brief Create a new sound buffer and load it from a file
 ///
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param filename Path of the sound file to load
@@ -53,7 +53,7 @@ CSFML_AUDIO_API sfSoundBuffer* sfSoundBuffer_createFromFile(const char* filename
 /// \brief Create a new sound buffer and load it from a file in memory
 ///
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param data        Pointer to the file data in memory
@@ -68,7 +68,7 @@ CSFML_AUDIO_API sfSoundBuffer* sfSoundBuffer_createFromMemory(const void* data,
 /// \brief Create a new sound buffer and load it from a custom stream
 ///
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param stream Source stream to read from
@@ -116,7 +116,7 @@ CSFML_AUDIO_API void sfSoundBuffer_destroy(sfSoundBuffer* soundBuffer);
 /// \brief Save a sound buffer to an audio file
 ///
 /// Here is a complete list of all the supported audio formats:
-/// ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,
+/// ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,
 /// w64, mat4, mat5 pvf, htk, sds, avr, sd2, caf, wve, mpc2k, rf64.
 ///
 /// \param soundBuffer Sound buffer object
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -129,5 +129,37 @@ CSFML_AUDIO_API sfBool sfSoundBufferRecorder_setDevice(sfSoundBufferRecorder* so
 ////////////////////////////////////////////////////////////
 CSFML_AUDIO_API const char* sfSoundBufferRecorder_getDevice(sfSoundBufferRecorder* soundBufferRecorder);

+////////////////////////////////////////////////////////////
+/// \brief Set the channel count of the audio capture device
+///
+/// This method allows you to specify the number of channels
+/// used for recording. Currently only 16-bit mono and
+/// 16-bit stereo are supported.
+///
+/// \param soundBufferRecorder Sound buffer recorder object
+/// \param channelCount Number of channels. Currently only
+///                     mono (1) and stereo (2) are supported.
+///
+/// \see sfSoundBufferRecorder_getChannelCount
+///
+////////////////////////////////////////////////////////////
+CSFML_AUDIO_API void sfSoundBufferRecorder_setChannelCount(sfSoundBufferRecorder* soundBufferRecorder,
+                                                           unsigned int           channelCount);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the number of channels used by this recorder
+///
+/// Currently only mono and stereo are supported, so the
+/// value is either 1 (for mono) or 2 (for stereo).
+///
+/// \param soundBufferRecorder Sound buffer recorder object
+///
+/// \return Number of channels
+///
+/// \see sfSoundBufferRecorder_setChannelCount
+///
+////////////////////////////////////////////////////////////
+CSFML_AUDIO_API unsigned int sfSoundBufferRecorder_getChannelCount(const sfSoundBufferRecorder* soundBufferRecorder);
+

 #endif // SFML_SOUNDBUFFERRECORDER_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -135,11 +135,11 @@ CSFML_AUDIO_API sfBool sfSoundRecorder_isAvailable(void);
 CSFML_AUDIO_API void sfSoundRecorder_setProcessingInterval(sfSoundRecorder* soundRecorder, sfTime interval);

 ////////////////////////////////////////////////////////////
-/// \brief Get a list of the names of all availabe audio capture devices
+/// \brief Get a list of the names of all available audio capture devices
 ///
 /// This function returns an array of strings (null terminated),
-/// containing the names of all availabe audio capture devices.
-/// If no devices are available then NULL is returned.
+/// containing the names of all available audio capture devices.
+/// If no devices are available, then NULL is returned.
 ///
 /// \param count Pointer to a variable that will be filled with the number of modes in the array
 ///
@@ -157,7 +157,7 @@ CSFML_AUDIO_API const char** sfSoundRecorder_getAvailableDevices(size_t* count);
 /// \return The name of the default audio capture device (null terminated)
 ///
 ////////////////////////////////////////////////////////////
-CSFML_AUDIO_API const char* sfSoundRecorder_getDefaultDevice();
+CSFML_AUDIO_API const char* sfSoundRecorder_getDefaultDevice(void);

 ////////////////////////////////////////////////////////////
 /// \brief Set the audio capture device
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -30,8 +30,8 @@
 // Define the CSFML version
 ////////////////////////////////////////////////////////////
 #define CSFML_VERSION_MAJOR 2
-#define CSFML_VERSION_MINOR 4
-#define CSFML_VERSION_PATCH 0
+#define CSFML_VERSION_MINOR 6
+#define CSFML_VERSION_PATCH 1


 ////////////////////////////////////////////////////////////
@@ -119,7 +119,7 @@
 //     ...
 // };
 //
-// CSFML_DEPRECATED void globalFunc();
+// CSFML_DEPRECATED void globalFunc(void);
 ////////////////////////////////////////////////////////////
 #if defined(CSFML_NO_DEPRECATED_WARNINGS)

@@ -0,0 +1,74 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_GPUPREFERENCE_H
+#define SFML_GPUPREFERENCE_H
+
+
+////////////////////////////////////////////////////////////
+/// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Config.h>
+
+
+////////////////////////////////////////////////////////////
+/// \file
+///
+/// \brief File containing SFML_DEFINE_DISCRETE_GPU_PREFERENCE
+///
+////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////
+/// \def SFML_DEFINE_DISCRETE_GPU_PREFERENCE
+///
+/// \brief A macro to encourage usage of the discrete GPU
+///
+/// In order to inform the Nvidia/AMD driver that an SFML
+/// application could benefit from using the more powerful
+/// discrete GPU, special symbols have to be publicly
+/// exported from the final executable.
+///
+/// SFML defines a helper macro to easily do this.
+///
+/// Place SFML_DEFINE_DISCRETE_GPU_PREFERENCE in the
+/// global scope of a source file that will be linked into
+/// the final executable. Typically it is best to place it
+/// where the main function is also defined.
+///
+////////////////////////////////////////////////////////////
+#if defined(SFML_SYSTEM_WINDOWS)
+
+    #define SFML_DEFINE_DISCRETE_GPU_PREFERENCE \
+                CSFML_EXTERN_C __declspec(dllexport) unsigned long NvOptimusEnablement = 1; \
+                CSFML_EXTERN_C __declspec(dllexport) unsigned long AmdPowerXpressRequestHighPerformance = 1;
+
+#else
+
+    #define SFML_DEFINE_DISCRETE_GPU_PREFERENCE
+
+#endif
+
+
+#endif // SFML_GPUPREFERENCE_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -53,6 +53,7 @@
 #include <SFML/Graphics/Transformable.h>
 #include <SFML/Graphics/Vertex.h>
 #include <SFML/Graphics/VertexArray.h>
+#include <SFML/Graphics/VertexBuffer.h>
 #include <SFML/Graphics/View.h>


@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -35,7 +35,7 @@
 /// \brief Enumeration of the blending factors
 ///
 ////////////////////////////////////////////////////////////
-typedef enum 
+typedef enum
 {
    sfBlendFactorZero,             ///< (0, 0, 0, 0)
    sfBlendFactorOne,              ///< (1, 1, 1, 1)
@@ -56,9 +56,11 @@ typedef enum
 ////////////////////////////////////////////////////////////
 typedef enum
 {
-    sfBlendEquationAdd,            ///< Pixel = Src * SrcFactor + Dst * DstFactor
-    sfBlendEquationSubtract,       ///< Pixel = Src * SrcFactor - Dst * DstFactor
-    sfBlendEquationReverseSubtract ///< Pixel = Dst * DstFactor - Src * SrcFactor
+    sfBlendEquationAdd,             ///< Pixel = Src * SrcFactor + Dst * DstFactor
+    sfBlendEquationSubtract,        ///< Pixel = Src * SrcFactor - Dst * DstFactor
+    sfBlendEquationReverseSubtract, ///< Pixel = Dst * DstFactor - Src * SrcFactor
+    sfBlendEquationMin,             ///< Pixel = min(Dst, Src)
+    sfBlendEquationMax              ///< Pixel = max(Dst, Src)
 } sfBlendEquation;


@@ -80,6 +82,8 @@ typedef struct
 CSFML_GRAPHICS_API const sfBlendMode sfBlendAlpha;    ///< Blend source and dest according to dest alpha
 CSFML_GRAPHICS_API const sfBlendMode sfBlendAdd;      ///< Add source to dest
 CSFML_GRAPHICS_API const sfBlendMode sfBlendMultiply; ///< Multiply source and dest
+CSFML_GRAPHICS_API const sfBlendMode sfBlendMin;      ///< Take minimum between source and dest
+CSFML_GRAPHICS_API const sfBlendMode sfBlendMax;      ///< Take maximum between source and dest
 CSFML_GRAPHICS_API const sfBlendMode sfBlendNone;     ///< Overwrite dest with source


@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -97,7 +97,26 @@ CSFML_GRAPHICS_API void sfFont_destroy(sfFont* font);
 /// \return The corresponding glyph
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API sfGlyph sfFont_getGlyph(sfFont* font, sfUint32 codePoint, unsigned int characterSize, sfBool bold, float outlineThickness);
+CSFML_GRAPHICS_API sfGlyph sfFont_getGlyph(const sfFont* font, sfUint32 codePoint, unsigned int characterSize, sfBool bold, float outlineThickness);
+
+////////////////////////////////////////////////////////////
+/// \brief Determine if this font has a glyph representing the requested code point
+///
+/// Most fonts only include a very limited selection of glyphs from
+/// specific Unicode subsets, like Latin, Cyrillic, or Asian characters.
+///
+/// While code points without representation will return a font specific
+/// default character, it might be useful to verify whether specific
+/// code points are included to determine whether a font is suited
+/// to display text in a specific language.
+///
+/// \param font      Source font
+/// \param codePoint Unicode code point to check
+///
+/// \return sfTrue if the codepoint has a glyph representation, sfFalse otherwise
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfFont_hasGlyph(const sfFont* font, sfUint32 codePoint);

 ////////////////////////////////////////////////////////////
 /// \brief Get the kerning value corresponding to a given pair of characters in a font
@@ -110,7 +129,20 @@ CSFML_GRAPHICS_API sfGlyph sfFont_getGlyph(sfFont* font, sfUint32 codePoint, uns
 /// \return Kerning offset, in pixels
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API float sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize);
+CSFML_GRAPHICS_API float sfFont_getKerning(const sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the bold kerning value corresponding to a given pair of characters in a font
+///
+/// \param font          Source font
+/// \param first         Unicode code point of the first character
+/// \param second        Unicode code point of the second character
+/// \param characterSize Character size, in pixels
+///
+/// \return Kerning offset, in pixels
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API float sfFont_getBoldKerning(const sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize);

 ////////////////////////////////////////////////////////////
 /// \brief Get the line spacing value
@@ -121,7 +153,7 @@ CSFML_GRAPHICS_API float sfFont_getKerning(sfFont* font, sfUint32 first, sfUint3
 /// \return Line spacing, in pixels
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API float sfFont_getLineSpacing(sfFont* font, unsigned int characterSize);
+CSFML_GRAPHICS_API float sfFont_getLineSpacing(const sfFont* font, unsigned int characterSize);

 ////////////////////////////////////////////////////////////
 /// \brief Get the position of the underline
@@ -135,7 +167,7 @@ CSFML_GRAPHICS_API float sfFont_getLineSpacing(sfFont* font, unsigned int charac
 /// \return Underline position, in pixels
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API float sfFont_getUnderlinePosition(sfFont* font, unsigned int characterSize);
+CSFML_GRAPHICS_API float sfFont_getUnderlinePosition(const sfFont* font, unsigned int characterSize);

 ////////////////////////////////////////////////////////////
 /// \brief Get the thickness of the underline
@@ -148,7 +180,7 @@ CSFML_GRAPHICS_API float sfFont_getUnderlinePosition(sfFont* font, unsigned int
 /// \return Underline thickness, in pixels
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API float sfFont_getUnderlineThickness(sfFont* font, unsigned int characterSize);
+CSFML_GRAPHICS_API float sfFont_getUnderlineThickness(const sfFont* font, unsigned int characterSize);

 ////////////////////////////////////////////////////////////
 /// \brief Get the texture containing the glyphs of a given size in a font
@@ -161,6 +193,35 @@ CSFML_GRAPHICS_API float sfFont_getUnderlineThickness(sfFont* font, unsigned int
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API const sfTexture* sfFont_getTexture(sfFont* font, unsigned int characterSize);

+////////////////////////////////////////////////////////////
+/// \brief Enable or disable the smooth filter
+///
+/// When the filter is activated, the font appears smoother
+/// so that pixels are less noticeable. However if you want
+/// the font to look exactly the same as its source file,
+/// you should disable it.
+/// The smooth filter is enabled by default.
+///
+/// \param font          Source font
+/// \param smooth        sfTrue to enable smoothing, sfFalse to disable it
+///
+/// \see isSmooth
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfFont_setSmooth(sfFont* font, sfBool smooth);
+
+////////////////////////////////////////////////////////////
+/// \brief Tell whether the smooth filter is enabled or disabled
+///
+/// \param font          Source font
+///
+/// \return sfTrue if smoothing is enabled, sfFalse if it is disabled
+///
+/// \see setSmooth
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfFont_isSmooth(const sfFont* font);
+
 ////////////////////////////////////////////////////////////
 /// \brief Get the font information
 ///
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -32,6 +32,7 @@
 #include <SFML/Graphics/Color.h>
 #include <SFML/Graphics/Rect.h>
 #include <SFML/Graphics/Types.h>
+#include <SFML/System/Buffer.h>
 #include <SFML/System/InputStream.h>
 #include <SFML/System/Vector2.h>
 #include <stddef.h>
@@ -156,9 +157,30 @@ CSFML_GRAPHICS_API void sfImage_destroy(sfImage* image);
 ///
 /// \return sfTrue if saving was successful
 ///
+/// \see sfImage_saveToMemory
+///
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfBool sfImage_saveToFile(const sfImage* image, const char* filename);

+////////////////////////////////////////////////////////////
+/// \brief Save the image to a buffer in memory
+///
+/// The format of the image must be specified.
+/// The supported image formats are bmp, png, tga and jpg.
+/// This function fails if the image is empty, or if
+/// the format was invalid.
+///
+/// \param image  Image object
+/// \param output Buffer to fill with encoded data
+/// \param format Encoding format to use
+///
+/// \return sfTrue if saving was successful
+///
+/// \see sfImage_saveToFile
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfImage_saveToMemory(const sfImage* image, sfBuffer* output, const char* format);
+
 ////////////////////////////////////////////////////////////
 /// \brief Return the size of an image
 ///
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -39,7 +39,7 @@
 /// and view.
 ///
 ////////////////////////////////////////////////////////////
-typedef enum 
+typedef enum
 {
    sfPoints,        ///< List of individual points
    sfLines,         ///< List of individual lines
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -30,6 +30,8 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Graphics/Export.h>

+#include <SFML/System/Vector2.h>
+

 ////////////////////////////////////////////////////////////
 /// sfFloatRect and sfIntRect are utility classes for
@@ -77,5 +79,27 @@ CSFML_GRAPHICS_API sfBool sfIntRect_contains(const sfIntRect* rect, int x, int y
 CSFML_GRAPHICS_API sfBool sfFloatRect_intersects(const sfFloatRect* rect1, const sfFloatRect* rect2, sfFloatRect* intersection);
 CSFML_GRAPHICS_API sfBool sfIntRect_intersects(const sfIntRect* rect1, const sfIntRect* rect2, sfIntRect* intersection);

+////////////////////////////////////////////////////////////
+/// \brief Get the position of the rectangle's top-left corner
+///
+/// \return Position of rectangle
+///
+/// \see getSize
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfVector2f sfFloatRect_getPosition(const sfFloatRect* rect);
+CSFML_GRAPHICS_API sfVector2i sfIntRect_getPosition(const sfIntRect* rect);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the size of the rectangle
+///
+/// \return Size of rectangle
+///
+/// \see getPosition
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfVector2f sfFloatRect_getSize(const sfFloatRect* rect);
+CSFML_GRAPHICS_API sfVector2i sfIntRect_getSize(const sfIntRect* rect);
+

 #endif // SFML_RECT_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -381,7 +381,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_setSize(sfRectangleShape* shape, sfVect
 /// \brief Get the size of a rectangle shape
 ///
 /// \param shape Shape object
-//
+///
 /// \return height Size of the rectangle
 ///
 ////////////////////////////////////////////////////////////
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -46,5 +46,10 @@ typedef struct
    const sfShader*  shader;    ///< Shader
 } sfRenderStates;

+////////////////////////////////////////////////////////////
+/// \brief Define the default values for a RenderState
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfRenderStates sfRenderStates_default(void);

 #endif // SFML_RENDERSTATES_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -35,6 +35,7 @@
 #include <SFML/Graphics/PrimitiveType.h>
 #include <SFML/Graphics/RenderStates.h>
 #include <SFML/Graphics/Vertex.h>
+#include <SFML/Window/Window.h>
 #include <SFML/System/Vector2.h>
 #include <stddef.h>

@@ -48,9 +49,24 @@
 ///
 /// \return A new sfRenderTexture object, or NULL if it failed
 ///
+/// \deprecated
+/// Use sfRenderTexture_createWithSettings instead.
+///
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfRenderTexture* sfRenderTexture_create(unsigned int width, unsigned int height, sfBool depthBuffer);

+////////////////////////////////////////////////////////////
+/// \brief Construct a new render texture
+///
+/// \param width    Width of the render texture
+/// \param height   Height of the render texture
+/// \param settings Settings of the render texture
+///
+/// \return A new sfRenderTexture object, or NULL if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfRenderTexture* sfRenderTexture_createWithSettings(unsigned int width, unsigned int height, const sfContextSettings* settings);
+
 ////////////////////////////////////////////////////////////
 /// \brief Destroy an existing render texture
 ///
@@ -69,6 +85,16 @@ CSFML_GRAPHICS_API void sfRenderTexture_destroy(sfRenderTexture* renderTexture);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfVector2u sfRenderTexture_getSize(const sfRenderTexture* renderTexture);

+////////////////////////////////////////////////////////////
+/// \brief Tell if the render texture will use sRGB encoding when drawing on it
+///
+/// \param renderTexture Render texture object
+///
+/// \return sfTrue if the render texture use sRGB encoding, sfFalse otherwise
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfRenderTexture_isSrgb(const sfRenderTexture* renderTexture);
+
 ////////////////////////////////////////////////////////////
 /// \brief Activate or deactivate a render texture as the current target for rendering
 ///
@@ -205,6 +231,21 @@ CSFML_GRAPHICS_API void sfRenderTexture_drawCircleShape(sfRenderTexture* renderT
 CSFML_GRAPHICS_API void sfRenderTexture_drawConvexShape(sfRenderTexture* renderTexture, const sfConvexShape* object, const sfRenderStates* states);
 CSFML_GRAPHICS_API void sfRenderTexture_drawRectangleShape(sfRenderTexture* renderTexture, const sfRectangleShape* object, const sfRenderStates* states);
 CSFML_GRAPHICS_API void sfRenderTexture_drawVertexArray(sfRenderTexture* renderTexture, const sfVertexArray* object, const sfRenderStates* states);
+CSFML_GRAPHICS_API void sfRenderTexture_drawVertexBuffer(sfRenderTexture* renderTexture, const sfVertexBuffer* object, const sfRenderStates* states);
+
+////////////////////////////////////////////////////////////
+/// \brief Draw primitives defined by a vertex buffer.
+///
+/// \param renderTexture render texture object
+/// \param object        Vertex buffer object to draw
+/// \param firstVertex   Index of the first vertex to render
+/// \param vertexCount   Number of vertices to render
+/// \param states        Render states to use for drawing
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfRenderTexture_drawVertexBufferRange(sfRenderTexture* renderTexture,
+                                                              const sfVertexBuffer* object, size_t firstVertex,
+                                                              size_t vertexCount, const sfRenderStates* states);

 ////////////////////////////////////////////////////////////
 /// \brief Draw primitives defined by an array of vertices to a render texture
@@ -278,6 +319,15 @@ CSFML_GRAPHICS_API void sfRenderTexture_resetGLStates(sfRenderTexture* renderTex
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API const sfTexture* sfRenderTexture_getTexture(const sfRenderTexture* renderTexture);

+
+////////////////////////////////////////////////////////////
+/// \brief Get the maximum anti-aliasing level supported by the system
+///
+/// \return The maximum anti-aliasing level supported by the system
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API unsigned int sfRenderTexture_getMaximumAntialiasingLevel(void);
+
 ////////////////////////////////////////////////////////////
 /// \brief Enable or disable the smooth filter on a render texture
 ///
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -161,6 +161,16 @@ CSFML_GRAPHICS_API void sfRenderWindow_setPosition(sfRenderWindow* renderWindow,
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfVector2u sfRenderWindow_getSize(const sfRenderWindow* renderWindow);

+////////////////////////////////////////////////////////////
+/// \brief Tell if the render window will use sRGB encoding when drawing on it
+///
+/// \param renderWindow Render window object
+///
+/// \return sfTrue if the render window use sRGB encoding, sfFalse otherwise
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfRenderWindow_isSrgb(const sfRenderWindow* renderWindow);
+
 ////////////////////////////////////////////////////////////
 /// \brief Change the size of the rendering region of a render window
 ///
@@ -241,6 +251,25 @@ CSFML_GRAPHICS_API void sfRenderWindow_setMouseCursorVisible(sfRenderWindow* ren
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API void sfRenderWindow_setMouseCursorGrabbed(sfRenderWindow* renderWindow, sfBool grabbed);

+////////////////////////////////////////////////////////////
+/// \brief Set the displayed cursor to a native system cursor
+///
+/// Upon window creation, the arrow cursor is used by default.
+///
+/// \warning The cursor must not be destroyed while in use by
+///          the window.
+///
+/// \warning Features related to Cursor are not supported on
+///          iOS and Android.
+///
+/// \param cursor Native system cursor type to display
+///
+/// \see sfCursor_createFromSystem
+/// \see sfCursor_createFromPixels
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfRenderWindow_setMouseCursor(sfRenderWindow* window, const sfCursor* cursor);
+
 ////////////////////////////////////////////////////////////
 /// \brief Enable or disable automatic key-repeat for keydown events
 ///
@@ -445,6 +474,21 @@ CSFML_GRAPHICS_API void sfRenderWindow_drawCircleShape(sfRenderWindow* renderWin
 CSFML_GRAPHICS_API void sfRenderWindow_drawConvexShape(sfRenderWindow* renderWindow, const sfConvexShape* object, const sfRenderStates* states);
 CSFML_GRAPHICS_API void sfRenderWindow_drawRectangleShape(sfRenderWindow* renderWindow, const sfRectangleShape* object, const sfRenderStates* states);
 CSFML_GRAPHICS_API void sfRenderWindow_drawVertexArray(sfRenderWindow* renderWindow, const sfVertexArray* object, const sfRenderStates* states);
+CSFML_GRAPHICS_API void sfRenderWindow_drawVertexBuffer(sfRenderWindow* renderWindow, const sfVertexBuffer* object, const sfRenderStates* states);
+
+////////////////////////////////////////////////////////////
+/// \brief Draw primitives defined by a vertex buffer.
+///
+/// \param renderWindow Render window object
+/// \param object       Vertex buffer object to draw
+/// \param firstVertex  Index of the first vertex to render
+/// \param vertexCount  Number of vertices to render
+/// \param states       Render states to use for drawing
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfRenderWindow_drawVertexBufferRange(sfRenderWindow* renderWindow,
+                                                             const sfVertexBuffer* object, size_t firstVertex,
+                                                             size_t vertexCount, const sfRenderStates* states);

 ////////////////////////////////////////////////////////////
 /// \brief Draw primitives defined by an array of vertices to a render window
@@ -574,5 +618,18 @@ CSFML_GRAPHICS_API void sfMouse_setPositionRenderWindow(sfVector2i position, con
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfVector2i sfTouch_getPositionRenderWindow(unsigned int finger, const sfRenderWindow* relativeTo);

+////////////////////////////////////////////////////////////
+/// \brief Create a Vulkan rendering surface
+///
+/// \param renderWindow RenderWindow object
+/// \param instance     Vulkan instance
+/// \param surface      Created surface
+/// \param allocator    Allocator to use
+///
+/// \return True if surface creation was successful, false otherwise
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfRenderWindow_createVulkanSurface(sfRenderWindow* renderWindow, const VkInstance* instance, VkSurfaceKHR* surface, const VkAllocationCallbacks* allocator);
+

 #endif // SFML_RENDERWINDOW_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -276,6 +276,41 @@ CSFML_GRAPHICS_API void sfText_setFont(sfText* text, const sfFont* font);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API void sfText_setCharacterSize(sfText* text, unsigned int size);

+    ////////////////////////////////////////////////////////////
+/// \brief Set the line spacing factor
+///
+/// The default spacing between lines is defined by the font.
+/// This method enables you to set a factor for the spacing
+/// between lines. By default the line spacing factor is 1.
+///
+/// \param text Text object
+/// \param spacingFactor New line spacing factor
+///
+/// \see sfText_getLineSpacing
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfText_setLineSpacing(sfText* text, float spacingFactor);
+
+////////////////////////////////////////////////////////////
+/// \brief Set the letter spacing factor
+///
+/// The default spacing between letters is defined by the font.
+/// This factor doesn't directly apply to the existing
+/// spacing between each character, it rather adds a fixed
+/// space between them which is calculated from the font
+/// metrics and the character size.
+/// Note that factors below 1 (including negative numbers) bring
+/// characters closer to each other.
+/// By default the letter spacing factor is 1.
+///
+/// \param text Text object
+/// \param spacingFactor New letter spacing factor
+///
+/// \see sfText_getLetterSpacing
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfText_setLetterSpacing(sfText* text, float spacingFactor);
+
 ////////////////////////////////////////////////////////////
 /// \brief Set the style of a text
 ///
@@ -388,6 +423,30 @@ CSFML_GRAPHICS_API const sfFont* sfText_getFont(const sfText* text);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API unsigned int sfText_getCharacterSize(const sfText* text);

+////////////////////////////////////////////////////////////
+/// \brief Get the size of the letter spacing factor
+///
+/// \param text Text object
+///
+/// \return Size of the letter spacing factor
+///
+/// \see sfText_setLetterSpacing
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API float sfText_getLetterSpacing(const sfText* text);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the size of the line spacing factor
+///
+/// \param text Text object
+///
+/// \return Size of the line spacing factor
+///
+/// \see sfText_setLineSpacing
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API float sfText_getLineSpacing(const sfText* text);
+
 ////////////////////////////////////////////////////////////
 /// \brief Get the style of a text
 ///
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -36,6 +36,15 @@
 #include <SFML/System/Vector2.h>
 #include <stddef.h>

+////////////////////////////////////////////////////////////
+/// \brief Types of texture coordinates that can be used for rendering.
+///
+////////////////////////////////////////////////////////////
+typedef enum
+{
+    sfTextureNormalized, ///< sfTexture coordinates in range [0 .. 1].
+    sfTexturePixels      ///< sfTexture coordinates in range [0 .. size].
+} sfTextureCoordinateType;

 ////////////////////////////////////////////////////////////
 /// \brief Create a new texture
@@ -59,6 +68,29 @@ CSFML_GRAPHICS_API sfTexture* sfTexture_create(unsigned int width, unsigned int
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area);

+////////////////////////////////////////////////////////////
+/// \brief Create a new sRGB-enabled texture from a file
+///
+/// When providing texture data from an image file or memory, it can
+/// either be stored in a linear color space or an sRGB color space.
+/// Most digital images account for gamma correction already, so they
+/// would need to be "uncorrected" back to linear color space before
+/// being processed by the hardware. The hardware can automatically
+/// convert it from the sRGB color space to a linear color space when
+/// it gets sampled. When the rendered image gets output to the final
+/// framebuffer, it gets converted back to sRGB.
+///
+/// This load option is only useful in conjunction with an sRGB capable
+/// framebuffer. This can be requested during window creation.
+///
+/// \param filename Path of the image file to load
+/// \param area     Area of the source image to load (NULL to load the entire image)
+///
+/// \return A new sfTexture object, or NULL if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfTexture* sfTexture_createSrgbFromFile(const char* filename, const sfIntRect* area);
+
 ////////////////////////////////////////////////////////////
 /// \brief Create a new texture from a file in memory
 ///
@@ -71,6 +103,18 @@ CSFML_GRAPHICS_API sfTexture* sfTexture_createFromFile(const char* filename, con
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfTexture* sfTexture_createFromMemory(const void* data, size_t sizeInBytes, const sfIntRect* area);

+////////////////////////////////////////////////////////////
+/// \brief Create a new sRGB-enabled texture from a file in memory
+///
+/// \param data        Pointer to the file data in memory
+/// \param sizeInBytes Size of the data to load, in bytes
+/// \param area        Area of the source image to load (NULL to load the entire image)
+///
+/// \return A new sfTexture object, or NULL if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfTexture* sfTexture_createSrgbFromMemory(const void* data, size_t sizeInBytes, const sfIntRect* area);
+
 ////////////////////////////////////////////////////////////
 /// \brief Create a new texture from a custom stream
 ///
@@ -82,6 +126,17 @@ CSFML_GRAPHICS_API sfTexture* sfTexture_createFromMemory(const void* data, size_
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfTexture* sfTexture_createFromStream(sfInputStream* stream, const sfIntRect* area);

+////////////////////////////////////////////////////////////
+/// \brief Create a new sRGB-enabled texture from a custom stream
+///
+/// \param stream Source stream to read from
+/// \param area   Area of the source image to load (NULL to load the entire image)
+///
+/// \return A new sfTexture object, or NULL if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfTexture* sfTexture_createSrgbFromStream(sfInputStream* stream, const sfIntRect* area);
+
 ////////////////////////////////////////////////////////////
 /// \brief Create a new texture from an image
 ///
@@ -93,6 +148,17 @@ CSFML_GRAPHICS_API sfTexture* sfTexture_createFromStream(sfInputStream* stream,
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfTexture* sfTexture_createFromImage(const sfImage* image, const sfIntRect* area);

+////////////////////////////////////////////////////////////
+/// \brief Create a new sRGB-enabled texture from an image
+///
+/// \param image Image to upload to the texture
+/// \param area  Area of the source image to load (NULL to load the entire image)
+///
+/// \return A new sfTexture object, or NULL if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfTexture* sfTexture_createSrgbFromImage(const sfImage* image, const sfIntRect* area);
+
 ////////////////////////////////////////////////////////////
 /// \brief Copy an existing texture
 ///
@@ -144,6 +210,24 @@ CSFML_GRAPHICS_API sfImage* sfTexture_copyToImage(const sfTexture* texture);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API void sfTexture_updateFromPixels(sfTexture* texture, const sfUint8* pixels, unsigned int width, unsigned int height, unsigned int x, unsigned int y);

+////////////////////////////////////////////////////////////
+/// \brief Update a part of this texture from another texture
+///
+/// No additional check is performed on the size of the texture,
+/// passing an invalid combination of texture size and offset
+/// will lead to an undefined behavior.
+///
+/// This function does nothing if either texture was not
+/// previously created.
+///
+/// \param destination Destination texture to copy source texture to
+/// \param source      Source texture to copy to destination texture
+/// \param x           X offset in this texture where to copy the source texture
+/// \param y           Y offset in this texture where to copy the source texture
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfTexture_updateFromTexture(sfTexture* destination, const sfTexture* source, unsigned int x, unsigned int y);
+
 ////////////////////////////////////////////////////////////
 /// \brief Update a texture from an image
 ///
@@ -196,37 +280,15 @@ CSFML_GRAPHICS_API void sfTexture_setSmooth(sfTexture* texture, sfBool smooth);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfBool sfTexture_isSmooth(const sfTexture* texture);

-////////////////////////////////////////////////////////////
-/// \brief Enable or disable conversion from sRGB
-///
-/// When providing texture data from an image file or memory, it can
-/// either be stored in a linear color space or an sRGB color space.
-/// Most digital images account for gamma correction already, so they
-/// would need to be "uncorrected" back to linear color space before
-/// being processed by the hardware. The hardware can automatically
-/// convert it from the sRGB color space to a linear color space when
-/// it gets sampled. When the rendered image gets output to the final
-/// framebuffer, it gets converted back to sRGB.
-///
-/// After enabling or disabling sRGB conversion, make sure to reload
-/// the texture data in order for the setting to take effect.
-///
-/// This option is only useful in conjunction with an sRGB capable
-/// framebuffer. This can be requested during window creation.
-///
-/// \param sRgb True to enable sRGB conversion, false to disable it
-///
-/// \see sfTexture_isSrgb
-///
-////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API void sfTexture_setSrgb(sfTexture* texture, sfBool sRgb);
-
 ////////////////////////////////////////////////////////////
 /// \brief Tell whether the texture source is converted from sRGB or not
 ///
 /// \return True if the texture source is converted from sRGB, false if not
 ///
-/// \see sfTexture_setSrgb
+/// \see sfTexture_createSrgbFromFile
+/// \see sfTexture_createSrgbFromMemory
+/// \see sfTexture_createSrgbFromStream
+/// \see sfTexture_createSrgbFromImage
 ///
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfBool sfTexture_isSrgb(const sfTexture* texture);
@@ -289,6 +351,15 @@ CSFML_GRAPHICS_API sfBool sfTexture_isRepeated(const sfTexture* texture);
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API sfBool sfTexture_generateMipmap(sfTexture* texture);

+////////////////////////////////////////////////////////////
+/// \brief Swap the contents of a texture with those of another
+///
+/// \param left  Instance to swap from
+/// \param right Instance to swap with
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfTexture_swap(sfTexture* left, sfTexture* right);
+
 ////////////////////////////////////////////////////////////
 /// \brief Get the underlying OpenGL handle of the texture.
 ///
@@ -324,7 +395,7 @@ CSFML_GRAPHICS_API unsigned int sfTexture_getNativeHandle(const sfTexture* textu
 /// \param texture Pointer to the texture to bind, can be null to use no texture
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API void sfTexture_bind(const sfTexture* texture);
+CSFML_GRAPHICS_API void sfTexture_bind(const sfTexture* texture, sfTextureCoordinateType type);

 ////////////////////////////////////////////////////////////
 /// \brief Get the maximum texture size allowed
@@ -332,7 +403,7 @@ CSFML_GRAPHICS_API void sfTexture_bind(const sfTexture* texture);
 /// \return Maximum size allowed for textures, in pixels
 ///
 ////////////////////////////////////////////////////////////
-CSFML_GRAPHICS_API unsigned int sfTexture_getMaximumSize();
+CSFML_GRAPHICS_API unsigned int sfTexture_getMaximumSize(void);


 #endif // SFML_TEXTURE_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -206,5 +206,18 @@ CSFML_GRAPHICS_API void sfTransform_scale(sfTransform* transform, float scaleX,
 ////////////////////////////////////////////////////////////
 CSFML_GRAPHICS_API void sfTransform_scaleWithCenter(sfTransform* transform, float scaleX, float scaleY, float centerX, float centerY);

+////////////////////////////////////////////////////////////
+/// \brief Compare two transforms for equality
+///
+/// Performs an element-wise comparison of the elements of the
+/// left transform with the elements of the right transform.
+///
+/// \param left Left operand (the first transform)
+/// \param right Right operand (the second transform)
+///
+/// \return true if the transforms are equal, false otherwise
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfTransform_equal(sfTransform* left, sfTransform* right);

 #endif // SFML_TRANSFORM_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -40,6 +40,7 @@ typedef struct sfText sfText;
 typedef struct sfTexture sfTexture;
 typedef struct sfTransformable sfTransformable;
 typedef struct sfVertexArray sfVertexArray;
+typedef struct sfVertexBuffer sfVertexBuffer;
 typedef struct sfView sfView;


@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -0,0 +1,254 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_VERTEXBUFFER_H
+#define SFML_VERTEXBUFFER_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Graphics/Export.h>
+#include <SFML/Graphics/PrimitiveType.h>
+#include <SFML/Graphics/Types.h>
+#include <SFML/Graphics/Vertex.h>
+#include <stddef.h>
+
+
+////////////////////////////////////////////////////////////
+/// \brief Usage specifiers
+///
+/// If data is going to be updated once or more every frame,
+/// set the usage to sfVertexBufferStream. If data is going
+/// to be set once and used for a long time without being
+/// modified, set the usage to sfVertexBufferUsageStatic.
+/// For everything else sfVertexBufferUsageDynamic should
+/// be a good compromise.
+///
+////////////////////////////////////////////////////////////
+typedef enum
+{
+    sfVertexBufferStream,  ///< Constantly changing data
+    sfVertexBufferDynamic, ///< Occasionally changing data
+    sfVertexBufferStatic   ///< Rarely changing data
+} sfVertexBufferUsage;
+
+////////////////////////////////////////////////////////////
+/// \brief Create a new vertex buffer with a specific
+/// sfPrimitiveType and usage specifier.
+///
+/// Creates the vertex buffer, allocating enough graphcis
+/// memory to hold \p vertexCount vertices, and sets its
+/// primitive type to \p type and usage to \p usage.
+///
+/// \param vertexCount Amount of vertices
+/// \param type Type of primitive
+/// \param usage Usage specifier
+///
+/// \return A new sfVertexBuffer object
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfVertexBuffer* sfVertexBuffer_create(unsigned int vertexCount, sfPrimitiveType type, sfVertexBufferUsage usage);
+
+////////////////////////////////////////////////////////////
+/// \brief Copy an existing vertex buffer
+///
+/// \param vertexBuffer Vertex buffer to copy
+///
+/// \return Copied object
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfVertexBuffer* sfVertexBuffer_copy(const sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Destroy an existing vertex buffer
+///
+/// \param vertexBuffer Vertex buffer to delete
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfVertexBuffer_destroy(sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Return the vertex count
+///
+/// \param vertexBuffer Vertex buffer object
+///
+/// \return Number of vertices in the vertex buffer
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API unsigned int sfVertexBuffer_getVertexCount(const sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Update a part of the buffer from an array of vertices
+///
+/// \p offset is specified as the number of vertices to skip
+/// from the beginning of the buffer.
+///
+/// If \p offset is 0 and \p vertexCount is equal to the size of
+/// the currently created buffer, its whole contents are replaced.
+///
+/// If \p offset is 0 and \p vertexCount is greater than the
+/// size of the currently created buffer, a new buffer is created
+/// containing the vertex data.
+///
+/// If \p offset is 0 and \p vertexCount is less than the size of
+/// the currently created buffer, only the corresponding region
+/// is updated.
+///
+/// If \p offset is not 0 and \p offset + \p vertexCount is greater
+/// than the size of the currently created buffer, the update fails.
+///
+/// No additional check is performed on the size of the vertex
+/// array, passing invalid arguments will lead to undefined
+/// behavior.
+///
+/// \param vertices    Array of vertices to copy to the buffer
+/// \param vertexCount Number of vertices to copy
+/// \param offset      Offset in the buffer to copy to
+///
+/// \return sfTrue if the update was successful
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfVertexBuffer_update(sfVertexBuffer* vertexBuffer, const sfVertex* vertices, unsigned int vertexCount, unsigned int offset);
+
+////////////////////////////////////////////////////////////
+/// \brief Copy the contents of another buffer into this buffer
+///
+/// \param vertexBuffer Vertex buffer object
+/// \param other Vertex buffer whose contents to copy into first vertex buffer
+///
+/// \return sfTrue if the copy was successful
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfVertexBuffer_updateFromVertexBuffer(sfVertexBuffer* vertexBuffer, const sfVertexBuffer* other);
+
+////////////////////////////////////////////////////////////
+/// \brief Swap the contents of this vertex buffer with those of another
+///
+/// \param left Instance to swap
+/// \param right Instance to swap with
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfVertexBuffer_swap(sfVertexBuffer* left, sfVertexBuffer* right);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the underlying OpenGL handle of the vertex buffer.
+///
+/// You shouldn't need to use this function, unless you have
+/// very specific stuff to implement that SFML doesn't support,
+/// or implement a temporary workaround until a bug is fixed.
+///
+/// \return OpenGL handle of the vertex buffer or 0 if not yet created
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API unsigned int sfVertexBuffer_getNativeHandle(sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Set the type of primitives to draw
+///
+/// This function defines how the vertices must be interpreted
+/// when it's time to draw them.
+///
+/// The default primitive type is sf::Points.
+///
+/// \param vertexBuffer Vertex buffer object
+/// \param type Type of primitive
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfVertexBuffer_setPrimitiveType(sfVertexBuffer* vertexBuffer, sfPrimitiveType type);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the type of primitives drawn by the vertex buffer
+///
+/// \param vertexBuffer Vertex buffer object
+///
+/// \return Primitive type
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfPrimitiveType sfVertexBuffer_getPrimitiveType(const sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Set the usage specifier of this vertex buffer
+///
+/// This function provides a hint about how this vertex buffer is
+/// going to be used in terms of data update frequency.
+///
+/// After changing the usage specifier, the vertex buffer has
+/// to be updated with new data for the usage specifier to
+/// take effect.
+///
+/// The default primitive type is sfVertexBufferStream.
+///
+/// \param vertexBuffer Vertex buffer object
+/// \param usage Usage specifier
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfVertexBuffer_setUsage(sfVertexBuffer* vertexBuffer, sfVertexBufferUsage usage);
+
+////////////////////////////////////////////////////////////
+/// \brief Get the usage specifier of this vertex buffer
+///
+/// \param vertexBuffer Vertex buffer object
+///
+/// \return Usage specifier
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfVertexBufferUsage sfVertexBuffer_getUsage(const sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Bind a vertex buffer for rendering
+///
+/// This function is not part of the graphics API, it mustn't be
+/// used when drawing SFML entities. It must be used only if you
+/// mix sfVertexBuffer with OpenGL code.
+///
+/// \code
+/// sfVertexBuffer* vb1, vb2;
+/// ...
+/// sfVertexBuffer_bind(vb1);
+/// // draw OpenGL stuff that use vb1...
+/// sfVertexBuffer_bind(vb2);
+/// // draw OpenGL stuff that use vb2...
+/// sfVertexBuffer_bind(NULL);
+/// // draw OpenGL stuff that use no vertex buffer...
+/// \endcode
+///
+/// \param vertexBuffer Pointer to the vertex buffer to bind, can be null to use no vertex buffer
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API void sfVertexBuffer_bind(const sfVertexBuffer* vertexBuffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Tell whether or not the system supports vertex buffers
+///
+/// This function should always be called before using
+/// the vertex buffer features. If it returns false, then
+/// any attempt to use sf::VertexBuffer will fail.
+///
+/// \return True if vertex buffers are supported, false otherwise
+///
+////////////////////////////////////////////////////////////
+CSFML_GRAPHICS_API sfBool sfVertexBuffer_isAvailable(void);
+
+
+#endif // SFML_VERTEXBUFFER_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -500,11 +500,12 @@ CSFML_NETWORK_API sfFtpResponse* sfFtp_download(sfFtp* ftp, const char* remoteFi
 /// \param localFile  Path of the local file to upload
 /// \param remotePath Where to put to file on the server
 /// \param mode       Transfer mode
+/// \param append     Pass sfTrue to append to or sfFalse to overwrite the remote file if it already exists
 ///
 /// \return Server response to the request
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API sfFtpResponse* sfFtp_upload(sfFtp* ftp, const char* localFile, const char* remotePath, sfFtpTransferMode mode);
+CSFML_NETWORK_API sfFtpResponse* sfFtp_upload(sfFtp* ftp, const char* localFile, const char* remotePath, sfFtpTransferMode mode, sfBool append);

 ////////////////////////////////////////////////////////////
 /// \brief Send a command to the FTP server
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -43,7 +43,7 @@ typedef enum
    sfHttpPost,  ///< Request in post mode, usually to send data to a page
    sfHttpHead,  ///< Request a page's header only
    sfHttpPut,   ///< Request in put mode, useful for a REST API
-    sfHttpDelete ///< Request in delete mode, useful for a REST API 
+    sfHttpDelete ///< Request in delete mode, useful for a REST API
 } sfHttpMethod;


@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -69,6 +69,18 @@ CSFML_NETWORK_API void sfPacket_destroy(sfPacket* packet);
 ////////////////////////////////////////////////////////////
 CSFML_NETWORK_API void sfPacket_append(sfPacket* packet, const void* data, size_t sizeInBytes);

+////////////////////////////////////////////////////////////
+/// \brief Get the current reading position in the packet
+///
+/// The next read operation will read data from this position
+///
+/// \return The byte offset of the current read position
+///
+/// \see append
+///
+////////////////////////////////////////////////////////////
+CSFML_NETWORK_API size_t sfPacket_getReadPosition(const sfPacket* packet);
+
 ////////////////////////////////////////////////////////////
 /// \brief Clear a packet
 ///
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -203,7 +203,7 @@ CSFML_NETWORK_API sfSocketStatus sfUdpSocket_receivePacket(sfUdpSocket* socket,
 /// \return The maximum size of a UDP datagram (message)
 ///
 ////////////////////////////////////////////////////////////
-CSFML_NETWORK_API unsigned int sfUdpSocket_maxDatagramSize();
+CSFML_NETWORK_API unsigned int sfUdpSocket_maxDatagramSize(void);


 #endif // SFML_UDPSOCKET_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -27,14 +27,14 @@


 ////////////////////////////////////////////////////////////
-/// Headers
+// Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Config.h>


 ////////////////////////////////////////////////////////////
-/// This file just includes the OpenGL (GL and GLU) headers,
-/// which have actually different paths on each system
+// This file just includes the OpenGL (GL and GLU) headers,
+// which have actually different paths on each system
 ////////////////////////////////////////////////////////////
 #if defined(CSFML_SYSTEM_WINDOWS)

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -30,6 +30,7 @@
 ////////////////////////////////////////////////////////////

 #include <SFML/Config.h>
+#include <SFML/System/Buffer.h>
 #include <SFML/System/Clock.h>
 #include <SFML/System/InputStream.h>
 #include <SFML/System/Mutex.h>
@@ -0,0 +1,49 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_ALLOC_H
+#define SFML_ALLOC_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Export.h>
+
+
+////////////////////////////////////////////////////////////
+/// \brief Deallocates memory
+///
+/// This function deallocates the memory being pointed to
+/// using the free function from the C standard library.
+/// 
+/// The memory must have been previously allocated using a call
+/// to malloc.
+/// 
+/// \param ptr Pointer to the memory to deallocate 
+///
+////////////////////////////////////////////////////////////
+CSFML_SYSTEM_API void sfFree(void* ptr);
+
+
+#endif // SFML_ALLOC_H
@@ -0,0 +1,73 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_BUFFER_H
+#define SFML_BUFFER_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Export.h>
+#include <SFML/System/Types.h>
+#include <stddef.h>
+
+
+////////////////////////////////////////////////////////////
+/// \brief Create an empty buffer
+///
+/// \return A new sfBuffer object, or NULL if it failed
+///
+////////////////////////////////////////////////////////////
+CSFML_SYSTEM_API sfBuffer* sfBuffer_create(void);
+
+////////////////////////////////////////////////////////////
+/// \brief Destroy an existing buffer
+///
+/// \param buffer Buffer to delete
+///
+////////////////////////////////////////////////////////////
+CSFML_SYSTEM_API void sfBuffer_destroy(sfBuffer* buffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Return the size of a buffer
+///
+/// \param buffer Buffer object
+///
+/// \return Size in bytes
+///
+////////////////////////////////////////////////////////////
+CSFML_SYSTEM_API size_t sfBuffer_getSize(const sfBuffer* buffer);
+
+////////////////////////////////////////////////////////////
+/// \brief Get a read-only pointer to the array of bytes of a buffer
+///
+/// \param buffer Buffer object
+///
+/// \return Read-only pointer to the array of bytes
+///
+////////////////////////////////////////////////////////////
+CSFML_SYSTEM_API const sfUint8* sfBuffer_getData(const sfBuffer* buffer);
+
+
+#endif // SFML_BUFFER_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -41,7 +41,7 @@ typedef struct
 } sfTime;

 ////////////////////////////////////////////////////////////
-/// \brief Predefined "zero" time value 
+/// \brief Predefined "zero" time value
 ///
 ////////////////////////////////////////////////////////////
 CSFML_SYSTEM_API sfTime sfTime_Zero;
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -26,6 +26,7 @@
 #define SFML_SYSTEM_TYPES_H


+typedef struct sfBuffer sfBuffer;
 typedef struct sfClock sfClock;
 typedef struct sfMutex sfMutex;
 typedef struct sfThread sfThread;
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -30,7 +30,9 @@
 ////////////////////////////////////////////////////////////

 #include <SFML/System.h>
+#include <SFML/Window/Clipboard.h>
 #include <SFML/Window/Context.h>
+#include <SFML/Window/Cursor.h>
 #include <SFML/Window/Event.h>
 #include <SFML/Window/Joystick.h>
 #include <SFML/Window/JoystickIdentification.h>
@@ -0,0 +1,85 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_CLIPBOARD_H
+#define SFML_CLIPBOARD_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Window/Export.h>
+#include <SFML/Window/Types.h>
+
+
+////////////////////////////////////////////////////////////
+/// \brief Get the content of the clipboard as string data (returns an ANSI string)
+///
+/// This function returns the content of the clipboard
+/// as a string. If the clipboard does not contain string
+/// it returns an empty string.
+///
+/// \return Clipboard contents as a locale-dependent ANSI string
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API const char* sfClipboard_getString(void);
+
+
+////////////////////////////////////////////////////////////
+/// \brief Get the content of the clipboard as string data (returns a Unicode string)
+///
+/// This function returns the content of the clipboard
+/// as a string. If the clipboard does not contain string
+/// it returns an empty string.
+///
+/// \return Clipboard contents as UTF-32
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API const sfUint32* sfClipboard_getUnicodeString(void);
+
+////////////////////////////////////////////////////////////
+/// \brief Set the content of the clipboard as ANSI string data
+///
+/// This function sets the content of the clipboard as an
+/// ANSI string.
+///
+/// \param text ANSI string containing the data to be sent
+/// to the clipboard
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API void sfClipboard_setString(const char* text);
+
+////////////////////////////////////////////////////////////
+/// \brief Set the content of the clipboard as Unicode string data
+///
+/// This function sets the content of the clipboard as a
+/// Unicode string.
+///
+/// \param text Unicode string containing the data to be sent
+/// to the clipboard
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API void sfClipboard_setUnicodeString(const sfUint32* text);
+
+
+#endif // SFML_CURSOR_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -32,6 +32,8 @@
 #include <SFML/Window/Types.h>
 #include <SFML/Window/Window.h>

+typedef void (*GlFunctionPointer)(void);
+
 ////////////////////////////////////////////////////////////
 /// \brief Create a new context
 ///
@@ -50,6 +52,16 @@ CSFML_WINDOW_API sfContext* sfContext_create(void);
 ////////////////////////////////////////////////////////////
 CSFML_WINDOW_API void sfContext_destroy(sfContext* context);

+////////////////////////////////////////////////////////////
+/// \brief Check whether a given OpenGL extension is available.
+///
+/// \param name Name of the extension to check for
+///
+/// \return True if available, false if unavailable
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfBool sfContext_isExtensionAvailable(const char* name);
+
 ////////////////////////////////////////////////////////////
 /// \brief Activate or deactivate explicitely a context
 ///
@@ -61,9 +73,21 @@ CSFML_WINDOW_API void sfContext_destroy(sfContext* context);
 ////////////////////////////////////////////////////////////
 CSFML_WINDOW_API sfBool sfContext_setActive(sfContext* context, sfBool active);

+////////////////////////////////////////////////////////////
+/// \brief Get the address of an OpenGL function.
+///
+/// \param name Name of the function to get the address of
+///
+/// \return Address of the OpenGL function, 0 on failure
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API GlFunctionPointer sfContext_getFunction(const char* name);
+
 ////////////////////////////////////////////////////////////
 /// \brief Get the settings of the context.
 ///
+/// \param context Context object
+///
 /// Note that these settings may be different than the ones passed to the
 /// constructor; they are indeed adjusted if the original settings are not
 /// directly supported by the system.
@@ -73,4 +97,15 @@ CSFML_WINDOW_API sfBool sfContext_setActive(sfContext* context, sfBool active);
 ////////////////////////////////////////////////////////////
 CSFML_WINDOW_API sfContextSettings sfContext_getSettings(const sfContext* context);

+////////////////////////////////////////////////////////////
+/// \brief Get the currently active context's ID
+///
+/// The context ID is used to identify contexts when
+/// managing unshareable OpenGL resources.
+///
+/// \return The active context's ID or 0 if no context is currently active
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfUint64 sfContext_getActiveContextId(void);
+
 #endif // SFML_CONTEXT_H
@@ -0,0 +1,148 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef SFML_CURSOR_H
+#define SFML_CURSOR_H
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/System/Vector2.h>
+#include <SFML/Window/Export.h>
+#include <SFML/Window/Types.h>
+
+
+////////////////////////////////////////////////////////////
+/// \brief Enumeration of the native system cursor types
+///
+/// Refer to the following table to determine which cursor
+/// is available on which platform.
+///
+///  Type                               | Linux | Mac OS X | Windows
+/// ------------------------------------|:-----:|:--------:|:--------:
+///  sfCursorArrow                  |  yes  |    yes   |   yes
+///  sfCursorArrowWait              |  no   |    no    |   yes
+///  sfCursorWait                   |  yes  |    no    |   yes
+///  sfCursorText                   |  yes  |    yes   |   yes
+///  sfCursorHand                   |  yes  |    yes   |   yes
+///  sfCursorSizeHorizontal         |  yes  |    yes   |   yes
+///  sfCursorSizeVertical           |  yes  |    yes   |   yes
+///  sfCursorSizeTopLeftBottomRight |  no   |    no    |   yes
+///  sfCursorSizeBottomLeftTopRight |  no   |    no    |   yes
+///  sfCursorSizeLeft               |  yes  |    yes   |   yes
+///  sfCursorSizeRight              |  yes  |    yes   |   yes
+///  sfCursorSizeTop                |  yes  |    yes   |   yes
+///  sfCursorSizeBottom             |  yes  |    yes   |   yes
+///  sfCursorSizeTopLeft            |  yes  |    yes   |   yes
+///  sfCursorSizeTopRight           |  yes  |    yes   |   yes
+///  sfCursorSizeBottomLeft         |  yes  |    yes   |   yes
+///  sfCursorSizeBottomRight        |  yes  |    yes   |   yes
+///  sfCursorSizeAll                |  yes  |    no    |   yes
+///  sfCursorCross                  |  yes  |    yes   |   yes
+///  sfCursorHelp                   |  yes  |    no    |   yes
+///  sfCursorNotAllowed             |  yes  |    yes   |   yes
+///
+////////////////////////////////////////////////////////////
+typedef enum
+{
+    sfCursorArrow,                  ///< Arrow cursor (default)
+    sfCursorArrowWait,              ///< Busy arrow cursor
+    sfCursorWait,                   ///< Busy cursor
+    sfCursorText,                   ///< I-beam, cursor when hovering over a field allowing text entry
+    sfCursorHand,                   ///< Pointing hand cursor
+    sfCursorSizeHorizontal,         ///< Horizontal double arrow cursor
+    sfCursorSizeVertical,           ///< Vertical double arrow cursor
+    sfCursorSizeTopLeftBottomRight, ///< Double arrow cursor going from top-left to bottom-right
+    sfCursorSizeBottomLeftTopRight, ///< Double arrow cursor going from bottom-left to top-right
+    sfCursorSizeLeft,               ///< Left arrow cursor on Linux, same as SizeHorizontal on other platforms
+    sfCursorSizeRight,              ///< Right arrow cursor on Linux, same as SizeHorizontal on other platforms
+    sfCursorSizeTop,                ///< Up arrow cursor on Linux, same as SizeVertical on other platforms
+    sfCursorSizeBottom,             ///< Down arrow cursor on Linux, same as SizeVertical on other platforms
+    sfCursorSizeTopLeft,            ///< Top-left arrow cursor on Linux, same as SizeTopLeftBottomRight on other platforms
+    sfCursorSizeBottomRight,        ///< Bottom-right arrow cursor on Linux, same as SizeTopLeftBottomRight on other platforms
+    sfCursorSizeBottomLeft,         ///< Bottom-left arrow cursor on Linux, same as SizeBottomLeftTopRight on other platforms
+    sfCursorSizeTopRight,           ///< Top-right arrow cursor on Linux, same as SizeBottomLeftTopRight on other platforms
+    sfCursorSizeAll,                ///< Combination of SizeHorizontal and SizeVertical
+    sfCursorCross,                  ///< Crosshair cursor
+    sfCursorHelp,                   ///< Help cursor
+    sfCursorNotAllowed              ///< Action not allowed cursor
+} sfCursorType;
+
+
+////////////////////////////////////////////////////////////
+/// \brief Create a cursor with the provided image
+///
+/// \a pixels must be an array of \a width by \a height pixels
+/// in 32-bit RGBA format. If not, this will cause undefined behavior.
+///
+/// If \a pixels is null or either \a width or \a height are 0,
+/// the current cursor is left unchanged and the function will
+/// return false.
+///
+/// In addition to specifying the pixel data, you can also
+/// specify the location of the hotspot of the cursor. The
+/// hotspot is the pixel coordinate within the cursor image
+/// which will be located exactly where the mouse pointer
+/// position is. Any mouse actions that are performed will
+/// return the window/screen location of the hotspot.
+///
+/// \warning On Unix, the pixels are mapped into a monochrome
+///          bitmap: pixels with an alpha channel to 0 are
+///          transparent, black if the RGB channel are close
+///          to zero, and white otherwise.
+///
+/// \param pixels   Array of pixels of the image
+/// \param size     Width and height of the image
+/// \param hotspot  (x,y) location of the hotspot
+/// \return A new sfCursor object
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfCursor* sfCursor_createFromPixels(const sfUint8* pixels, sfVector2u size, sfVector2u hotspot);
+
+
+////////////////////////////////////////////////////////////
+/// \brief Create a native system cursor
+///
+/// Refer to the list of cursor available on each system
+/// (see sfCursorType) to know whether a given cursor is
+/// expected to load successfully or is not supported by
+/// the operating system.
+///
+/// \param type Native system cursor type
+/// \return A new sfCursor object
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfCursor* sfCursor_createFromSystem(sfCursorType type);
+
+
+////////////////////////////////////////////////////////////
+/// \brief Destroy a cursor
+///
+/// \param cursor Cursor to destroy
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API void sfCursor_destroy(sfCursor* cursor);
+
+
+#endif // SFML_CURSOR_H
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -65,7 +65,7 @@ typedef enum
    sfEvtTouchEnded,             ///< A touch event ended (data in event.touch)
    sfEvtSensorChanged,          ///< A sensor value changed (data in event.sensor)

-    sfEvtCount,                  ///< Keep last -- the total number of event types
+    sfEvtCount                   ///< Keep last -- the total number of event types
 } sfEventType;


@@ -77,6 +77,7 @@ typedef struct
 {
    sfEventType type;
    sfKeyCode   code;
+    sfScancode  scancode;
    sfBool      alt;
    sfBool      control;
    sfBool      shift;
@@ -121,7 +122,7 @@ typedef struct
 ///
 /// \deprecated
 /// Use sfMouseWheelScrollEvent instead.
-/// 
+///
 ////////////////////////////////////////////////////////////
 typedef struct CSFML_DEPRECATED
 {
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -34,6 +34,10 @@
 ////////////////////////////////////////////////////////////
 /// \brief Key codes
 ///
+/// The enumerators refer to the "localized" key; i.e. depending
+/// on the layout set by the operating system, a key can be mapped
+/// to `Y` or `Z`.
+///
 ////////////////////////////////////////////////////////////
 typedef enum
 {
@@ -78,26 +82,26 @@ typedef enum
    sfKeyLControl,     ///< The left Control key
    sfKeyLShift,       ///< The left Shift key
    sfKeyLAlt,         ///< The left Alt key
-    sfKeyLSystem,      ///< The left OS specific key: window (Windows and Linux), apple (MacOS X), ...
+    sfKeyLSystem,      ///< The left OS specific key: window (Windows and Linux), apple (macOS), ...
    sfKeyRControl,     ///< The right Control key
    sfKeyRShift,       ///< The right Shift key
    sfKeyRAlt,         ///< The right Alt key
-    sfKeyRSystem,      ///< The right OS specific key: window (Windows and Linux), apple (MacOS X), ...
+    sfKeyRSystem,      ///< The right OS specific key: window (Windows and Linux), apple (macOS), ...
    sfKeyMenu,         ///< The Menu key
    sfKeyLBracket,     ///< The [ key
    sfKeyRBracket,     ///< The ] key
-    sfKeySemiColon,    ///< The ; key
+    sfKeySemicolon,    ///< The ; key
    sfKeyComma,        ///< The , key
    sfKeyPeriod,       ///< The . key
-    sfKeyQuote,        ///< The ' key
+    sfKeyApostrophe,   ///< The ' key
    sfKeySlash,        ///< The / key
-    sfKeyBackSlash,    ///< The \ key
-    sfKeyTilde,        ///< The ~ key
+    sfKeyBackslash,    ///< The \ key
+    sfKeyGrave,        ///< The ` key
    sfKeyEqual,        ///< The = key
-    sfKeyDash,         ///< The - key
+    sfKeyHyphen,       ///< The - key (hyphen)
    sfKeySpace,        ///< The Space key
-    sfKeyReturn,       ///< The Return key
-    sfKeyBack,         ///< The Backspace key
+    sfKeyEnter,        ///< The Enter/Return key
+    sfKeyBackspace,    ///< The Backspace key
    sfKeyTab,          ///< The Tabulation key
    sfKeyPageUp,       ///< The Page up key
    sfKeyPageDown,     ///< The Page down key
@@ -105,10 +109,10 @@ typedef enum
    sfKeyHome,         ///< The Home key
    sfKeyInsert,       ///< The Insert key
    sfKeyDelete,       ///< The Delete key
-    sfKeyAdd,          ///< +
-    sfKeySubtract,     ///< -
-    sfKeyMultiply,     ///< *
-    sfKeyDivide,       ///< /
+    sfKeyAdd,          ///< The + key
+    sfKeySubtract,     ///< The - key (minus, usually from numpad)
+    sfKeyMultiply,     ///< The * key
+    sfKeyDivide,       ///< The / key
    sfKeyLeft,         ///< Left arrow
    sfKeyRight,        ///< Right arrow
    sfKeyUp,           ///< Up arrow
@@ -140,10 +144,188 @@ typedef enum
    sfKeyF15,          ///< The F15 key
    sfKeyPause,        ///< The Pause key

-    sfKeyCount      ///< Keep last -- the total number of keyboard keys
+    sfKeyCount,      ///< Keep last -- the total number of keyboard keys
+
+    // Deprecated values:
+
+    sfKeyTilde     = sfKeyGrave,     ///< \deprecated Use Grave instead
+    sfKeyDash      = sfKeyHyphen,    ///< \deprecated Use Hyphen instead
+    sfKeyBack      = sfKeyBackspace, ///< \deprecated Use Backspace instead
+    sfKeyBackSlash = sfKeyBackslash, ///< \deprecated Use Backslash instead
+    sfKeySemiColon = sfKeySemicolon, ///< \deprecated Use Semicolon instead
+    sfKeyReturn    = sfKeyEnter,     ///< \deprecated Use Enter instead
+    sfKeyQuote     = sfKeyApostrophe ///< \deprecated Use Apostrophe instead
 } sfKeyCode;


+////////////////////////////////////////////////////////////
+/// \brief Scancodes
+///
+/// The enumerators are bound to a physical key and do not depend on
+/// the keyboard layout used by the operating system. Usually, the AT-101
+/// keyboard can be used as reference for the physical position of the keys.
+///
+////////////////////////////////////////////////////////////
+typedef enum
+{
+    sfScanUnknown = -1,       //!< Represents any scancode not present in this enum
+    sfScanA = 0,              //!< Keyboard a and A key
+    sfScanB,                  //!< Keyboard b and B key
+    sfScanC,                  //!< Keyboard c and C key
+    sfScanD,                  //!< Keyboard d and D key
+    sfScanE,                  //!< Keyboard e and E key
+    sfScanF,                  //!< Keyboard f and F key
+    sfScanG,                  //!< Keyboard g and G key
+    sfScanH,                  //!< Keyboard h and H key
+    sfScanI,                  //!< Keyboard i and I key
+    sfScanJ,                  //!< Keyboard j and J key
+    sfScanK,                  //!< Keyboard k and K key
+    sfScanL,                  //!< Keyboard l and L key
+    sfScanM,                  //!< Keyboard m and M key
+    sfScanN,                  //!< Keyboard n and N key
+    sfScanO,                  //!< Keyboard o and O key
+    sfScanP,                  //!< Keyboard p and P key
+    sfScanQ,                  //!< Keyboard q and Q key
+    sfScanR,                  //!< Keyboard r and R key
+    sfScanS,                  //!< Keyboard s and S key
+    sfScanT,                  //!< Keyboard t and T key
+    sfScanU,                  //!< Keyboard u and U key
+    sfScanV,                  //!< Keyboard v and V key
+    sfScanW,                  //!< Keyboard w and W key
+    sfScanX,                  //!< Keyboard x and X key
+    sfScanY,                  //!< Keyboard y and Y key
+    sfScanZ,                  //!< Keyboard z and Z key
+    sfScanNum1,               //!< Keyboard 1 and ! key
+    sfScanNum2,               //!< Keyboard 2 and @ key
+    sfScanNum3,               //!< Keyboard 3 and # key
+    sfScanNum4,               //!< Keyboard 4 and $ key
+    sfScanNum5,               //!< Keyboard 5 and % key
+    sfScanNum6,               //!< Keyboard 6 and ^ key
+    sfScanNum7,               //!< Keyboard 7 and & key
+    sfScanNum8,               //!< Keyboard 8 and * key
+    sfScanNum9,               //!< Keyboard 9 and ) key
+    sfScanNum0,               //!< Keyboard 0 and ) key
+    sfScanEnter,              //!< Keyboard Enter/Return key
+    sfScanEscape,             //!< Keyboard Escape key
+    sfScanBackspace,          //!< Keyboard Backspace key
+    sfScanTab,                //!< Keyboard Tab key
+    sfScanSpace,              //!< Keyboard Space key
+    sfScanHyphen,             //!< Keyboard - and _ key
+    sfScanEqual,              //!< Keyboard = and +
+    sfScanLBracket,           //!< Keyboard [ and { key
+    sfScanRBracket,           //!< Keyboard ] and } key
+    // For US keyboards mapped to key 29 (Microsoft Keyboard Scan Code Specification)
+    // For Non-US keyboards mapped to key 42 (Microsoft Keyboard Scan Code Specification)
+    // Typical language mappings: Belg:£µ` FrCa:<>} Dan:*' Dutch:`´ Fren:µ* Ger:'# Ital:§ù LatAm:[}` Nor:*@ Span:ç} Swed:*' Swiss:$£} UK:~# Brazil:}]
+    sfScanBackslash,          //!< Keyboard \ and | key OR various keys for Non-US keyboards
+    sfScanSemicolon,          //!< Keyboard ; and : key
+    sfScanApostrophe,         //!< Keyboard ' and " key
+    sfScanGrave,              //!< Keyboard ` and ~ key
+    sfScanComma,              //!< Keyboard , and < key
+    sfScanPeriod,             //!< Keyboard . and > key
+    sfScanSlash,              //!< Keyboard / and ? key
+    sfScanF1,                 //!< Keyboard F1 key
+    sfScanF2,                 //!< Keyboard F2 key
+    sfScanF3,                 //!< Keyboard F3 key
+    sfScanF4,                 //!< Keyboard F4 key
+    sfScanF5,                 //!< Keyboard F5 key
+    sfScanF6,                 //!< Keyboard F6 key
+    sfScanF7,                 //!< Keyboard F7 key
+    sfScanF8,                 //!< Keyboard F8 key
+    sfScanF9,                 //!< Keyboard F9 key
+    sfScanF10,                //!< Keyboard F10 key
+    sfScanF11,                //!< Keyboard F11 key
+    sfScanF12,                //!< Keyboard F12 key
+    sfScanF13,                //!< Keyboard F13 key
+    sfScanF14,                //!< Keyboard F14 key
+    sfScanF15,                //!< Keyboard F15 key
+    sfScanF16,                //!< Keyboard F16 key
+    sfScanF17,                //!< Keyboard F17 key
+    sfScanF18,                //!< Keyboard F18 key
+    sfScanF19,                //!< Keyboard F19 key
+    sfScanF20,                //!< Keyboard F20 key
+    sfScanF21,                //!< Keyboard F21 key
+    sfScanF22,                //!< Keyboard F22 key
+    sfScanF23,                //!< Keyboard F23 key
+    sfScanF24,                //!< Keyboard F24 key
+    sfScanCapsLock,           //!< Keyboard Caps %Lock key
+    sfScanPrintScreen,        //!< Keyboard Print Screen key
+    sfScanScrollLock,         //!< Keyboard Scroll %Lock key
+    sfScanPause,              //!< Keyboard Pause key
+    sfScanInsert,             //!< Keyboard Insert key
+    sfScanHome,               //!< Keyboard Home key
+    sfScanPageUp,             //!< Keyboard Page Up key
+    sfScanDelete,             //!< Keyboard Delete Forward key
+    sfScanEnd,                //!< Keyboard End key
+    sfScanPageDown,           //!< Keyboard Page Down key
+    sfScanRight,              //!< Keyboard Right Arrow key
+    sfScanLeft,               //!< Keyboard Left Arrow key
+    sfScanDown,               //!< Keyboard Down Arrow key
+    sfScanUp,                 //!< Keyboard Up Arrow key
+    sfScanNumLock,            //!< Keypad Num %Lock and Clear key
+    sfScanNumpadDivide,       //!< Keypad / key
+    sfScanNumpadMultiply,     //!< Keypad * key
+    sfScanNumpadMinus,        //!< Keypad - key
+    sfScanNumpadPlus,         //!< Keypad + key
+    sfScanNumpadEqual,        //!< keypad = key
+    sfScanNumpadEnter,        //!< Keypad Enter/Return key
+    sfScanNumpadDecimal,      //!< Keypad . and Delete key
+    sfScanNumpad1,            //!< Keypad 1 and End key
+    sfScanNumpad2,            //!< Keypad 2 and Down Arrow key
+    sfScanNumpad3,            //!< Keypad 3 and Page Down key
+    sfScanNumpad4,            //!< Keypad 4 and Left Arrow key
+    sfScanNumpad5,            //!< Keypad 5 key
+    sfScanNumpad6,            //!< Keypad 6 and Right Arrow key
+    sfScanNumpad7,            //!< Keypad 7 and Home key
+    sfScanNumpad8,            //!< Keypad 8 and Up Arrow key
+    sfScanNumpad9,            //!< Keypad 9 and Page Up key
+    sfScanNumpad0,            //!< Keypad 0 and Insert key
+    // For US keyboards doesn't exist
+    // For Non-US keyboards mapped to key 45 (Microsoft Keyboard Scan Code Specification)
+    // Typical language mappings: Belg:<\> FrCa:«°» Dan:<\> Dutch:]|[ Fren:<> Ger:<|> Ital:<> LatAm:<> Nor:<> Span:<> Swed:<|> Swiss:<\> UK:\| Brazil: \|.
+    sfScanNonUsBackslash,     //!< Keyboard Non-US \ and | key
+    sfScanApplication,        //!< Keyboard Application key
+    sfScanExecute,            //!< Keyboard Execute key
+    sfScanModeChange,         //!< Keyboard Mode Change key
+    sfScanHelp,               //!< Keyboard Help key
+    sfScanMenu,               //!< Keyboard Menu key
+    sfScanSelect,             //!< Keyboard Select key
+    sfScanRedo,               //!< Keyboard Redo key
+    sfScanUndo,               //!< Keyboard Undo key
+    sfScanCut,                //!< Keyboard Cut key
+    sfScanCopy,               //!< Keyboard Copy key
+    sfScanPaste,              //!< Keyboard Paste key
+    sfScanVolumeMute,         //!< Keyboard Volume Mute key
+    sfScanVolumeUp,           //!< Keyboard Volume Up key
+    sfScanVolumeDown,         //!< Keyboard Volume Down key
+    sfScanMediaPlayPause,     //!< Keyboard Media Play Pause key
+    sfScanMediaStop,          //!< Keyboard Media Stop key
+    sfScanMediaNextTrack,     //!< Keyboard Media Next Track key
+    sfScanMediaPreviousTrack, //!< Keyboard Media Previous Track key
+    sfScanLControl,           //!< Keyboard Left Control key
+    sfScanLShift,             //!< Keyboard Left Shift key
+    sfScanLAlt,               //!< Keyboard Left Alt key
+    sfScanLSystem,            //!< Keyboard Left System key
+    sfScanRControl,           //!< Keyboard Right Control key
+    sfScanRShift,             //!< Keyboard Right Shift key
+    sfScanRAlt,               //!< Keyboard Right Alt key
+    sfScanRSystem,            //!< Keyboard Right System key
+    sfScanBack,               //!< Keyboard Back key
+    sfScanForward,            //!< Keyboard Forward key
+    sfScanRefresh,            //!< Keyboard Refresh key
+    sfScanStop,               //!< Keyboard Stop key
+    sfScanSearch,             //!< Keyboard Search key
+    sfScanFavorites,          //!< Keyboard Favorites key
+    sfScanHomePage,           //!< Keyboard Home Page key
+    sfScanLaunchApplication1, //!< Keyboard Launch Application 1 key
+    sfScanLaunchApplication2, //!< Keyboard Launch Application 2 key
+    sfScanLaunchMail,         //!< Keyboard Launch Mail key
+    sfScanLaunchMediaSelect,  //!< Keyboard Launch Media Select key
+
+    sfScancodeCount           //!< Keep last -- the total number of scancodes
+} sfScancode;
+
+
 ////////////////////////////////////////////////////////////
 /// \brief Check if a key is pressed
 ///
@@ -151,15 +333,85 @@ typedef enum
 ///
 /// \return sfTrue if the key is pressed, sfFalse otherwise
 ///
+/// \see sfKeyboard_isScancodePressed
+///
 ////////////////////////////////////////////////////////////
 CSFML_WINDOW_API sfBool sfKeyboard_isKeyPressed(sfKeyCode key);

+////////////////////////////////////////////////////////////
+/// \brief Check if a key is pressed
+///
+/// \param code Scancode to check
+///
+/// \return sfTrue if the physical key is pressed, sfFalse otherwise
+///
+/// \see sfKeyboard_isKeyPressed
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfBool sfKeyboard_isScancodePressed(sfScancode code);
+
+////////////////////////////////////////////////////////////
+/// \brief Localize a physical key to a logical one
+///
+/// \param code Scancode to localize
+///
+/// \return The key corresponding to the scancode under the current
+///         keyboard layout used by the operating system, or
+///         sfKeyUnknown when the scancode cannot be mapped
+///         to a Key.
+///
+/// \see sfKeyboard_delocalize
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfKeyCode sfKeyboard_localize(sfScancode code);
+
+////////////////////////////////////////////////////////////
+/// \brief Identify the physical key corresponding to a logical one
+///
+/// \param key Key to "delocalize"
+///
+/// \return The scancode corresponding to the key under the current
+///         keyboard layout used by the operating system, or
+///         sfScanUnknown when the key cannot be mapped
+///         to a sfScancode.
+///
+/// \see sfKeyboard_localize
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfScancode sfKeyboard_delocalize(sfKeyCode key);
+
+////////////////////////////////////////////////////////////
+/// \brief Provide a string representation for a given scancode
+///
+/// The returned string is a short, non-technical description of
+/// the key represented with the given scancode. Most effectively
+/// used in user interfaces, as the description for the key takes
+/// the users keyboard layout into consideration.
+///
+/// \warning The result is OS-dependent: for example, sfScanLSystem
+///          is "Left Meta" on Linux, "Left Windows" on Windows and
+///          "Left Command" on macOS.
+///
+/// The current keyboard layout set by the operating system is used to
+/// interpret the scancode: for example, sfKeySemicolon is
+/// mapped to ";" for layout and to "é" for others.
+///
+/// The returned const char* owns the string and must be freed to
+/// avoid memory leaks.
+///
+/// \param code Scancode to describe
+///
+/// \return The localized description of the code
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API const char* sfKeyboard_getDescription(sfScancode code);
+
 ////////////////////////////////////////////////////////////
 /// \brief Show or hide the virtual keyboard.
 ///
-/// Warning: the virtual keyboard is not supported on all systems.
-/// It will typically be implemented on mobile OSes (Android, iOS)
-/// but not on desktop OSes (Windows, Linux, ...).
+/// \warning The virtual keyboard is not supported on all
+///          systems. It will typically be implemented on mobile OSes
+///          (Android, iOS) but not on desktop OSes (Windows, Linux, ...).
 ///
 /// If the virtual keyboard is not available, this function does nothing.
 ///
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////
 //
 // SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2024 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
 // In no event will the authors be held liable for any damages arising from the use of this software.
@@ -94,5 +94,30 @@ CSFML_WINDOW_API sfVector2i sfMouse_getPosition(const sfWindow* relativeTo);
 ////////////////////////////////////////////////////////////
 CSFML_WINDOW_API void sfMouse_setPosition(sfVector2i position, const sfWindow* relativeTo);

+////////////////////////////////////////////////////////////
+/// \brief Get the current position of the mouse relative to a window base
+///
+/// This function returns the current position of the mouse
+/// cursor relative to the given window base, or desktop if NULL is passed.
+///
+/// \param relativeTo Reference window
+///
+/// \return Position of the mouse cursor, relative to the given window base
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API sfVector2i sfMouse_getPositionWindowBase(const sfWindowBase* relativeTo);
+
+////////////////////////////////////////////////////////////
+/// \brief Set the current position of the mouse relative to a window base
+///
+/// This function sets the current position of the mouse
+/// cursor relative to the given window base, or desktop if NULL is passed.
+///
+/// \param position   New position of the mouse
+/// \param relativeTo Reference window
+///
+////////////////////////////////////////////////////////////
+CSFML_WINDOW_API void sfMouse_setPositionWindowBase(sfVector2i position, const sfWindowBase* relativeTo);
+

 #endif // SFML_MOUSE_H
Author	SHA1	Message	Date
Lukas Dürrenberger	72c1979aed	Correct macOS rpath reference for vorbisenc	2025-01-08 14:04:00 +00:00
Lukas Dürrenberger	4f75550692	Update macOS image version for CI	2025-01-08 14:04:00 +00:00
Chris Thrasher	fb9fb941b4	Add missing `sfSoundBufferRecorder` functions inherited from `sf::SoundRecorder` Backport of `34febc214f`	2024-09-03 16:49:38 -06:00
Biswapriyo Nath	58b6342d1b	CMake: Fix installing HTML Help with newer Doxygen version HTML Help generation was disabled for doxygen version greater than 1.10.0 in `df75efa78d` commit.	2024-08-26 09:10:13 -06:00
Lukas Dürrenberger	e153a8a4ce	Update CSFML version to 2.6.1	2024-05-19 23:14:45 +02:00
Lukas Dürrenberger	17f42be80c	Update copyright year to 2024	2024-05-19 23:14:45 +02:00
Lukas Dürrenberger	586fb28b9d	Create release packages automatically	2024-05-19 22:51:57 +02:00
Lukas Dürrenberger	46ce1943b7	Remove unnecessary duplicated native libs	2024-05-18 23:26:01 +02:00
Lukas Dürrenberger	71c3fea199	Add build props for netstandard2.0	2024-05-18 23:26:01 +02:00
Lukas Dürrenberger	714e95a56e	Add missing window module	2024-05-18 23:26:01 +02:00
Lukas Dürrenberger	a9cdb1ad4d	Use v4 checkout action	2024-05-18 15:44:02 +02:00
Lukas Dürrenberger	7fd47811cb	Add GitHub Actions workflow for NuGet release	2024-05-18 15:44:02 +02:00
Lukas Dürrenberger	2ec9764ac4	Add options to select the modules to build	2024-05-18 15:44:02 +02:00
kimci86	8c02b89a93	Fix link to functions page on documentation mainpage	2024-05-09 09:44:20 +02:00
kimci86	3c0f1aebec	Update icons urls and color	2024-05-09 09:44:20 +02:00
kimci86	8e81e6223d	Configure doxygen STRIP_FROM_INC_PATH option so that include directives are correct in the generated documentation.	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	933cb6d67a	Make the new doxygen clipboard feature work and look good	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	d31809042b	Fix search.js "Uncaught ReferenceError: Cookie is not defined"	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	30a5cd508a	Add CSFML version to the documentation	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	7c88140df2	Fix XHTML Doxygen docs inconsistencies	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	d43e93eb81	Fix outdated URLs	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	d1a8cfb861	Add search support in the doxygen docs	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	428bddade9	Fix missing function documentation	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	f8a6d27b27	Update doxygen input file for doxygen 1.10.0	2024-05-09 09:44:20 +02:00
Lukas Dürrenberger	df75efa78d	Fix configuration conflict in doxygen 1.10.0	2024-05-09 09:44:20 +02:00
Miron Alexandru	e0589c302b	Implement missing functions	2024-03-09 20:29:30 -07:00
kimci86	16ae40d383	Include GNUInstallDirs to define CMAKE_INSTALL_LIBDIR The variable CMAKE_INSTALL_LIBDIR is used to define CSFML_PKGCONFIG_DIR variable in cmake/Config.cmake file. Copy-pasted from SFML's CMakeLists.txt file.	2024-02-25 22:15:31 +01:00
kimci86	ad9edb0256	Use relative install path for pkgconfig files It is recommended in CMake's official documentation to use relative path for DESTINATION parameter. Using absolute paths do not work with the cmake --install command's --prefix option.	2024-02-25 22:15:31 +01:00
Bruno Van de Velde	0f4b9a4383	Added sfFont_hasGlyph	2024-02-19 16:20:12 +01:00
mgrojo	8074b3a004	Minor fixes of the documentation - Parameter names not matching the actual code identifier - Typo in SoundRecorder.h - Missing param in Context.h	2024-02-14 22:11:56 +00:00
Manuelandkimci86	b7826c5f9a	Add count parameter to sfVulkan_getGraphicsRequiredInstanceExtensions Based on `sfSoundRecorder_getAvailableDevices()` Fixes #227 Co-authored-by: kimci86 <kimci86@hotmail.fr>	2024-02-14 12:07:24 -07:00
Lukas Dürrenberger	fb9b3aeab7	Update CSFML to 2.6.0	2024-02-04 13:43:43 +01:00
Chris Thrasher	160e764c4c	Use custom fixed width integer typedef in Vulkan.h	2024-01-28 20:16:05 +01:00
Lukas Dürrenberger	dfa5fbf92d	Enable x86 builds for Visual Studio	2024-01-28 20:16:05 +01:00
Chris Thrasher	b1d02ce571	Use `sf::err()` for error logging	2023-12-29 12:32:02 -06:00
kimci86	0601d5fa8d	Do not pass C++ warning options to C compiler	2023-12-21 16:17:17 -06:00
Chris Thrasher	5ccbbdf61b	Remove unnecessary file install exclusion	2023-12-21 14:39:18 -06:00
Chris Thrasher	83b44e3feb	Install contents of include/ instead of include/ itself	2023-12-21 14:39:18 -06:00
Chris Thrasher	1c4aba1d43	Always specify link visibility	2023-12-21 14:39:18 -06:00
Chris Thrasher	9a355d784b	Remove trailing whitespace	2023-12-21 14:39:18 -06:00
Chris Thrasher	4f540b9cbb	Replace tabs with spaces	2023-12-21 14:39:18 -06:00
Chris Thrasher	b231c6c269	Disable warning about using a compiler extension	2023-12-20 17:22:04 -06:00
Chris Thrasher	e92cc49459	Fix MSVC warning	2023-12-20 17:22:04 -06:00
Chris Thrasher	3e24bb1dc9	Enable manually running CI pipelines	2023-12-20 17:22:04 -06:00
Chris Thrasher	b8a63eb73d	Automatically disable stale pipelines	2023-12-20 17:22:04 -06:00
Chris Thrasher	bba0bf3726	Test Debug and Release builds in CI	2023-12-20 17:22:04 -06:00
Chris Thrasher	bf29112d56	Add example program	2023-12-20 15:33:35 -06:00
Chris Thrasher	843deb2f6b	Use `(void)` for function prototypes with no parameters This is required when compiling these headers as C code. These were omitted becuase before the addition of examples these headers were only compiled locally as C++ files where adding the void keyword is not needed.	2023-12-20 15:33:35 -06:00
Lukas Dürrenberger	76c1e643fa	Disable treating warning as errors by default	2023-12-20 02:13:31 +01:00
Lukas Dürrenberger	a7e7ea4ccf	Fix Vulkan type declaration	2023-12-20 01:34:56 +01:00
Chris Thrasher	e2401417ef	Add API for `sf::WindowBase`	2023-11-19 13:23:39 +01:00
Chris Thrasher	d90cd6f5ee	Use specific versions of CI images	2023-11-02 09:44:00 +01:00
Chris Thrasher	509d4f2cec	Remove redundant option	2023-11-02 09:44:00 +01:00
Chris Thrasher	49310cd5a6	Use Ninja in more CI jobs	2023-11-02 09:44:00 +01:00
Chris Thrasher	3a1ea97cb4	Remove faulty MinGW job	2023-11-02 09:44:00 +01:00
Chris Thrasher	072a4680be	Install Ninja and minimum CMake version in CI	2023-11-02 09:44:00 +01:00
Chris Thrasher	0eec0f8ec9	Revert "Disable faulty Windows Clang job" This reverts commit `37b809b296`.	2023-11-02 09:44:00 +01:00
kimci86andChris Thrasher	725811baa9	Implement `sf::Image::saveToMemory` https://github.com/SFML/SFML/pull/1669 Co-authored-by: Chris Thrasher <chrisjthrasher@gmail.com>	2023-09-09 23:36:24 +02:00
kimci86	39dd578d45	Add sfBuffer structure to wrap a vector of bytes	2023-09-09 23:36:24 +02:00
Chris Thrasher	37b809b296	Disable faulty Windows Clang job The problem is that the Windows CI image hasn't yet be updated to Clang 16. See this PR for progress on fixing it https://github.com/actions/runner-images/pull/8134 This has been merged but we still have to wait for the changes to propogate to all runners.	2023-09-06 17:58:20 -06:00
mgrojo	a80542d67d	Update `\see` documentation with the new `sfTexture_createSrgb` functions Delete reference to deleted `sfTexture_setSrgb` See #177	2023-08-07 12:36:07 +01:00
Chris Thrasher	a3657e112a	Add Windows MinGW CI job	2023-07-08 16:08:01 -06:00
Chris Thrasher	7d7375556c	Add Windows Clang CI job	2023-07-08 16:08:01 -06:00
Chris Thrasher	c97c71951c	Add Windows ClangCL CI job	2023-07-08 16:08:01 -06:00
Chris Thrasher	81c7fb1a26	Build as non-superuser on macOS	2023-07-08 16:08:01 -06:00
Chris Thrasher	b63eddd4cd	Fix potential string truncation error	2023-07-08 11:01:11 -06:00
Chris Thrasher	d536b3d2cc	Use SFML 2.6's set of compiler warnings Some minor tweaks were made to remove Android-specific workarounds that CSFML doesn't need and removing a few warnings that are not feasible to fix at the moment.	2023-07-08 11:01:11 -06:00
kimci86	e8776bc80d	Keyboard documentation fixes	2023-07-07 22:18:31 +02:00
Chris Thrasher	920ff4d072	Implement `isSrgb()` https://github.com/SFML/SFML/pull/1757	2023-07-07 00:33:01 -06:00
Chris Thrasher	1d56c6ed0f	Implement scancodes https://github.com/SFML/SFML/pull/1235	2023-07-07 00:32:18 -06:00
Chris Thrasher	2a20bc7209	Implement `sf::Vulkan` functions https://github.com/SFML/SFML/pull/1557	2023-07-06 15:57:23 -06:00
Shane Whitmire	df0040791e	Implement fetching bold kerning C doesn't have function overloading, so I had to resort to function name signature changes to resemble overloading. I think this is an ok way to do this	2023-07-04 14:49:45 -06:00
Chris Thrasher	cc8c7fc4de	Implement directional arrow resize cursors https://github.com/SFML/SFML/pull/1688	2023-07-04 14:46:53 -06:00
Chris Thrasher	7e2f6d4af8	Document MP3 support	2023-07-04 14:46:44 -06:00
Chris Thrasher	4c15108233	Implement `sf::Rect<T>::getPosition()` and `sf::Rect<T>::getSize()`	2023-07-04 13:09:46 -06:00
Chris Thrasher	1667644e3d	Implement min and max blend modes https://github.com/SFML/SFML/pull/1756	2023-07-03 15:55:02 -06:00
Corentin Noël	6476e9442e	Add pkg-config files, optionally installed by CMake on Linux builds The modules provided are: - csfml-system - csfml-graphics - csfml-window - csfml-audio - csfml-network - csfml-all (depends on all the above modules) They are installed to the standard location for pkg-config files on Linux. This is adapted from SFML own pkg-config files.	2023-06-27 12:59:34 +02:00
Corentin Noël	a05be24b48	Require SFML 2.6 It is technically already the case since commits `e606b52c39` and `7d2ebaf265`	2023-06-27 12:38:59 +02:00
Shane Whitmire	7d2ebaf265	PR 1641 Added method to get the current read position of sf::Packet	2023-06-26 21:20:24 +02:00
Shane Whitmire	e606b52c39	PR 1690 Add font enable / disable smoothing Also added a check for whether the font is smoothing	2023-06-26 21:20:24 +02:00
Shane Whitmire	7cbcd8f9fa	Update ci.yml to indicate we are on 2.6.0	2023-06-26 21:20:24 +02:00
Lukas Dürrenberger	d270e9a513	Update CSFML version to 2.5.2	2023-06-09 19:48:52 +02:00
Lukas Dürrenberger	fe8145e750	Update NuGet tooling - Add officially supported RID for Linux and macOS - Ensure reproducible builds with fixed image versions - Add additional dependencies - Add dirty workaround (for now) for macOS builds	2023-06-09 19:48:52 +02:00
Chris Thrasher	39d7c47f04	Ensure public header path gets propagated to downstream targets	2023-04-19 07:57:03 +02:00
Chris Thrasher	be2714672b	Require at least SFML 2.5.0	2023-02-21 00:00:23 +01:00
Chris Thrasher	ccc159b3d9	Remove unused `SFML_MSVC_VERSION` variable	2023-02-21 00:00:23 +01:00
Chris Thrasher	3a88df2c38	Match SFML 2.6.0's CMake version requirement	2023-02-21 00:00:23 +01:00
Chris Thrasher	fbf4b000ef	Use built-in project version variables	2023-02-21 00:00:23 +01:00
Chris Thrasher	356eeb3ae6	Use SFML's .gitignore file	2023-02-21 00:00:23 +01:00
Lukas Dürrenberger	a2418218a6	Update copyright year	2023-02-18 11:13:43 +01:00
Noé Lopez	ac4f02c4ac	Add function for default RenderState (#178 )	2023-02-18 10:56:48 +01:00
Noé Lopez	371d2ca1e7	Fix matrix comparison in sfTransform_equal	2023-02-18 10:51:19 +01:00
Noé Lopez	4c3997e7a2	Add missing parenthese in readme	2023-01-03 18:30:34 +01:00
EnokViking	e40235ffb0	Add functions for creating sRGB enabled textures from file, memory, etc. (#177 ) * Add functions for creating sRGB enabled textures from file / memory / stream / image * Remove unused functions * Remove redundant sfTexture_createFromFile declaration	2022-12-25 22:47:16 +01:00
Luhrel	8d14b53047	Implements sfContext_getFunction	2022-10-27 22:11:25 +02:00
Luhrel	47cf45ad54	Rename `_drawVertexBufferWithIndex` to `_drawVertexBufferRange` & Implements `sfRender[Window/Texture]_drawVertexBufferWithIndex`	2022-10-27 22:11:25 +02:00
Luhrel	30dbf80507	Implements sfTextureCoordinateType with sfTexture_bind	2022-10-27 22:11:25 +02:00
Luhrel	c27917ebf9	Implements sfContext_isExtensionAvailable	2022-10-27 22:11:25 +02:00
Luhrel	0c79d19b48	Added missing statement with sfShader_createFromX We can now call sfShader_createFromFile/Memory/Stream with only a geometry file/memory/stream.	2022-10-27 22:11:25 +02:00
Lukas Dürrenberger	1402537900	Update SFML GitHub URL in build scripts	2022-10-27 21:54:06 +02:00
Lukas Dürrenberger	aa13651a03	Update CI pipeline options	2022-10-27 21:54:06 +02:00
brightprogrammer	980a165dc9	Use CMAKE_SOURCE_DIR instead of PROJECT_SOURCE_DIR Change minimum CMake version	2022-03-17 08:58:01 +01:00
crumblingstatue	317f58fa31	Make sure CallbackStream doesn't get destroyed before the Music Music's destructor call's stop(), which in turn calls onSeek. For CSFML, this requires the CallbackStream to stay alive until that point. In C++, destructors for fields are called in reverse declaration order. We swap the order of the fields, putting the Music after the CallbackStream, so it gets destroyed before it.	2021-08-02 23:54:39 +02:00
Lukas Dürrenberger	1d05e82f25	Use Markdown for the readme and license files	2021-07-13 09:00:43 +02:00
Lukas Dürrenberger	c5a37aed84	Add build scripts for macOS and Windows	2021-07-11 22:37:39 +02:00
Lukas Dürrenberger	f84ff413a1	Update CSFML version to 2.5.1 - Add macOS build script - Update existing nuget build script	2021-07-11 16:54:41 +02:00
Davipb	76671cf453	Change 'net' TFM to 'netframework'	2021-05-12 00:55:16 +02:00
Davipb	ea8048376f	Add icon on package	2021-03-01 15:19:41 +01:00
Davipb	063923308f	Add build error for AnyCPU on .NET Framework	2021-03-01 15:19:41 +01:00
Lukas Dürrenberger	99cea94aaf	Add GitHub actions for Windows, Linux and macOS	2021-02-19 20:48:44 +01:00
Jairard@Windows	ffb5763206	Fix compilation and add check in sfTexture_updateFromTexture	2019-11-22 13:26:00 +01:00
asumface	0f8209fade	Remove stray semicolon	2019-11-22 12:53:20 +01:00
DemoXin	7627ef1c5d	Implement sfTexture_updateFromTexture Method was declared, but not implemented. Also corrects an EntryPointNotFound exception in SFML.NET	2019-07-17 17:51:29 +02:00
crumblingstatue	cdc9bc6a21	Fix incorrect sfRenderTexture_createWithSettings header signature	2019-07-17 16:05:43 +02:00
Laurent Gomila	282621e499	Merge pull request #139 from DJMaster/patch-1 Update RenderTexture.h	2019-03-23 18:35:41 +01:00
DJMaster	1c75ff0546	Update RenderTexture.h CSFML_GRAPHICS_API is missing	2019-03-23 18:22:42 +01:00
Davipb	d6f3ec2f34	Fix $OutDir vestiges	2019-01-23 22:59:18 +01:00
Davipb	b189a4e168	Fix Windows script for non-existing runtimes folder	2019-01-23 22:59:18 +01:00
Davipb	d8e19e74ed	Add NuGet package tools	2019-01-23 22:59:18 +01:00
Lukas Dürrenberger	61f17e3c1d	Merge pull request #130 from DemoXinMC/master sfText_getLineSpacing is not properly declared in Text.h	2018-11-19 21:24:58 +01:00
Demo Xin	93c8f8ee21	* Corrected Text.h getLineSpacing to the proper name sfText_getLineSpacing	2018-11-10 09:08:40 -05:00
Zachariah Brown	bff4a69a73	Fixed an issue where it was impossible to link against static SFML libs on non Windows platforms	2018-10-06 20:46:13 +02:00
Lukas Dürrenberger	3b41d938f9	Merge pull request #128 from SFML/bugfix/doc_gen Update the doxygen file and made adjustments for the latest doxygen version	2018-08-20 08:40:04 +02:00
Lukas Dürrenberger	05847516fd	Merge pull request #127 from spacechase0/update-2.5.0 Update for SFML 2.5.0	2018-08-20 08:38:28 +02:00
spacechase0	eb4a9cfe1d	Update copyright year	2018-06-05 14:05:52 -04:00
spacechase0	7ef69e3b1c	Update for 2.5.0	2018-06-05 14:05:52 -04:00
Lukas Dürrenberger	643abd95ea	Update the doxygen file and made adjustments for the latest doxygen version	2018-06-02 12:09:45 +02:00
Laurent Gomila	75f95202b7	Merge pull request #123 from DJMaster/master Comments fixed	2017-08-28 06:22:29 +02:00
DJMaster	fed0b38279	Comments fixed	2017-08-27 19:49:18 +02:00
Laurent Gomila	55e03e92be	Merge pull request #122 from crumblingstatue/font-missing-const Add missing const qualifiers to sfFont methods	2017-03-11 11:53:07 +01:00
Mika Attila	b4163081ba	Add missing const qualifiers to sfFont methods	2017-03-11 11:42:07 +01:00