qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-24 20:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[build] Remove obsolete targets

Browse source 
Gone: svga, fbdev, sdl, wgl and probably a few more. Now it's just x11
and win.
This commit is contained in:
Bill Currie 2023-11-27 18:10:23 +09:00
parent 8e4f0f3837
commit 962043ca59
4 changed files with 2 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -80,12 +80,8 @@ esac
m4_include(config.d/compression.m4)
m4_include(config.d/mgl.m4)
m4_include(config.d/fbdev.m4)
m4_include(config.d/svga.m4)
m4_include(config.d/vulkan.m4)
m4_include(config.d/x11.m4)
m4_include(config.d/sdl.m4)
m4_include(config.d/curses.m4)
m4_include(config.d/freetype.m4)

59
libs/video/targets/Makemodule.am
View file

@ -3,14 +3,9 @@
noinst_LTLIBRARIES += @VID_TARGETS@ @vid_libs@
EXTRA_LTLIBRARIES += \
libs/video/targets/libQFfbdev.la \
libs/video/targets/libQFsvga.la \
libs/video/targets/libQFx11.la \
libs/video/targets/libQFsdl.la \
libs/video/targets/libQFwin.la \
libs/video/targets/libvid_common.la \
libs/video/targets/libvid_sdl.la \
libs/video/targets/libvid_svga.la \
libs/video/targets/libvid_win.la \
libs/video/targets/libvid_x11.la
@ -56,58 +51,6 @@ libs_video_targets_libvid_win_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libs_video_targets_libvid_win_la_LDFLAGS= @STATIC@
EXTRA_libs_video_targets_libvid_win_la_SOURCES= $(win_vulkan_src)
libs_video_targets_libvid_svga_la_SOURCES= libs/video/targets/in_svgalib.c
libs_video_targets_libvid_svga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libs_video_targets_libvid_svga_la_LDFLAGS= @STATIC@
libs_video_targets_libvid_sdl_la_SOURCES = \
libs/video/targets/in_sdl.c \
libs/video/targets/context_sdl.c \
libs/video/targets/vid_sdl_gl.c \
libs/video/targets/vid_sdl_sw.c
libs_video_targets_libvid_sdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libs_video_targets_libvid_sdl_la_LDFLAGS= @STATIC@
#
# Linux FBdev
#
fbdev_c= libs/video/targets/fbset_modes_y.c libs/video/targets/fbset_modes_l.c
fbdev_h= libs/video/targets/fbset_modes_y.h
BUILT_SOURCES += $(fbdev_c) $(fbdev_h)
fbdev_libs=libs/video/targets/libvid_common.la
libs_video_targets_libQFfbdev_la_CFLAGS= @PREFER_NON_PIC@
libs_video_targets_libQFfbdev_la_SOURCES = \
libs/video/targets/fbset.c \
libs/video/targets/fbset_modes_y.y \
libs/video/targets/fbset_modes_l.l \
libs/video/targets/in_fbdev.c \
libs/video/targets/vid_fbdev.c
libs_video_targets_libQFfbdev_la_LDFLAGS= @STATIC@
libs_video_targets_libQFfbdev_la_LIBADD= $(fbdev_libs)
libs_video_targets_libQFfbdev_la_DEPENDENCIES= $(fbdev_libs)
#
# Simple DirectMedia Library
#
sdl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_sdl.la
libs_video_targets_libQFsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libs_video_targets_libQFsdl_la_SOURCES= libs/video/targets/vid_sdl.c
libs_video_targets_libQFsdl_la_LDFLAGS= @STATIC@
libs_video_targets_libQFsdl_la_LIBADD= $(sdl_libs)
libs_video_targets_libQFsdl_la_DEPENDENCIES= $(sdl_libs)
#
# SVGAlib
#
svga_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_svga.la
libs_video_targets_libQFsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libs_video_targets_libQFsvga_la_SOURCES= libs/video/targets/vid_svgalib.c
libs_video_targets_libQFsvga_la_LDFLAGS= @STATIC@
libs_video_targets_libQFsvga_la_LIBADD= $(svga_libs)
libs_video_targets_libQFsvga_la_DEPENDENCIES= $(svga_libs)
#
# MS Windows
#
@ -127,5 +70,3 @@ libs_video_targets_libQFx11_la_SOURCES= libs/video/targets/vid_x11.c
libs_video_targets_libQFx11_la_LDFLAGS= @STATIC@
libs_video_targets_libQFx11_la_LIBADD= $(x11_libs)
libs_video_targets_libQFx11_la_DEPENDENCIES= $(x11_libs)
EXTRA_DIST += $(fbdev_c) $(fbdev_h)

46
nq/source/Makemodule.am
View file

@ -83,48 +83,6 @@ nq_client_libs= nq/source/libnq_server.a nq/source/libnq_client.a nq/source/libn
libs/client/libQFclient.la
server_libs = nq/source/libnq_server.a nq/source/libnq_common.a
# Software-rendering targets
# ... Linux FBDev
nq_fbdev_libs= \
$(nq_client_libs) \
$(nq_cl_plugin_LIBS) \
libs/video/renderer/libQFrenderer.la \
libs/models/libQFmodels.la \
libs/video/targets/libQFfbdev.la \
$(nq_client_LIBS)
nq_fbdev_SOURCES= nq/source/sys_unix.c
nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS)
nq_fbdev_LDFLAGS= $(common_ldflags)
nq_fbdev_DEPENDENCIES= $(nq_fbdev_libs)
# ... SDL, version 1.2 and higher
nq_sdl_libs= \
nq/source/libnq_sdl.a \
$(nq_client_libs) \
$(nq_cl_plugin_LIBS) \
libs/video/renderer/libQFrenderer.la \
libs/models/libQFmodels.la \
libs/video/targets/libQFsdl.la \
$(nq_client_LIBS)
nq_sdl_SOURCES=nq/source/sdl_link.c
nq_sdl_LDADD= $(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS)
nq_sdl_LDFLAGS= $(common_ldflags)
nq_sdl_DEPENDENCIES= $(nq_sdl_libs)
# ... Linux SVGAlib
nq_svga_libs= \
$(nq_client_libs) \
$(nq_cl_plugin_LIBS) \
libs/video/renderer/libQFrenderer.la \
libs/models/libQFmodels.la \
libs/video/targets/libQFsvga.la \
$(nq_client_LIBS)
nq_svga_SOURCES= nq/source/sys_unix.c
nq_svga_LDADD= $(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS)
nq_svga_LDFLAGS= $(common_ldflags)
nq_svga_DEPENDENCIES= $(nq_svga_libs)
# ... X11
nq_x11_libs= \
$(nq_client_libs) \
@ -140,9 +98,7 @@ nq_x11_LDADD= $(nq_x11_libs) \
nq_x11_LDFLAGS= $(common_ldflags)
nq_x11_DEPENDENCIES= $(nq_x11_libs)
# OpenGL-using targets
# ... SGI/Microsoft WGL (Windows OpenGL)
# ... mxe/mingw (Windows)
nq_win_libs= \
$(nq_client_libs) \
$(nq_cl_plugin_LIBS) \

44
qw/source/Makemodule.am
View file

@ -109,48 +109,6 @@ qw_source_libqw_client_a_SOURCES= \
qw/source/cl_parse.c qw/source/cl_pred.c qw/source/cl_rss.c qw/source/cl_skin.c qw/source/cl_slist.c \
qw/source/teamplay.c
# Software-rendering clients
# ... Linux FBDev
qw_client_fbdev_libs= \
$(qw_client_libs) \
$(qw_cl_plugin_LIBS) \
libs/video/renderer/libQFrenderer.la \
libs/models/libQFmodels.la \
libs/video/targets/libQFfbdev.la \
$(qw_client_LIBS)
qw_client_fbdev_SOURCES= qw/source/cl_sys_unix.c
qw_client_fbdev_LDADD= $(qw_client_fbdev_libs) $(NET_LIBS) $(LIBCURL_LIBS)
qw_client_fbdev_LDFLAGS= $(common_ldflags)
qw_client_fbdev_DEPENDENCIES= $(qw_client_fbdev_libs)
# ... Simple DirectMedia Layer, version 1.2 and higher
qw_client_sdl_libs= \
qw/source/libqw_sdl.a \
$(qw_client_libs) \
$(qw_cl_plugin_LIBS) \
libs/video/renderer/libQFrenderer.la \
libs/models/libQFmodels.la \
libs/video/targets/libQFsdl.la \
$(qw_client_LIBS)
qw_client_sdl_SOURCES=qw/source/sdl_link.c
qw_client_sdl_LDADD= qw/source/libqw_sdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
qw_client_sdl_LDFLAGS= $(common_ldflags)
qw_client_sdl_DEPENDENCIES= qw/source/libqw_sdl.a $(qw_client_sdl_libs)
# ... Linux SVGAlib
qw_client_svga_libs= \
$(qw_client_libs) \
$(qw_cl_plugin_LIBS) \
libs/video/renderer/libQFrenderer.la \
libs/models/libQFmodels.la \
libs/video/targets/libQFsvga.la \
$(qw_client_LIBS)
qw_client_svga_SOURCES= qw/source/cl_sys_unix.c
qw_client_svga_LDADD= $(qw_client_svga_libs) $(SVGA_LIBS) $(NET_LIBS) $(LIBCURL_LIBS)
qw_client_svga_LDFLAGS= $(common_ldflags)
qw_client_svga_DEPENDENCIES= $(qw_client_svga_libs)
# ... X11
qw_client_x11_libs= \
$(qw_client_libs) \
@ -167,7 +125,7 @@ qw_client_x11_LDADD= $(qw_client_x11_libs) \
qw_client_x11_LDFLAGS= $(common_ldflags)
qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
# ... SGI/Microsoft WGL (Windows OpenGL)
# ... mxe/mingw (Windows)
qw_client_win_libs= \
$(qw_client_libs) \
$(qw_cl_plugin_LIBS) \