diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dce3336..85d97d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: - 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 diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake index 1d92d09..91e8ac4 100644 --- a/cmake/Macros.cmake +++ b/cmake/Macros.cmake @@ -74,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() diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index adac83a..082a168 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/SFML/Graphics/Font.cpp @@ -172,7 +172,7 @@ sfBool sfFont_isSmooth(const sfFont *font) { if (font->This.isSmooth()) { - return sfTrue; + return sfTrue; } return sfFalse; diff --git a/tools/GenerateImportLibraries.ps1 b/tools/GenerateImportLibraries.ps1 index a890584..cb4b9fa 100644 --- a/tools/GenerateImportLibraries.ps1 +++ b/tools/GenerateImportLibraries.ps1 @@ -17,10 +17,10 @@ Function Create-ImportLib([string]$architecture) Move-Item -Path "lib\*.lib" -Destination "lib\msvc" $patharch = If($architecture -eq "x64") { "64" } Else { "32" } - + $oldpath = $env:Path $env:Path += ";C:\tools\mingw$patharch\bin\" - + Push-Location "lib\gcc" Convert-DLL("csfml-graphics") Convert-DLL("csfml-window") diff --git a/tools/nuget/build.docker.ps1 b/tools/nuget/build.docker.ps1 index 403fe41..de8e3b9 100644 --- a/tools/nuget/build.docker.ps1 +++ b/tools/nuget/build.docker.ps1 @@ -18,39 +18,39 @@ $Image = $null $Shell = $null switch ($RID) { - 'alpine-x64' { - $Image = 'alpine:3.7' + 'alpine-x64' { + $Image = 'alpine:3.7' $Shell = '/bin/sh' } - 'debian-x64' { - $Image = 'debian:bullseye' + 'debian-x64' { + $Image = 'debian:bullseye' $Shell = '/bin/bash' } - 'ubuntu-x64' { - $Image = 'ubuntu:22.04' + 'ubuntu-x64' { + $Image = 'ubuntu:22.04' $Shell = '/bin/bash' } - 'fedora-x64' { - $Image = 'fedora:37' + 'fedora-x64' { + $Image = 'fedora:37' $Shell = '/bin/bash' } - 'linux-x64' { - $Image = 'ubuntu:22.04' + 'linux-x64' { + $Image = 'ubuntu:22.04' $Shell = '/bin/bash' } - 'linux-musl-x64' { - $Image = 'alpine:3.15' + 'linux-musl-x64' { + $Image = 'alpine:3.15' $Shell = '/bin/sh' } - 'linux-arm' { - $Image = 'arm32v7/ubuntu:22.04' + 'linux-arm' { + $Image = 'arm32v7/ubuntu:22.04' $Shell = '/bin/bash' } - 'linux-arm64' { - $Image = 'arm64v8/ubuntu:22.04' + 'linux-arm64' { + $Image = 'arm64v8/ubuntu:22.04' $Shell = '/bin/bash' } - Default { + Default { Write-Error "Unknown Runtime Identifier $RID" exit } @@ -61,4 +61,4 @@ Write-Host "Building $RID with image $Image using $Shell" $RepoRoot = (Get-Item (git rev-parse --show-toplevel)).FullName docker run --rm --mount "type=bind,source=$RepoRoot,destination=/csfml/" $Image $Shell -c "cd /csfml/tools/nuget/; ./docker.$RID.sh" -exit $LastExitCode \ No newline at end of file +exit $LastExitCode diff --git a/tools/nuget/build.linux.sh b/tools/nuget/build.linux.sh index 518bae8..2795fe9 100755 --- a/tools/nuget/build.linux.sh +++ b/tools/nuget/build.linux.sh @@ -127,7 +127,7 @@ cmake --build . --config Release # Copies one SFML and CSFML module into the NuGet package # The module name must be passed to this function as an argument, in lowercase -# This function then copies $SFMLLibDir/libsfml-(module).so and +# This function then copies $SFMLLibDir/libsfml-(module).so and # $CSFMLLibDir/libcsfml-(module).so into $OutDir copymodule() { diff --git a/tools/nuget/build.macos.sh b/tools/nuget/build.macos.sh index 2c7f77f..800a4a3 100755 --- a/tools/nuget/build.macos.sh +++ b/tools/nuget/build.macos.sh @@ -195,7 +195,7 @@ CSFMLMajorMinorPatch="$CSFMLMajorMinor.2" # Copies one SFML and CSFML module into the NuGet package # The module name must be passed to this function as an argument, in lowercase -# This function then copies $SFMLLibDir/libsfml-(module).so and +# This function then copies $SFMLLibDir/libsfml-(module).so and # $CSFMLLibDir/libcsfml-(module).so into $OutDir copymodule() { diff --git a/tools/nuget/build.win.ps1 b/tools/nuget/build.win.ps1 index 4b825be..0722be1 100644 --- a/tools/nuget/build.win.ps1 +++ b/tools/nuget/build.win.ps1 @@ -19,11 +19,11 @@ if (-not $RID) { $Generator = 'Visual Studio 16 2019' switch ($RID) { - 'win-x86' { - $Architecture = 'Win32' + 'win-x86' { + $Architecture = 'Win32' } - 'win-x64' { - $Architecture = 'x64' + 'win-x64' { + $Architecture = 'x64' } Default { Write-Error "Unknown RID '$RID'" @@ -84,11 +84,11 @@ Push-Location "SFML" $SFMLDir = (Get-Item .).FullName switch ($RID) { - 'win-x86' { + 'win-x86' { $SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x86).FullName $SFMLAudioExtras = (Get-Item ./extlibs/bin/x86).FullName } - 'win-x64' { + 'win-x64' { $SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x64).FullName $SFMLAudioExtras = (Get-Item ./extlibs/bin/x64).FullName } @@ -204,4 +204,4 @@ Copy-Item "$SFMLAudioExtras/*" "$OutDir" Pop-Location # Pop CSFML Pop-Location # Pop $RID -Pop-Location # Pop Build \ No newline at end of file +Pop-Location # Pop Build diff --git a/tools/nuget/docker.fedora-x64.sh b/tools/nuget/docker.fedora-x64.sh index cac48d5..31cd90a 100755 --- a/tools/nuget/docker.fedora-x64.sh +++ b/tools/nuget/docker.fedora-x64.sh @@ -18,5 +18,5 @@ dnf install -y \ gcc-c++ \ cmake \ make - + ./build.linux.sh fedora-x64