From be99bd27baa60c949f9d31a9e53fb5280a2b9ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4ger?= Date: Tue, 5 Mar 2024 12:45:08 +0100 Subject: [PATCH 1/3] Update to glfw 3.4 --- make_nuget.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_nuget.ps1 b/make_nuget.ps1 index d4fb606..2f79b50 100644 --- a/make_nuget.ps1 +++ b/make_nuget.ps1 @@ -1,7 +1,7 @@ param([String]$projectDir, [int]$verBuild) $ErrorActionPreference = "Stop" -[String]$GLFW_VERSION="3.3.8" +[String]$GLFW_VERSION="3.4" # The built .so file will end in .so.3.3 for a version like 3.3.7, to get the correct file we need to pass "3.3" to the .csproj [String]$GLFW_SHORT_VERSION = $GLFW_VERSION.Substring(0, $GLFW_VERSION.LastIndexOf(".")) From c89061d263e2aecd65c47e6a9118fe2904913fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4ger?= Date: Tue, 5 Mar 2024 12:49:39 +0100 Subject: [PATCH 2/3] Use new glfw cmake settings --- download_dependencies.ps1 | 28 ++++++---------------------- glfw-redist.csproj | 7 +------ 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/download_dependencies.ps1 b/download_dependencies.ps1 index 1ff6611..045bafe 100644 --- 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 \ No newline at end of file +Pop-Location \ No newline at end of file diff --git a/glfw-redist.csproj b/glfw-redist.csproj index 62a25e6..f954bde 100644 --- a/glfw-redist.csproj +++ b/glfw-redist.csproj @@ -38,16 +38,11 @@ true PreserveNewest - + runtimes/linux-x64/native/ true PreserveNewest - - runtimes/linux-x64/native/wayland/ - true - PreserveNewest - COPYING.md From 78a47dba50024f51eff4f869a3cf6377ff02cb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4ger?= Date: Tue, 5 Mar 2024 16:05:01 +0100 Subject: [PATCH 3/3] Remove unused parameter from download_dependencies.ps1 --- download_dependencies.ps1 | 3 +-- make_nuget.ps1 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/download_dependencies.ps1 b/download_dependencies.ps1 index 37813ce..c40d91e 100644 --- a/download_dependencies.ps1 +++ b/download_dependencies.ps1 @@ -1,5 +1,4 @@ -Param([parameter(Mandatory=$true,Position=0)][String]$GLFW_VERSION, - [parameter(Mandatory=$true,Position=1)][String]$GLFW_SHORT_VERSION) +Param([parameter(Mandatory=$true,Position=0)][String]$GLFW_VERSION) New-Item -ItemType Directory -Force -Path tmp diff --git a/make_nuget.ps1 b/make_nuget.ps1 index be8ad24..2f79b50 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 $GLFW_SHORT_VERSION +./download_dependencies.ps1 $GLFW_VERSION $header = Get-Content([System.IO.Path]::Combine($projectDir, ".\tmp\src\include\GLFW\glfw3.h")) | Out-String