From 6c65be497ef86555599884051f6099209b01f70d Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Sun, 15 Apr 2001 06:04:02 +0000 Subject: [PATCH] Hopefully fix attempts to compile video libs that aren't possible. --- configure.in | 9 ++++ libs/video/targets/Makefile.am | 82 ++++++++++++++++++++++------------ 2 files changed, 63 insertions(+), 28 deletions(-) diff --git a/configure.in b/configure.in index 9f8cfdac7..9129f3576 100644 --- a/configure.in +++ b/configure.in @@ -1376,50 +1376,59 @@ if test "x$HAVE_TDFXGL" = xyes -a "x$ENABLE_3DFX" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-3dfx\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-3dfx\$(EXEEXT)" CL_TARGETS="$CL_TARGETS 3dfx" + VID_TARGETS="$VID_TARGETS libQFtdfx.la" fi if test "x$HAVE_FBDEV" = xyes -a "x$ENABLE_FBDEV" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-fbdev\$(EXEEXT)" CL_TARGETS="$CL_TARGETS FBDEV" + VID_TARGETS="$VID_TARGETS libQFfbdev.la" fi if test "x$HAVE_X" = xyes; then if test "x$HAVE_GLX" = xyes -a "x$ENABLE_GLX" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-glx\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-glx\$(EXEEXT)" CL_TARGETS="$CL_TARGETS GLX" + VID_TARGETS="$VID_TARGETS libQFglx.la" fi fi if test "x$HAVE_MGL" = xyes -a "x$ENABLE_MGL" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-mgl\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-mgl\$(EXEEXT)" CL_TARGETS="$CL_TARGETS MGL" + VID_TARGETS="$VID_TARGETS libQFwgl.la" fi if test "x$HAVE_SDL" = xyes -a "x$ENABLE_SDL" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)" CL_TARGETS="$CL_TARGETS SDL" + VID_TARGETS="$VID_TARGETS libQFsdl.la" fi if test "x$HAVE_SGL" = xyes; then if test "x$HAVE_GLX" = xyes -a "x$ENABLE_SGL" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-sgl\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-sgl\$(EXEEXT)" CL_TARGETS="$CL_TARGETS SDL-GL" + VID_TARGETS="$VID_TARGETS libQFsgl.la" fi fi if test "x$HAVE_SVGA" = xyes -a "x$ENABLE_SVGA" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)" CL_TARGETS="$CL_TARGETS SVGAlib" + VID_TARGETS="$VID_TARGETS libQFsvga.la" fi if test "x$mingw" = xyes -a "x$HAVE_GLX" = xyes -a "x$ENABLE_WGL" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-wgl\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-wgl\$(EXEEXT)" CL_TARGETS="$CL_TARGETS WGL" + VID_TARGETS="$VID_TARGETS libQFwgl.la" fi if test "x$HAVE_X" = xyes -a "x$ENABLE_X11" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)" CL_TARGETS="$CL_TARGETS X11" + VID_TARGETS="$VID_TARGETS libQFx11.la" fi if test "x$SV_TARGETS" = xyes; then QW_TARGETS="qw-server\$(EXEEXT) $QW_TARGETS" diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index f2c45cae7..b774de5c8 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -1,8 +1,6 @@ INCLUDES= -I$(top_srcdir)/include -lib_LTLIBRARIES = libQFjs.la libQFfbdev.la libQFmgl.la libQFsdl.la \ - libQFsvga.la libQFx11.la libQFglx.la libQFsgl.la \ - libQFtdfx.la libQFwgl.la +lib_LTLIBRARIES = libQFjs.la $(VID_TARGETS) libQFjs_la_LDFLAGS= -version-info 1:0:0 @@ -18,34 +16,62 @@ endif libQFjs_la_CFLAGS= $(JOY_CFLAGS) # Linux FBdev -YFLAGS = -d -libQFfbdev_la_LDFLAGS= -version-info 1:0:0 -libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l in_fbdev.c vid.c vid_fbdev.c -YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h fbset_modes_y.tab.h fbset_modes_l.c -EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h +if $(HAVE_FBDEV) + YFLAGS = -d + libQFfbdev_la_LDFLAGS= -version-info 1:0:0 + libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \ + in_fbdev.c vid.c vid_fbdev.c + YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h \ + fbset_modes_y.tab.h fbset_modes_l.c + EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h -fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c - $(COMPILE) -Wno-error -c $< -fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c - $(COMPILE) -Wno-error -c $< + fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c + $(COMPILE) -Wno-error -c $< + fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c + $(COMPILE) -Wno-error -c $< +endif -libQFmgl_la_LDFLAGS= -version-info 1:0:0 -libQFmgl_la_SOURCES= in_win.c vid.c vid_common_sw.c vid_mgl.c -libQFsdl_la_LDFLAGS= -version-info 1:0:0 -libQFsdl_la_SOURCES= in_sdl.c vid.c vid_common_sw.c vid_sdl.c -libQFsvga_la_LDFLAGS= -version-info 1:0:0 -libQFsvga_la_SOURCES= d_copy.S in_svgalib.c vid.c vid_common_sw.c vid_svgalib.c -libQFx11_la_LDFLAGS= -version-info 1:0:0 -libQFx11_la_SOURCES= in_x11.c vid.c context_x11.c dga_check.c vid_common_sw.c vid_x11.c +if $(HAVE_MGL) + libQFmgl_la_LDFLAGS= -version-info 1:0:0 + libQFmgl_la_SOURCES= in_win.c vid.c vid_common_sw.c vid_mgl.c +endif -libQFglx_la_LDFLAGS= -version-info 1:0:0 -libQFglx_la_SOURCES= in_x11.c vid.c context_x11.c dga_check.c vid_common_gl.c vid_glx.c -libQFsgl_la_LDFLAGS= -version-info 1:0:0 -libQFsgl_la_SOURCES= in_sdl.c vid.c vid_common_gl.c vid_sgl.c -libQFtdfx_la_LDFLAGS= -version-info 1:0:0 -libQFtdfx_la_SOURCES= in_svgalib.c vid.c vid_common_gl.c vid_3dfxsvga.c -libQFwgl_la_LDFLAGS= -version-info 1:0:0 -libQFwgl_la_SOURCES= in_win.c vid.c vid_wgl.c +if $(HAVE_SDL) + libQFsdl_la_LDFLAGS= -version-info 1:0:0 + libQFsdl_la_SOURCES= in_sdl.c vid.c vid_common_sw.c vid_sdl.c +endif + +if $(HAVE_SVGA) + libQFsvga_la_LDFLAGS= -version-info 1:0:0 + libQFsvga_la_SOURCES= d_copy.S in_svgalib.c vid.c vid_common_sw.c \ + vid_svgalib.c +endif + +if $(HAVE_X11) + libQFx11_la_LDFLAGS= -version-info 1:0:0 + libQFx11_la_SOURCES= in_x11.c vid.c context_x11.c dga_check.c \ + vid_common_sw.c vid_x11.c + +if $(HAVE_GLX) + libQFglx_la_LDFLAGS= -version-info 1:0:0 + libQFglx_la_SOURCES= in_x11.c vid.c context_x11.c dga_check.c \ + vid_common_gl.c vid_glx.c +endif + +if $(HAVE_SGL) + libQFsgl_la_LDFLAGS= -version-info 1:0:0 + libQFsgl_la_SOURCES= in_sdl.c vid.c vid_common_gl.c vid_sgl.c +endif + +if $(HAVE_TDFX) + libQFtdfx_la_LDFLAGS= -version-info 1:0:0 + libQFtdfx_la_SOURCES= in_svgalib.c vid.c vid_common_gl.c vid_3dfxsvga.c +endif + +if $(HAVE_WGL) + libQFwgl_la_LDFLAGS= -version-info 1:0:0 + libQFwgl_la_SOURCES= in_win.c vid.c vid_wgl.c +endif LIBLIST = $(lib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@