Merge pull request #12 from Th3Dilli/master

Fix dotnet publish issue with X11 and Wayland libglfw.so
opentk · Sep 25, 2023 · e9b7b1c · e9b7b1c
2 parents aea90fb + e181577
commit e9b7b1c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -44,7 +44,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="tmp/src/build-wayland/src/*.so.$(GLFW_SHORT_VERSION)">
-      <PackagePath>runtimes/linux-x64/native/wayland/</PackagePath>
+      <PackagePath>runtimes/linux-x64/native/</PackagePath>
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git 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