-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Allow using system spirv cross #17080
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
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. |
It already should be optional; unless someone passes the |
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. |
b6ecc22
to
abbb1b4
Compare
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 |
Fixes: libretro#17079 * Makefile.common [HAVE_BUILTINSPIRV_CROSS]: Include bundled SPIRV-Cross sources only when using the builtin option, else... [!HAVE_BUILTINSPIRV_CROSS]: Extend CXXFLAGS and LIBS. * qb/config.libs.sh (BUILTINSPIRV_CROSS): Register new check_enabled configure option, and add libraries/header checks. * qb/config.params.sh (HAVE_BUILTINSPIRV_CROSS): Register new parameter. * Makefile.wiiu (HAVE_BUILTINSPIRV_CROSS): Define to 1.
…bles. C_INCLUDE_PATH and CPLUS_INCLUDE_PATH are consulted by GCC, so should be considered by check_libs as well. * qb/config.libs.sh (INCLUDES): Add C_INCLUDE_PATH and CPLUS_INCLUDE_PATH values to it.
abbb1b4
to
6f05e1c
Compare
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 |
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
#17079