ref: 25706c66b9ae2ec3be9cd0120130ba535a69e35f
parent: 3ed81805500b6497537fcab2dffe2b92e52cbed7
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Mon Jan 29 11:52:52 EST 2024
cross: simplify; specify sdl2-config path; use @DIRNAME@ instead of forcing the use of PATH env var
--- a/cross/i686-w64-mingw32.static.txt
+++ b/cross/i686-w64-mingw32.static.txt
@@ -1,8 +1,13 @@
+[constants]
+path = '@DIRNAME@/windows/bin/'
+prefix = path + 'i686-w64-mingw32.static-'
+
[binaries]
-c = 'i686-w64-mingw32.static-gcc'
-pkg-config = 'i686-w64-mingw32.static-pkg-config'
-strip = 'i686-w64-mingw32.static-strip'
-windres = 'i686-w64-mingw32.static-windres'
+c = prefix + 'gcc'
+pkg-config = prefix + 'pkg-config'
+sdl2-config = prefix + 'sdl2-config'
+strip = prefix + 'strip'
+windres = prefix + 'windres'
[host_machine]
system = 'windows'
--- a/cross/x86_64-w64-mingw32.static.txt
+++ b/cross/x86_64-w64-mingw32.static.txt
@@ -1,8 +1,13 @@
+[constants]
+path = '@DIRNAME@/windows/bin/'
+prefix = path + 'x86_64-w64-mingw32.static-'
+
[binaries]
-c = 'x86_64-w64-mingw32.static-gcc'
-pkg-config = 'x86_64-w64-mingw32.static-pkg-config'
-strip = 'x86_64-w64-mingw32.static-strip'
-windres = 'x86_64-w64-mingw32.static-windres'
+c = prefix + 'gcc'
+pkg-config = prefix + 'pkg-config'
+sdl2-config = prefix + 'sdl2-config'
+strip = prefix + 'strip'
+windres = prefix + 'windres'
[host_machine]
system = 'windows'