diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index ec05f99..cdc7369 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -1,10 +1,7 @@ name: NuGet Release on: - push: - branches: - - master - - 2.6.x + push: {} workflow_dispatch: {} concurrency: diff --git a/tools/nuget/build.win.ps1 b/tools/nuget/build.win.ps1 index b3263c7..d9169d0 100644 --- a/tools/nuget/build.win.ps1 +++ b/tools/nuget/build.win.ps1 @@ -115,10 +115,10 @@ New-Push SFML $SFMLBuiltDir = Get-Location # The directory where SFML was built to. Used later to direct cmake when building CSFML cmake ` - '-DBUILD_SHARED_LIBS=0' ` + '-DBUILD_SHARED_LIBS=1' ` '-DCMAKE_BUILD_TYPE=Release' ` '-DCMAKE_SYSTEM_VERSION=8.1' ` - '-DSFML_USE_STATIC_STD_LIBS=1' ` + '-DSFML_USE_STATIC_STD_LIBS=0' ` '-DSFML_BUILD_NETWORK=0' ` "-G$Generator" ` "-A$Architecture" ` @@ -142,7 +142,7 @@ $CSFMLLibDir = (Get-Item lib).FullName; # The directory where the final CSFML dl cmake ` "-DSFML_DIR=$SFMLBuiltDir" ` - '-DCSFML_LINK_SFML_STATICALLY=1' ` + '-DCSFML_LINK_SFML_STATICALLY=0' ` "-DCMAKE_LIBRARY_PATH=$SFMLExtLibs" ` ` "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" ` @@ -193,6 +193,7 @@ function Copy-Module($module) { Write-Output "Copying CSFML $module" New-Item -ItemType Directory $OutDir -ErrorAction Ignore > $null + Copy-Item "$SFMLLibDir/sfml-$module-2.dll" "$OutDir" -Force > $null Copy-Item "$CSFMLLibDir/csfml-$module-2.dll" "$OutDir/csfml-$module.dll" -Force > $null }