Skip to content

Commit 424f054

Browse files
flyxflyx
committed
Merge branch 'develop' of github.com:flyx/OpenGLAda into develop
2 parents be4189c + 2b0544f commit 424f054

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

‎install/OpenGLAda.wix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
InstallerVersion="100" Languages="1033" Compressed="yes"
1010
SummaryCodepage="1252" />
1111
<Media Id="1" Cabinet="OpenGLAda.cab" EmbedCab="yes" />
12-
<Property Id="INSTALLDIR" Value="C:\GNAT\2018"/>
12+
<Property Id="INSTALLDIR" Value="C:\GNAT\2020"/>
1313
<Directory Id="TARGETDIR" Name="SourceDir">
1414
<Directory Id="INSTALLDIR" Name="GNAT" ComponentGuidGenerationSeed="005645a9-cb2e-43da-a920-68b7e8d3ae11">
1515
<Component Id="dummy" Guid="fd86164a-4408-496d-a3fb-633a56f1a955" KeyPath="yes" />
@@ -26,9 +26,6 @@
2626
<Component Id="FreetypeDynamicLibrary" Guid="*">
2727
<File Id="FreetypeDLL" Name="freetype.dll" DiskId="1" Source="$(var.lib)\freetype.dll" KeyPath="yes" />
2828
</Component>
29-
<Component Id="GIDStaticLibrary" Guid="*">
30-
<File Id="GIDStaticLibraryA" Name="libGID.a" DiskId="1" Source="$(var.lib)\libGID.a" KeyPath="yes" />
31-
</Component>
3229
</Directory>
3330
<Directory Id="includeFolder" Name="include">
3431
<Directory Id="includeOpenglFolder" Name="opengl" />
@@ -63,7 +60,7 @@
6360
</Directory>
6461
</Directory>
6562

66-
<Feature Id="Complete" Title="OpenGLAda 0.7.0"
63+
<Feature Id="Complete" Title="OpenGLAda 0.8.0"
6764
Description="OpenGLAda package – Please ensure that the selected install path points to your GNAT installation!"
6865
Display="expand" Level="1" Absent="disallow"
6966
ConfigurableDirectory="INSTALLDIR"
@@ -90,7 +87,10 @@
9087
Description="Includes the GID library and a simple API for loading images to textures." Level="1">
9188
<ComponentGroupRef Id="ImagesLibFiles" />
9289
<ComponentGroupRef Id="ImagesIncludeFiles" />
90+
<ComponentGroupRef Id="GIDLibFiles" />
91+
<ComponentGroupRef Id="GIDIncludeFiles" />
9392
<ComponentRef Id="ImagesProject" />
93+
<ComponentRef Id="GIDProject" />
9494
</Feature>
9595
<Feature Id="Text" Title="Text" AllowAdvertise="no"
9696
Description="Library for rendering text with FreeType. Includes the FreeType library and an Ada wrapper for it."

‎install/create-msi.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ if (-Not ($wixonly -or $skipdownloads)) {
2525

2626
# GLFW
2727

28-
$glfw_url = "https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.bin.WIN64.zip"
29-
$glfw_destination = "$tmp\glfw-3.2.1.bin.WIN64.zip"
28+
$glfw_url = "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
29+
$glfw_destination = "$tmp\glfw-3.3.2.bin.WIN64.zip"
3030
Invoke-WebRequest -Uri $glfw_url -OutFile $glfw_destination
3131
$zip = [IO.Compression.ZipFile]::OpenRead($glfw_destination)
32-
$zip.Entries | where {$_.FullName -eq "glfw-3.2.1.bin.WIN64/lib-mingw-w64/libglfw3.a"} | `
32+
$zip.Entries | where {$_.FullName -eq "glfw-3.3.2.bin.WIN64/lib-mingw-w64/libglfw3.a"} | `
3333
foreach {[IO.Compression.ZipFileExtensions]::ExtractToFile($_, "$target\lib\libglfw3.a", $true)}
3434
$zip.Dispose()
3535

@@ -69,7 +69,7 @@ $heatArgs = @("-ag", "-scom", "-sreg", "-sfrag", "-srd")
6969
&$heat dir $target\include\opengl.images -cg ImagesIncludeFiles $heatArgs -dr includeOpenglImagesFolder -out $tmp\ImagesIncludes.wxs -var var.includeOpenglImages
7070
&$heat dir $target\include\opengl.text -cg TextIncludeFiles $heatArgs -dr includeOpenglTextFolder -out $tmp\TextIncludes.wxs -var var.includeOpenglText
7171
&$heat dir $target\include\freetype -cg FreetypeIncludeFiles $heatArgs -dr includeFreetypeFolder -out $tmp\FreetypeIncludes.wxs -var var.includeFreetype
72-
&$heat dir $target\include\gid -cg GIDIncludeFiles $heatArgs -dr include GIDFolder -out $tmp\GIDIncludes.wxs -var var.includeGID
72+
&$heat dir $target\include\gid -cg GIDIncludeFiles $heatArgs -dr includeGIDFolder -out $tmp\GIDIncludes.wxs -var var.includeGID
7373

7474
# Build the installer
7575

‎install/license.rtf‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil Calibri;}{\f1\fnil\fcharset0 Calibri;}{\f2\fnil\fcharset2 Symbol;}}
22
{\colortbl ;\red0\green0\blue255;}
3-
{\*\generator Riched20 10.0.16299}\viewkind4\uc1
4-
\pard\sa200\sl276\slmult1\f0\fs22\lang8192 This package contains binary files of OpenGLAda as well as optional 3rd-Party libraries, namely the GLFW library ({{\field{\*\fldinst{HYPERLINK http://glfw.org }}{\fldrslt{http://glfw.org\ul0\cf0}}}}\f0\fs22 ) and the FreeType library ({{\field{\*\fldinst{HYPERLINK https://freetype.org/ }}{\fldrslt{https://freetype.org/\ul0\cf0}}}}\f0\fs22 ). \par
5-
OpenGLAda itself is licensed under the \b MIT license:\b0\par
3+
{\*\generator Riched20 10.0.18362}\viewkind4\uc1
4+
\pard\sa200\sl276\slmult1\f0\fs22\lang8192 This package contains binary files of OpenGLAda as well as optional 3rd-Party libraries, namely the GLFW library ({{\field{\*\fldinst{HYPERLINK http://glfw.org }}{\fldrslt{http://glfw.org\ul0\cf0}}}}\f0\fs22 )\f1\lang1033 ,\f0\lang8192 the FreeType library ({{\field{\*\fldinst{HYPERLINK https://freetype.org/ }}{\fldrslt{https://freetype.org/\ul0\cf0}}}}\f0\fs22 )\f1\lang1033 , and the Generic Image Decoder (GID) library ({{\field{\*\fldinst{HYPERLINK https://gen-img-dec.sourceforge.io/ }}{\fldrslt{https://gen-img-dec.sourceforge.io/\ul0\cf0}}}}\f1\fs22 ).\f0\lang8192 \par
5+
OpenGLAda itself\f1\lang1033 and GID are\f0\lang8192 licensed under the \b MIT license:\b0\par
66

7-
\pard\li720\sa200\sl276\slmult1 Copyright (c) 2017 Felix Krause\par
7+
\pard\li720\sa200\sl276\slmult1 Copyright (c) 20\f1\lang1033 20\f0\lang8192 Felix Krause\par
8+
Copyright (c) Gautier de Montmollin 2010 .. 2019\par
89
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
910
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\par
1011
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\par
1112

1213
\pard\sa200\sl276\slmult1 The included GLFW library is licensed under the \b zlib license:\b0\f1\lang1033\par
1314

14-
\pard\li360\sa200\sl276\slmult1 Copyright (c) 2002-2006 Marcus Geelnard Copyright (c) 2006-2016 Camilla L\'f6wy elmindreda@glfw.org\par
15+
\pard\li360\sa200\sl276\slmult1 Copyright (c) 2002-2006 Marcus Geelnard Copyright\par
16+
(c) 2006-2019 Camilla L\'f6wy elmindreda@glfw.org\par
1517
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.\par
1618
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:\par
1719

0 commit comments

Comments
 (0)