SDLAda on Windows, reprise (#167)

* sdlada.toml: add C_INLCUDE_PATH on Windows msys2

* sdlada.toml: only compile tools on post-fetch

The other make file targets are not required.

Also define SDL_PLATFORM for all targets so we don't have to user a different post-fetch for each OS.

* sdlada.toml: remove SDL_MODE definition

This means the users of the lib can define the build mode they want.

* libsdl2*.toml: add msys2 package

* ada_voxel_space_demo.toml: set sdlada build mode

* Migrated to 0.4 manifest version

Co-authored-by: Fabien Chouteau <fabien.chouteau@gmail.com>
This commit is contained in:
Alejandro R Mosteo
2020-10-05 18:17:34 +02:00
committed by GitHub
parent 4d509d4411
commit f92f8dae34
4 changed files with 16 additions and 7 deletions
+3 -2
View File
@@ -6,5 +6,6 @@ maintainers-logins = ["mosteo"]
[[external]]
kind = "system"
[external.origin."case(distribution)"]
"debian|ubuntu" = ["libsdl2-dev"]
[external.origin.'case(distribution)']
'debian|ubuntu' = ["libsdl2-dev"]
'msys2' = ["mingw-w64-x86_64-SDL2"]
@@ -6,5 +6,6 @@ maintainers-logins = ["mosteo"]
[[external]]
kind = "system"
[external.origin."case(distribution)"]
"debian|ubuntu" = ["libsdl2-image-dev"]
[external.origin.'case(distribution)']
'debian|ubuntu' = ["libsdl2-image-dev"]
'msys2' = ["mingw-w64-x86_64-SDL2_image"]
@@ -6,5 +6,6 @@ maintainers-logins = ["mosteo"]
[[external]]
kind = "system"
[external.origin."case(distribution)"]
"debian|ubuntu" = ["libsdl2-ttf-dev"]
[external.origin.'case(distribution)']
'debian|ubuntu' = ["libsdl2-ttf-dev"]
'msys2' = ["mingw-w64-x86_64-SDL2_ttf"]
+7 -1
View File
@@ -24,11 +24,12 @@ command = ["make", "-C", "build/gnat", "SDL_PLATFORM=macosx", "SDL_MODE=release"
[[actions."case(os)".windows]]
type = "post-fetch"
command = ["make", "-C", "build/gnat", "SDL_PLATFORM=windows", "SDL_MODE=release"]
[available."case(os)"]
"..." = false
linux = true
macos = true
windows = true
"..." = false
[gpr-externals]
SDL_MODE = ["debug", "release"]
@@ -39,6 +40,11 @@ SDL_MODE = "release"
[gpr-set-externals."case(os)".linux]
SDL_PLATFORM = "linux"
[environment.'case(distribution)']
# sdlada expects SDL2 headers to be in the C_INCLUDE_PATH but the option
# used in the project file ("-I/usr/include/SDL2") doesn't work with msys2
msys2 = { C_INCLUDE_PATH.append = "${DISTRIB_ROOT}/mingw64/include/SDL2" }
[origin]
url = "https://github.com/Lucretia/sdlada/archive/v2.3.1.tar.gz"
hashes = ["sha512:786a047fd74f5105eef9d8b3f1ad082b915339cf9da4a2c32f7789dc12005acb2999301e616a67ec0b2a4c084586e812f8d6343dbd33d8bd165ba58a94db16e3"]