Skip to content

Commit

Permalink
Merge branch 'master' of github.com:opentk/glfw-redist into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
NogginBops committed Mar 5, 2024
2 parents c89061d + e9b7b1c commit d16e52a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ GLFW is licensed under the [zlib/libpng license](http://www.glfw.org/license.htm

Project Website: http://www.glfw.org/

We are as of `3.3.8.35` using the `static-ucrt` build of GLFW on windows which means that "Visual C++ Redistributable 2015" is no longer a requirement.
Previous versions of this package was using the `VS2019` binaries which recuired "Visual C++ Redistributable 2015" to be installed.

## How do I get set up? ##

Currently only works on Linux
Expand Down
5 changes: 3 additions & 2 deletions download_dependencies.ps1
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -50,4 +51,4 @@ if ($LastExitCode -ne 0) {
throw 'GLFW compilation failed'
}

Pop-Location
Pop-Location
2 changes: 1 addition & 1 deletion make_nuget.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d16e52a

Please sign in to comment.