Merge pull request #11 from opentk/develop

Add Wayland binaries
opentk · Jul 13, 2023 · aea90fb · aea90fb
2 parents 7071c63 + e1bf500
commit aea90fb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Install X11 dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install xorg-dev
+        sudo apt-get install xorg-dev libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules
     - uses: actions/checkout@v3
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3

diff --git a/download_dependencies.ps1 b/download_dependencies.ps1
@@ -36,18 +36,34 @@ if (Test-Path tmp/src) {
 }
 Rename-Item -Path tmp/glfw-$GLFW_VERSION -NewName src
 
-mkdir tmp/src/build
-pushd tmp/src/build
-cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON ..
+mkdir tmp/src/build-x11
+pushd tmp/src/build-x11
+cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DBUILD_SHARED_LIBS=ON ..
 
 if ($LastExitCode -ne 0) {
-    throw 'GLFW compilation setup failed'
+    throw 'GLFW X11 compilation setup failed'
 }
 
 make -j
 
 if ($LastExitCode -ne 0) {
-    throw 'GLFW compilation failed'
+    throw 'GLFW X11 compilation failed'
 }
 
 popd
+
+mkdir tmp/src/build-wayland
+pushd tmp/src/build-wayland
+cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF  -DGLFW_BUILD_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DGLFW_USE_WAYLAND=ON ..
+
+if ($LastExitCode -ne 0) {
+    throw 'GLFW Wayland compilation setup failed'
+}
+
+make -j
+
+if ($LastExitCode -ne 0) {
+    throw 'GLFW Wayland compilation failed'
+}
+
+popd
diff --git a/glfw-redist.csproj b/glfw-redist.csproj
@@ -38,11 +38,16 @@
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="tmp/src/build/src/*.so.$(GLFW_SHORT_VERSION)">
+    <Content Include="tmp/src/build-x11/src/*.so.$(GLFW_SHORT_VERSION)">
       <PackagePath>runtimes/linux-x64/native/</PackagePath>
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="tmp/src/build-wayland/src/*.so.$(GLFW_SHORT_VERSION)">
+      <PackagePath>runtimes/linux-x64/native/wayland/</PackagePath>
+      <Pack>true</Pack>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
 
     <Content Include="tmp/glfw-$(GLFW_VERSION).bin.WIN32/LICENSE.md">
       <PackagePath>COPYING.md</PackagePath>