RetroArch
RetroArch copied to clipboard
Allow using system spirv cross
Description
This change teaches the build system to use a system provided SPIRV-Cross library when RetroArch is configured via configure --disable-builtinspirv_cross flag.
Related Issues
https://github.com/libretro/RetroArch/issues/17079
This is an issue as can be seen in the CI jobs.
We don't really want our current platforms to use system-provided SPIRV-Cross. You can add this functionality but it should be optional and should not be the default.
We don't really want our current platforms to use system-provided SPIRV-Cross. You can add this functionality but it should be optional and should not be the default.
It already should be optional; unless someone passes the --disable-builtinspirv_cross configure flag, it shouldn't change anything. I'll look at the one CI failure now, thanks.
I've looked at the WiiU build failure, and I'm puzzled. Is it possible to build with V=1 in to see which CXXFLAGS were used?
Can you rebase and trigger a rebuild? I expect we'd get more information after my changes to the makefiles.
Can you rebase and trigger a rebuild? I expect we'd get more information after my changes to the makefiles.
Done!
I'm rusty on the RetroArch build system, but perhaps it doesn't work for the Wii build because it's calling its Makefile directly instead of going through ./configure, which I think would mean check_enabled SPIRV_CROSS BUILTINSPIRV_CROSS 'builtin spirv-cross' 'spirv-cross is' true is not called and the values not set ?
I'm rusty on the RetroArch build system, but perhaps it doesn't work for the Wii build because it's calling its Makefile directly instead of going through ./configure, which I think would mean
check_enabled SPIRV_CROSS BUILTINSPIRV_CROSS 'builtin spirv-cross' 'spirv-cross is' trueis not called and the values not set ?
I think this should fix it:
modified Makefile.wiiu
@@ -165,6 +165,7 @@ endif
#WANT_IFADDRS = 1
HAVE_OVERLAY = 1
HAVE_SPIRV_CROSS = 1
+ HAVE_BUILTINSPIRV_CROSS = 1
HAVE_SLANG = 1
HAVE_DSP_FILTER = 1
HAVE_VIDEO_FILTER = 1
I think the change is correct according to how it is built for WiiU.
@pstef Do you concur ? ;)
Thank you.
The qb/config.libs.sh spaghetti is a bit verbose, but otherwise I can't find any errors in this change yet.