mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 13:36:12 +01:00
Remove trailing whitespace
This commit is contained in:
1 parent
4f540b9cbb
commit
9a355d784b
9 files changed
+33
-33
No files matched your search
@@ -46,7 +46,7 @@ jobs:
|
|||||||
- name: Configure SFML CMake
|
- name: Configure SFML CMake
|
||||||
shell: bash
|
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}}
|
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
|
- name: Build SFML
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cmake --build $GITHUB_WORKSPACE/SFML/build --config ${{matrix.type.name}} --target install
|
run: cmake --build $GITHUB_WORKSPACE/SFML/build --config ${{matrix.type.name}} --target install
|
||||||
|
|||||||
+1
-1
@@ -74,7 +74,7 @@ macro(csfml_add_library target)
|
|||||||
# add the install rule
|
# add the install rule
|
||||||
install(TARGETS ${target}
|
install(TARGETS ${target}
|
||||||
RUNTIME DESTINATION bin COMPONENT bin
|
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)
|
ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT devel)
|
||||||
|
|
||||||
endmacro()
|
endmacro()
|
||||||
@@ -172,7 +172,7 @@ sfBool sfFont_isSmooth(const sfFont *font)
|
|||||||
{
|
{
|
||||||
if (font->This.isSmooth())
|
if (font->This.isSmooth())
|
||||||
{
|
{
|
||||||
return sfTrue;
|
return sfTrue;
|
||||||
}
|
}
|
||||||
|
|
||||||
return sfFalse;
|
return sfFalse;
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ Function Create-ImportLib([string]$architecture)
|
|||||||
Move-Item -Path "lib\*.lib" -Destination "lib\msvc"
|
Move-Item -Path "lib\*.lib" -Destination "lib\msvc"
|
||||||
|
|
||||||
$patharch = If($architecture -eq "x64") { "64" } Else { "32" }
|
$patharch = If($architecture -eq "x64") { "64" } Else { "32" }
|
||||||
|
|
||||||
$oldpath = $env:Path
|
$oldpath = $env:Path
|
||||||
$env:Path += ";C:\tools\mingw$patharch\bin\"
|
$env:Path += ";C:\tools\mingw$patharch\bin\"
|
||||||
|
|
||||||
Push-Location "lib\gcc"
|
Push-Location "lib\gcc"
|
||||||
Convert-DLL("csfml-graphics")
|
Convert-DLL("csfml-graphics")
|
||||||
Convert-DLL("csfml-window")
|
Convert-DLL("csfml-window")
|
||||||
|
|||||||
@@ -18,39 +18,39 @@ $Image = $null
|
|||||||
$Shell = $null
|
$Shell = $null
|
||||||
|
|
||||||
switch ($RID) {
|
switch ($RID) {
|
||||||
'alpine-x64' {
|
'alpine-x64' {
|
||||||
$Image = 'alpine:3.7'
|
$Image = 'alpine:3.7'
|
||||||
$Shell = '/bin/sh'
|
$Shell = '/bin/sh'
|
||||||
}
|
}
|
||||||
'debian-x64' {
|
'debian-x64' {
|
||||||
$Image = 'debian:bullseye'
|
$Image = 'debian:bullseye'
|
||||||
$Shell = '/bin/bash'
|
$Shell = '/bin/bash'
|
||||||
}
|
}
|
||||||
'ubuntu-x64' {
|
'ubuntu-x64' {
|
||||||
$Image = 'ubuntu:22.04'
|
$Image = 'ubuntu:22.04'
|
||||||
$Shell = '/bin/bash'
|
$Shell = '/bin/bash'
|
||||||
}
|
}
|
||||||
'fedora-x64' {
|
'fedora-x64' {
|
||||||
$Image = 'fedora:37'
|
$Image = 'fedora:37'
|
||||||
$Shell = '/bin/bash'
|
$Shell = '/bin/bash'
|
||||||
}
|
}
|
||||||
'linux-x64' {
|
'linux-x64' {
|
||||||
$Image = 'ubuntu:22.04'
|
$Image = 'ubuntu:22.04'
|
||||||
$Shell = '/bin/bash'
|
$Shell = '/bin/bash'
|
||||||
}
|
}
|
||||||
'linux-musl-x64' {
|
'linux-musl-x64' {
|
||||||
$Image = 'alpine:3.15'
|
$Image = 'alpine:3.15'
|
||||||
$Shell = '/bin/sh'
|
$Shell = '/bin/sh'
|
||||||
}
|
}
|
||||||
'linux-arm' {
|
'linux-arm' {
|
||||||
$Image = 'arm32v7/ubuntu:22.04'
|
$Image = 'arm32v7/ubuntu:22.04'
|
||||||
$Shell = '/bin/bash'
|
$Shell = '/bin/bash'
|
||||||
}
|
}
|
||||||
'linux-arm64' {
|
'linux-arm64' {
|
||||||
$Image = 'arm64v8/ubuntu:22.04'
|
$Image = 'arm64v8/ubuntu:22.04'
|
||||||
$Shell = '/bin/bash'
|
$Shell = '/bin/bash'
|
||||||
}
|
}
|
||||||
Default {
|
Default {
|
||||||
Write-Error "Unknown Runtime Identifier $RID"
|
Write-Error "Unknown Runtime Identifier $RID"
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
@@ -61,4 +61,4 @@ Write-Host "Building $RID with image $Image using $Shell"
|
|||||||
$RepoRoot = (Get-Item (git rev-parse --show-toplevel)).FullName
|
$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"
|
docker run --rm --mount "type=bind,source=$RepoRoot,destination=/csfml/" $Image $Shell -c "cd /csfml/tools/nuget/; ./docker.$RID.sh"
|
||||||
exit $LastExitCode
|
exit $LastExitCode
|
||||||
@@ -127,7 +127,7 @@ cmake --build . --config Release
|
|||||||
|
|
||||||
# Copies one SFML and CSFML module into the NuGet package
|
# Copies one SFML and CSFML module into the NuGet package
|
||||||
# The module name must be passed to this function as an argument, in lowercase
|
# 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
|
# $CSFMLLibDir/libcsfml-(module).so into $OutDir
|
||||||
copymodule()
|
copymodule()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ CSFMLMajorMinorPatch="$CSFMLMajorMinor.2"
|
|||||||
|
|
||||||
# Copies one SFML and CSFML module into the NuGet package
|
# Copies one SFML and CSFML module into the NuGet package
|
||||||
# The module name must be passed to this function as an argument, in lowercase
|
# 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
|
# $CSFMLLibDir/libcsfml-(module).so into $OutDir
|
||||||
copymodule()
|
copymodule()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,11 +19,11 @@ if (-not $RID) {
|
|||||||
$Generator = 'Visual Studio 16 2019'
|
$Generator = 'Visual Studio 16 2019'
|
||||||
|
|
||||||
switch ($RID) {
|
switch ($RID) {
|
||||||
'win-x86' {
|
'win-x86' {
|
||||||
$Architecture = 'Win32'
|
$Architecture = 'Win32'
|
||||||
}
|
}
|
||||||
'win-x64' {
|
'win-x64' {
|
||||||
$Architecture = 'x64'
|
$Architecture = 'x64'
|
||||||
}
|
}
|
||||||
Default {
|
Default {
|
||||||
Write-Error "Unknown RID '$RID'"
|
Write-Error "Unknown RID '$RID'"
|
||||||
@@ -84,11 +84,11 @@ Push-Location "SFML"
|
|||||||
$SFMLDir = (Get-Item .).FullName
|
$SFMLDir = (Get-Item .).FullName
|
||||||
|
|
||||||
switch ($RID) {
|
switch ($RID) {
|
||||||
'win-x86' {
|
'win-x86' {
|
||||||
$SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x86).FullName
|
$SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x86).FullName
|
||||||
$SFMLAudioExtras = (Get-Item ./extlibs/bin/x86).FullName
|
$SFMLAudioExtras = (Get-Item ./extlibs/bin/x86).FullName
|
||||||
}
|
}
|
||||||
'win-x64' {
|
'win-x64' {
|
||||||
$SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x64).FullName
|
$SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x64).FullName
|
||||||
$SFMLAudioExtras = (Get-Item ./extlibs/bin/x64).FullName
|
$SFMLAudioExtras = (Get-Item ./extlibs/bin/x64).FullName
|
||||||
}
|
}
|
||||||
@@ -204,4 +204,4 @@ Copy-Item "$SFMLAudioExtras/*" "$OutDir"
|
|||||||
|
|
||||||
Pop-Location # Pop CSFML
|
Pop-Location # Pop CSFML
|
||||||
Pop-Location # Pop $RID
|
Pop-Location # Pop $RID
|
||||||
Pop-Location # Pop Build
|
Pop-Location # Pop Build
|
||||||
@@ -18,5 +18,5 @@ dnf install -y \
|
|||||||
gcc-c++ \
|
gcc-c++ \
|
||||||
cmake \
|
cmake \
|
||||||
make
|
make
|
||||||
|
|
||||||
./build.linux.sh fedora-x64
|
./build.linux.sh fedora-x64
|
||||||
Reference in new issue
Block a user