qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] Disable SDL by default 

Finally, there is no more need to keep it (though I won't nuke the
support just yet) as native windows support is now working.
This commit is contained in:
Bill Currie 2021-04-01 20:07:37 +09:00
parent 612eb49d9c
commit b2ec1aaf37
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config.d/build_control.m4
View File

@ -119,14 +119,6 @@ if test "x$HAVE_SDL" = xyes; then
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-sdl.desktop"
CL_TARGETS="$CL_TARGETS SDL"
VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la"
if test "$HAVE_VULKAN" = "yes"; then
QF_NEED(vid_render, [vulkan])
QF_NEED(render, [vulkan])
QF_NEED(alias, [vulkan])
QF_NEED(brush, [vulkan])
QF_NEED(iqm, [vulkan])
QF_NEED(sprite, [vulkan])
fi
QF_NEED(vid_render, [sw sw32 gl glsl])
QF_NEED(render, [sw sw32 gl glsl])
QF_NEED(models, [sw gl glsl])
@ -173,6 +165,15 @@ if test "x$mingw" = xyes; then
NQ_TARGETS="$NQ_TARGETS nq-win\$(EXEEXT)"
CL_TARGETS="$CL_TARGETS WIN"
VID_TARGETS="$VID_TARGETS libs/video/targets/libQFwin.la"
if test "$HAVE_VULKAN" = "yes"; then
QF_NEED(vid_render, [vulkan])
QF_NEED(render, [vulkan])
QF_NEED(models, [vulkan])
QF_NEED(alias, [vulkan])
QF_NEED(brush, [vulkan])
QF_NEED(iqm, [vulkan])
QF_NEED(sprite, [vulkan])
fi
QF_NEED(vid_render, [sw sw32 gl glsl])
QF_NEED(models, [sw gl glsl])
QF_NEED(alias, [sw gl glsl])

4
config.d/sdl.m4
View File

@ -1,9 +1,9 @@
dnl SDL/SDL-GL checks
AC_ARG_ENABLE(sdl,
[ --disable-sdl disable checking for SDL],
[ --enable-sdl enable checking for SDL],
)
if test "x$enable_sdl" != xno; then
if test "x$enable_sdl" = xyes; then
if test "x$PKG_CONFIG" != "x"; then
PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], HAVE_SDL=yes, HAVE_SDL=no)
else