qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[video] Remove libQFjs

Browse source 
It is now redundant with the libQFinput, though nothing actually works yet.
This commit is contained in:
Bill Currie 2021-11-01 12:30:45 +09:00
parent bb1a032564
commit 665790f562
7 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.d/build_control.m4
View file

@ -365,12 +365,10 @@ if test -n "$CL_TARGETS"; then
CD_TARGETS="libs/audio/libQFcd.la"
SND_TARGETS="libs/audio/libQFsound.la"
AUDIO_TARGETS="libs/audio/test/testsound\$(EXEEXT)"
JOY_TARGETS="libs/video/targets/libQFjs.la"
else
unset CDTYPE
unset SOUND_TYPES
CD_TARGETS=""
JOY_TARGETS=""
SND_TARGETS=""
AUDIO_TARGETS=""
fi
@ -434,7 +432,6 @@ QF_SUBST(QWAQ_TARGETS)
QF_SUBST(QW_TARGETS)
QF_SUBST(QW_DESKTOP_DATA)
QF_SUBST(CD_TARGETS)
QF_SUBST(JOY_TARGETS)
QF_SUBST(SND_TARGETS)
QF_SUBST(AUDIO_TARGETS)
QF_SUBST(VID_MODEL_TARGETS)

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

@ -1,9 +1,8 @@
lib_LTLIBRARIES += @JOY_TARGETS@
#lib_LTLIBRARIES +=
noinst_LTLIBRARIES += @VID_TARGETS@ @vid_libs@
EXTRA_LTLIBRARIES += \
libs/video/targets/libQFjs.la \
libs/video/targets/libQFfbdev.la \
libs/video/targets/libQFsvga.la \
libs/video/targets/libQFx11.la \
@ -15,19 +14,6 @@ EXTRA_LTLIBRARIES += \
libs/video/targets/libvid_win.la \
libs/video/targets/libvid_x11.la
joy_linux_src= libs/video/targets/joy_linux.c
joy_win_src= libs/video/targets/joy_win.c
joy_null_src= libs/video/targets/joy_null.c
if JOYTYPE_LINUX
joy_src= $(joy_linux_src)
else
if JOYTYPE_WIN32
joy_src= $(joy_win_src)
else
joy_src= $(joy_null_src)
endif
endif
win_gl_src = libs/video/targets/vid_win_gl.c
win_sw_src = libs/video/targets/vid_win_sw.c
win_vulkan_src = libs/video/targets/vid_win_vulkan.c
@ -48,13 +34,6 @@ endif
js_libs = libs/util/libQFutil.la
libs_video_targets_libQFjs_la_LDFLAGS= $(lib_ldflags)
libs_video_targets_libQFjs_la_LIBADD= $(js_libs)
libs_video_targets_libQFjs_la_DEPENDENCIES=$(js_libs)
libs_video_targets_libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS)
libs_video_targets_libQFjs_la_SOURCES= libs/video/targets/joy.c $(joy_src)
EXTRA_libs_video_targets_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
libs_video_targets_libvid_common_la_SOURCES = \
libs/video/targets/vid.c
libs_video_targets_libvid_common_la_CFLAGS= @PREFER_NON_PIC@

1
nq/source/Makemodule.am
View file

@ -47,7 +47,6 @@ nq_cl_plugin_LIBS= \
nq_client_LIBFILES= \
libs/gib/libQFgib_client.la \
libs/scene/libQFscene.la \
libs/video/targets/libQFjs.la \
libs/audio/libQFcd.la \
libs/audio/libQFsound.la

1
nq/source/cl_main.c
View file

@ -115,7 +115,6 @@ CL_WriteConfiguration (void)
}
Key_WriteBindings (f);
Joy_WriteBindings (f);
Cvar_WriteVariables (f);
Qclose (f);

1
qw/source/Makemodule.am
View file

@ -91,7 +91,6 @@ qw_client_LIBS= \
libs/net/libnet_chan.la \
libs/scene/libQFscene.la \
libs/console/libQFconsole.la \
libs/video/targets/libQFjs.la \
libs/audio/libQFcd.la \
libs/audio/libQFsound.la \
libs/image/libQFimage.la \

1
qw/source/cl_main.c
View file

@ -1513,7 +1513,6 @@ Host_WriteConfiguration (void)
}
Key_WriteBindings (f);
Joy_WriteBindings (f);
Cvar_WriteVariables (f);
Qclose (f);

1
ruamoko/qwaq/Makemodule.am
View file

@ -101,7 +101,6 @@ qwaq_client_libs= \
$(top_builddir)/libs/console/libQFconsole.la \
$(top_builddir)/libs/ui/libQFui.la \
$(top_builddir)/libs/input/libQFinput.la \
$(top_builddir)/libs/video/targets/libQFjs.la \
$(top_builddir)/libs/audio/libQFcd.la \
$(top_builddir)/libs/audio/libQFsound.la \
$(top_builddir)/libs/image/libQFimage.la