Use new glfw cmake settings

opentk · Mar 5, 2024 · c89061d · c89061d
1 parent be99bd2
commit c89061d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/download_dependencies.ps1 b/download_dependencies.ps1
@@ -36,34 +36,18 @@ if (Test-Path tmp/src) {
 }
 Rename-Item -Path tmp/glfw-$GLFW_VERSION -NewName src
 
-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 ..
+mkdir tmp/src/build
+Push-Location tmp/src/build
+cmake -DCMAKE_BUILD_TYPE=Release -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_X11=ON -DGLFW_BUILD_WAYLAND=ON ..
 
 if ($LastExitCode -ne 0) {
-    throw 'GLFW X11 compilation setup failed'
+    throw 'GLFW compilation setup failed'
 }
 
 make -j
 
 if ($LastExitCode -ne 0) {
-    throw 'GLFW X11 compilation failed'
+    throw 'GLFW 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
+Pop-Location
diff --git a/glfw-redist.csproj b/glfw-redist.csproj
@@ -38,16 +38,11 @@
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="tmp/src/build-x11/src/*.so.$(GLFW_SHORT_VERSION)">
+    <Content Include="tmp/src/build/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>