Fix NuGet build for master

SFML · Sep 8, 2024 · 9d8947f · 9d8947f
1 parent 3912b33
commit 9d8947f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/tools/nuget/build.linux.sh b/tools/nuget/build.linux.sh
@@ -88,12 +88,12 @@ SFMLLibDir="$(realpath lib)"
 
 cmake -E env LDFLAGS="-z origin" \
     cmake \
-    '-DBUILD_SHARED_LIBS=1' \
+    '-DBUILD_SHARED_LIBS=ON' \
     '-DCMAKE_BUILD_TYPE=Release' \
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$SFMLLibDir" \
-    '-DCMAKE_BUILD_WITH_INSTALL_RPATH=1' \
+    '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
     '-DCMAKE_INSTALL_RPATH=$ORIGIN' \
-    '-DSFML_BUILD_NETWORK=0' \
+    '-DSFML_BUILD_NETWORK=OFF' \
     "$SFMLDir"
 
 cmake --build . --config Release
@@ -114,12 +114,12 @@ CSFMLLibDir="$(realpath lib)" # The directory that contains the final CSFML libr
 cmake -E env LDFLAGS="-z origin" \
     cmake \
     "-DSFML_ROOT=$SFMLBuiltDir" \
-    '-DBUILD_SHARED_LIBS=1' \
+    '-DBUILD_SHARED_LIBS=ON' \
     '-DCMAKE_BUILD_TYPE=Release' \
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" \
-    '-DCMAKE_BUILD_WITH_INSTALL_RPATH=1' \
+    '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON' \
     '-DCMAKE_INSTALL_RPATH=$ORIGIN' \
-    '-DCSFML_BUILD_NETWORK=0' \
+    '-DCSFML_BUILD_NETWORK=OFF' \
     "$CSFMLDir"
 cmake --build . --config Release
 

diff --git a/tools/nuget/build.macos.sh b/tools/nuget/build.macos.sh
@@ -133,7 +133,7 @@ CSFMLLibDir="$(realpath lib)" # The directory that contains the final CSFML libr
 
 cmake -E env \
     cmake -G "Unix Makefiles" \
-          -D "SFML_ROOT=$SFMLBuiltDir" \
+          -D "SFML_ROOT=$SFMLLibDir" \
           -D 'BUILD_SHARED_LIBS=ON' \
           -D 'CMAKE_BUILD_TYPE=Release' \
           -D "CMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" \

diff --git a/tools/nuget/build.win.ps1 b/tools/nuget/build.win.ps1
@@ -86,11 +86,9 @@ $SFMLDir = (Get-Item .).FullName
 switch ($RID) {
     'win-x86' {
         $SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x86).FullName
-        $SFMLAudioExtras = (Get-Item ./extlibs/bin/x86).FullName
     }
     'win-x64' {
         $SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x64).FullName
-        $SFMLAudioExtras = (Get-Item ./extlibs/bin/x64).FullName
     }
     Default {
         Write-Error "Unknown RID '$RID'"
@@ -108,24 +106,25 @@ Remove-Item -Recurse -Force -ErrorAction Ignore "$RID"
 New-Push "$RID"
 
 
-
 Write-Output "Building SFML"
 New-Push SFML
 
 $SFMLBuiltDir = Get-Location # The directory where SFML was built to. Used later to direct cmake when building CSFML
+$SFMLInstallDir = $SFMLBuiltDir + '/install'
 
 cmake `
-    '-DBUILD_SHARED_LIBS=0' `
+    '-DBUILD_SHARED_LIBS=OFF' `
     '-DCMAKE_BUILD_TYPE=Release' `
     '-DCMAKE_SYSTEM_VERSION=8.1' `
-    '-DSFML_USE_STATIC_STD_LIBS=1' `
-    '-DSFML_BUILD_NETWORK=0' `
+    '-DSFML_USE_STATIC_STD_LIBS=ON' `
+    '-DSFML_BUILD_NETWORK=OFF' `
+    "-DCMAKE_INSTALL_PREFIX=$SFMLInstallDir" `
     "-G$Generator" `
     "-A$Architecture" `
     $SFMLDir
 Ensure-Success
 
-cmake --build . --config Release -- '-verbosity:minimal'
+cmake --build . --config Release --target install -- '-verbosity:minimal'
 Ensure-Success
 
 Pop-Location # Pop SFML
@@ -141,8 +140,8 @@ New-Item -ItemType Directory lib > $null
 $CSFMLLibDir = (Get-Item lib).FullName; # The directory where the final CSFML dlls are located
 
 cmake `
-    "-DSFML_ROOT=$SFMLBuiltDir" `
-    '-DCSFML_LINK_SFML_STATICALLY=1' `
+    "-DSFML_ROOT=$SFMLInstallDir" `
+    '-DCSFML_LINK_SFML_STATICALLY=ON' `
     "-DCMAKE_LIBRARY_PATH=$SFMLExtLibs" `
     `
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" `
@@ -155,11 +154,11 @@ cmake `
     "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=$CSFMLLibDir" `
     `
     '-DCMAKE_SYSTEM_VERSION=8.1' `
-    '-DSTATIC_STD_LIBS=1' `
+    '-DSTATIC_STD_LIBS=ON' `
     `
-    "-DBUILD_SHARED_LIBS=1" `
+    "-DBUILD_SHARED_LIBS=ON" `
     '-DCMAKE_BUILD_TYPE=Release' `
-    '-DCSFML_BUILD_NETWORK=0' `
+    '-DCSFML_BUILD_NETWORK=OFF' `
     `
     "-G$generator" `
     "-A$Architecture" `
@@ -201,9 +200,6 @@ Copy-Module 'graphics'
 Copy-Module 'system'
 Copy-Module 'window'
 
-Write-Output "Copying Audio module extra files"
-Copy-Item "$SFMLAudioExtras/*" "$OutDir"
-
 Pop-Location # Pop CSFML
 Pop-Location # Pop $RID
 Pop-Location # Pop Build