diff --git a/download_dependencies.ps1 b/download_dependencies.ps1 index 1ff6611..2e689b6 100644 --- a/download_dependencies.ps1 +++ b/download_dependencies.ps1 @@ -1,4 +1,5 @@ -Param([parameter(Mandatory=$true,Position=0)][String]$GLFW_VERSION) +Param([parameter(Mandatory=$true,Position=0)][String]$GLFW_VERSION, + [parameter(Mandatory=$true,Position=1)][String]$GLFW_SHORT_VERSION) New-Item -ItemType Directory -Force -Path tmp @@ -62,6 +63,7 @@ if ($LastExitCode -ne 0) { make -j +Rename-Item -Path "src/libglfw.so.$GLFW_SHORT_VERSION" -NewName "libglfw-wayland.so.$GLFW_SHORT_VERSION" if ($LastExitCode -ne 0) { throw 'GLFW Wayland compilation failed' } diff --git a/glfw-redist.csproj b/glfw-redist.csproj index 62a25e6..8546efb 100644 --- a/glfw-redist.csproj +++ b/glfw-redist.csproj @@ -44,7 +44,7 @@ PreserveNewest - runtimes/linux-x64/native/wayland/ + runtimes/linux-x64/native/ true PreserveNewest diff --git a/make_nuget.ps1 b/make_nuget.ps1 index d4fb606..82f5a00 100644 --- a/make_nuget.ps1 +++ b/make_nuget.ps1 @@ -14,7 +14,7 @@ if($currentBranch -eq "develop") { $buildVersionResult = "0-pre" + (Get-Date).ToUniversalTime().ToString("yyyyMMddHHmmss") } -./download_dependencies.ps1 $GLFW_VERSION +./download_dependencies.ps1 $GLFW_VERSION $GLFW_SHORT_VERSION $header = Get-Content([System.IO.Path]::Combine($projectDir, ".\tmp\src\include\GLFW\glfw3.h")) | Out-String