v2.6.0

LICENSE.md

@@ -1,7 +1,6 @@
 # ASFML
------
 
-ASFML, the Ada binding for SFML
+ASFML, the Ada binding for SFML, is distributed under the same license as CSFML.
 
 # CSFML
 

README.md

@@ -14,8 +14,8 @@ It is written in standard Ada without the use of any specific GNAT extensions, b
 
 ## State
 
-The binding is considered complete. Three versions of [CSFML](https://github.com/SFML/CSFML)
- have been bound: 1.6, 2.4 and 2.5 (see [Releases](https://github.com/mgrojo/ASFML/releases/)). The API is considered stable, changes would only be made to fix errors or to upgrade to a new SFML version.
+The binding is considered complete. Several versions of [CSFML](https://github.com/SFML/CSFML)
+ have been bound: 1.6, 2.4, 2.5 and 2.6 (see [Releases](https://github.com/mgrojo/ASFML/releases/)). The API is considered stable, changes would only be made to fix errors or to upgrade to a new SFML version.
 
 The library has been tested with several GNAT versions and on Windows 10 and Ubuntu Linux 20.04 LTS and 22.04.
 

alire.toml

@@ -1,6 +1,6 @@
 name = "asfml"
 description = "An Ada binding to SFML, the Simple and Fast Multimedia Library"
-version = "2.5.5"
+version = "2.6.0"
 long-description = """
 [![ASFML logo](https://raw.githubusercontent.com/mgrojo/ASFML/master/images/ASFML_Logo.svg)](https://www.sfml-dev.org)
 ![Ada (GNAT)](https://github.com/mgrojo/ASFML/workflows/Ada%20(GNAT)/badge.svg)
@@ -31,4 +31,4 @@ website = "https://mgrojo.github.io/ASFML/"
 tags = ["audio", "games", "opengl", "cross-platform", "multimedia", "binding", "graphics", "sfml"]
 
 [[depends-on]]
-libcsfml = "^2.5.2"
+libcsfml = "^2.6.0"

asfml.gpr

@@ -85,9 +85,16 @@ library project ASFML is
 
   package Linker is
       for Linker_Options use
-        ("-lcsfml-system", "-lcsfml-audio", "-lcsfml-network",
+        (
+         -- Add this if you need to provide your own compiled version of SFML/CSFML
+         -- "-L../../SFML/SFML/lib", "-L../../SFML/CSFML/lib",
+         -- "-lsfml-system", "-lsfml-audio", "-lsfml-network",
+         -- "-lsfml-audio", "-lsfml-graphics", "-lsfml-window",
+         -- End
+         "-lcsfml-system", "-lcsfml-audio", "-lcsfml-network",
          "-lcsfml-audio", "-lcsfml-graphics", "-lcsfml-window",
-         "-lasfml");
+         "-lasfml"
+        );
   end Linker;
 
 

asfml_opengl.gpr

@@ -27,8 +27,14 @@ library project ASFML_OpenGL is
             "-LD:\Libraries\OpenGL32\lib", "-lopengl32", "-lglu32", "-lasfml");
       when others =>
         for Linker_Options use
-           ("-lcsfml-system", "-lcsfml-audio", "-lcsfml-network", "-lcsfml-audio",
-            "-lcsfml-graphics", "-lcsfml-window", "-lOpenGL", "-lGLU", "-lasfml");
+              (
+               -- Add this if you need to provide your own compiled version of SFML/CSFML
+               -- "-L../../SFML/SFML/lib", "-L../../SFML/CSFML/lib",
+               -- "-lsfml-system", "-lsfml-audio", "-lsfml-network",
+               -- "-lsfml-audio", "-lsfml-graphics", "-lsfml-window",
+               -- End
+               "-lcsfml-system", "-lcsfml-audio", "-lcsfml-network", "-lcsfml-audio",
+               "-lcsfml-graphics", "-lcsfml-window", "-lOpenGL", "-lGLU", "-lasfml");
     end case;
   end Linker;
 

doc/docs/sf__audio__music___spec.js

@@ -438,7 +438,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",
@@ -654,7 +654,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",
@@ -870,7 +870,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",

doc/docs/sf__audio__soundbuffer___spec.js

@@ -302,7 +302,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",
@@ -510,7 +510,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",
@@ -1085,7 +1085,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",
@@ -2275,7 +2275,7 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": "ogg, wav, flac, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
+                  "text": "ogg, wav, flac, mp3, aiff, au, raw, paf, svx, nist, voc, ircam,\n"
                 },
                 {
                   "kind": "span",

doc/docs/sf__audio__soundrecorder___spec.js

@@ -983,15 +983,15 @@ GNATdoc.Documentation = {
                 },
                 {
                   "kind": "span",
-                  "text": " Get a list of the names of all availabe audio capture devices\n"
+                  "text": " Get a list of the names of all available audio capture devices\n"
                 },
                 {
                   "kind": "span",
                   "text": "This function returns an array of strings\n"
                 },
                 {
                   "kind": "span",
-                  "text": "containing the names of all availabe audio capture devices.\n"
+                  "text": "containing the names of all available audio capture devices.\n"
                 },
                 {
                   "kind": "span",