From 31b6da027cb7b0a590667b5bc3003e444b04a01f Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Fri, 28 Sep 2001 05:33:58 +0000 Subject: [PATCH] The video version. This WILL break QW and NQ until my next commit. --- libs/video/renderer/Makefile.am | 23 ++---- libs/video/renderer/gl/Makefile.am | 9 ++- libs/video/renderer/sw/Makefile.am | 12 +++ libs/video/renderer/sw32/Makefile.am | 7 ++ libs/video/targets/Makefile.am | 111 +++++++++++++-------------- 5 files changed, 84 insertions(+), 78 deletions(-) diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am index 10a8cb61c..d5d7baad5 100644 --- a/libs/video/renderer/Makefile.am +++ b/libs/video/renderer/Makefile.am @@ -1,35 +1,22 @@ SUBDIRS= gl sw sw32 INCLUDES= -I$(top_srcdir)/include -lib_LTLIBRARIES= libQFrenderer_sw.la libQFrenderer_sw32.la libQFrenderer_gl.la +lib_LTLIBRARIES= @VID_REND_TARGETS@ + +EXTRA_LTLIBRARIES= libQFrenderer_sw.la libQFrenderer_sw32.la libQFrenderer_gl.la common_sources= r_cvar.c r_efrag.c r_ent.c r_graph.c r_light.c r_main.c r_part.c -libQFrenderer_gl_la_LDFLAGS= -version-info 1:0:0 -if BUILD_GL +libQFrenderer_gl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFrenderer_gl_la_LIBADD= gl/libgl.la libQFrenderer_gl_la_SOURCES= $(common_sources) libQFrenderer_gl_la_DEPENDENCIES= gl/libgl.la -else -libQFrenderer_gl_la_SOURCES= -endif -libQFrenderer_sw_la_LDFLAGS= -version-info 1:0:0 -if BUILD_SW libQFrenderer_sw_la_LIBADD= sw/libsw.la libQFrenderer_sw_la_SOURCES= $(common_sources) libQFrenderer_sw_la_DEPENDENCIES= sw/libsw.la -else -libQFrenderer_sw_la_SOURCES= -endif -libQFrenderer_sw32_la_LDFLAGS= -version-info 1:0:0 -if BUILD_SW32 +libQFrenderer_sw32_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFrenderer_sw32_la_LIBADD= sw32/libsw32.la libQFrenderer_sw32_la_SOURCES= $(common_sources) libQFrenderer_sw32_la_DEPENDENCIES= sw32/libsw32.la -else -libQFrenderer_sw32_la_SOURCES= -endif - -#LIBLIST = libQFrenderer_gl.la libQFrenderer_sw.la libQFrenderer_sw32.la diff --git a/libs/video/renderer/gl/Makefile.am b/libs/video/renderer/gl/Makefile.am index 7bb33967a..f605be8be 100644 --- a/libs/video/renderer/gl/Makefile.am +++ b/libs/video/renderer/gl/Makefile.am @@ -1,5 +1,4 @@ -INCLUDES= -I$(top_srcdir)/include -CFLAGS += $(GLX_CFLAGS) +INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS) noinst_LTLIBRARIES= libgl.la @@ -12,3 +11,9 @@ libgl_la_SOURCES= \ else libgl_la_SOURCES= endif + +EXTRA_libgl_la_SOURCES= \ + gl_draw.c gl_dyn_fires.c gl_dyn_lights.c gl_dyn_part.c \ + gl_dyn_textures.c gl_graph.c gl_rmain.c gl_rmisc.c gl_rsurf.c \ + gl_screen.c gl_skin.c gl_sky.c gl_sky_clip.c \ + gl_textures.c gl_warp.c gl_funcs.c noisetextures.c diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am index 9f6e03f3b..eeee964eb 100644 --- a/libs/video/renderer/sw/Makefile.am +++ b/libs/video/renderer/sw/Makefile.am @@ -24,3 +24,15 @@ else libasm_la_SOURCES= libsw_la_SOURCES= endif + +EXTRA_libasm_la_SOURCES= \ + d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S d_varsa.S \ + surf16.S surf8.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S \ + sw_rvarsa.S transform.S + +EXTRA_libsw_la_SOURCES= \ + d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \ + d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c nonintel.c \ + screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \ + sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.c \ + sw_rsurf.c sw_skin.c diff --git a/libs/video/renderer/sw32/Makefile.am b/libs/video/renderer/sw32/Makefile.am index 34cd71c9e..3696fca01 100644 --- a/libs/video/renderer/sw32/Makefile.am +++ b/libs/video/renderer/sw32/Makefile.am @@ -12,3 +12,10 @@ libsw32_la_SOURCES= \ else libsw32_la_SOURCES= endif + +EXTRA_libsw32_la_SOURCES= \ + d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \ + d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c screen.c \ + sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \ + sw32_redge.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c sw32_rsky.c \ + sw32_rsprite.c sw32_rsurf.c sw32_skin.c diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index c600bbf32..5ab85e5a9 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -1,19 +1,22 @@ INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLIDE_CFLAGS) -lib_LTLIBRARIES = @VID_TARGETS@ +lib_LTLIBRARIES= @VID_TARGETS@ -EXTRA_LTLIBRARIES = libQFjs.la libQFfbdev.la libQFsvga.la libQFx11.la libQFglx.la libQFsdl.la libQFsdl32.la libQFsgl.la libQFtdfx.la libQFwgl.la libQFmgl.la +EXTRA_LTLIBRARIES= \ + libQFjs.la libQFfbdev.la libQFglx.la libQFsvga.la libQFx11.la \ + libQFsdl.la libQFsdl32.la libQFsgl.la libQFwgl.la + +noinst_LTLIBRARIES= libasm.la if ASM_ARCH -noinst_LTLIBRARIES = libasm.la +libasm_la_SOURCES= d_copy.S else -noinst_LTLIBRARIES = +libasm_la_SOURCES= endif +EXTRA_libasm_la_SOURCES= d_copy.S -libasm_la_SOURCES = d_copy.S - -libQFjs_la_LDFLAGS= -version-info 1:0:0 - +libQFjs_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFjs_la_CFLAGS= $(JOY_CFLAGS) if JOYTYPE_LINUX libQFjs_la_SOURCES= joy.c joy_linux.c else @@ -23,78 +26,70 @@ else libQFjs_la_SOURCES= joy.c joy_null.c endif endif -libQFjs_la_CFLAGS= $(JOY_CFLAGS) -libQFjs.la: $(libQFjs_la_OBJECTS) $(libQFjs_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFjs_la_LDFLAGS) $(libQFjs_la_OBJECTS) $(libQFjs_la_LIBADD) $(LIBS) -EXTRA_DIST= joy.c joy_linux.c joy_null.c joy_win.c +EXTRA_libQFjs_la_SOURCES= joy.c joy_linux.c joy_null.c joy_win.c in_common_SOURCE= in_common.c in_event.c keys.c old_keys.c - +# # Linux FBdev +# YFLAGS = -d YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h \ fbset_modes_y.tab.h fbset_modes_l.c -libQFfbdev_la_LDFLAGS= -version-info 1:0:0 + +libQFfbdev_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \ - $(in_common_SOURCE) in_fbdev.c vid.c vid_common_sw.c vid_fbdev.c -EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h -libQFfbdev.la: $(libQFfbdev_la_OBJECTS) $(libQFfbdev_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFfbdev_la_LDFLAGS) $(libQFfbdev_la_OBJECTS) $(libQFfbdev_la_LIBADD) $(LIBS) + in_fbdev.c vid.c vid_common_sw.c vid_fbdev.c \ + $(in_common_SOURCE) + fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c $(LTCOMPILE) -Wno-error -c $< fbset_modes_l.lo: $(srcdir)/fbset_modes_l.c $(LTCOMPILE) -Wno-error -c $< -libQFglx_la_LDFLAGS= -version-info 1:0:0 $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) -libQFglx_la_SOURCES= $(in_common_SOURCE) in_x11.c vid.c context_x11.c dga_check.c qfgl_ext.c vid_common_gl.c vid_glx.c -libQFglx.la: $(libQFglx_la_OBJECTS) $(libQFglx_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFglx_la_LDFLAGS) $(libQFglx_la_OBJECTS) $(libQFglx_la_LIBADD) $(LIBS) +# +# OpenGL in X Window +# +libQFglx_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFglx_la_LIBADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) +libQFglx_la_SOURCES= in_x11.c vid.c context_x11.c dga_check.c qfgl_ext.c \ + vid_common_gl.c vid_glx.c \ + $(in_common_SOURCE) -libQFmgl_la_LDFLAGS= -version-info 1:0:0 -libQFmgl_la_SOURCES= $(in_common_SOURCE) in_win.c vid.c vid_common_sw.c vid_mgl.c -libQFmgl.la: $(libQFmgl_la_OBJECTS) $(libQFmgl_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFmgl_la_LDFLAGS) $(libQFmgl_la_OBJECTS) $(libQFmgl_la_LIBADD) $(LIBS) +# +# Simple DirectMedia Library +# +libQFsdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFsdl_la_SOURCES= in_sdl.c vid.c vid_common_sw.c vid_sdl.c \ + $(in_common_SOURCE) -libQFsdl_la_LDFLAGS= -version-info 1:0:0 -libQFsdl_la_SOURCES= $(in_common_SOURCE) in_sdl.c vid.c vid_common_sw.c vid_sdl.c -libQFsdl.la: $(libQFsdl_la_OBJECTS) $(libQFsdl_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFsdl_la_LDFLAGS) $(libQFsdl_la_OBJECTS) $(libQFsdl_la_LIBADD) $(LIBS) +libQFsdl32_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFsdl32_la_SOURCES= in_sdl.c vid.c vid_common_sw32.c vid_sdl32.c \ + $(in_common_SOURCE) -libQFsdl32_la_LDFLAGS= -version-info 1:0:0 -libQFsdl32_la_SOURCES= $(in_common_SOURCE) in_sdl.c vid.c vid_common_sw32.c vid_sdl32.c -libQFsdl32.la: $(libQFsdl32_la_OBJECTS) $(libQFsdl32_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFsdl32_la_LDFLAGS) $(libQFsdl32_la_OBJECTS) $(libQFsdl32_la_LIBADD) $(LIBS) - -libQFsgl_la_LDFLAGS= -version-info 1:0:0 +libQFsgl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFsgl_la_SOURCES= $(in_common_SOURCE) in_sdl.c qfgl_ext.c vid.c vid_common_gl.c vid_sgl.c -libQFsgl.la: $(libQFsgl_la_OBJECTS) $(libQFsgl_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFsgl_la_LDFLAGS) $(libQFsgl_la_OBJECTS) $(libQFsgl_la_LIBADD) $(LIBS) -libQFsvga_la_LDFLAGS= -version-info 1:0:0 -libQFsvga_la_LIBADD= libasm.la -libQFsvga_la_DEPENDENCIES= libasm.la -libQFsvga_la_SOURCES= $(in_common_SOURCE) in_svgalib.c vid.c vid_common_sw.c vid_svgalib.c -libQFsvga.la: $(libQFsvga_la_OBJECTS) $(libQFsvga_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFsvga_la_LDFLAGS) $(libQFsvga_la_OBJECTS) $(libQFsvga_la_LIBADD) $(LIBS) +# +# SVGAlib +# +libQFsvga_la_LIBADD= libasm.la +libQFsvga_la_DEPENDENCIES=libasm.la +libQFsvga_la_SOURCES= in_svgalib.c vid.c vid_common_sw.c vid_svgalib.c \ + $(in_common_SOURCE) -libQFtdfx_la_LDFLAGS= -version-info 1:0:0 -libQFtdfx_la_SOURCES= $(in_common_SOURCE) in_svgalib.c qfgl_ext.c vid.c vid_common_gl.c vid_3dfxsvga.c -libQFtdfx.la: $(libQFtdfx_la_OBJECTS) $(libQFtdfx_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFtdfx_la_LDFLAGS) $(libQFtdfx_la_OBJECTS) $(libQFtdfx_la_LIBADD) $(LIBS) - -libQFwgl_la_LDFLAGS= -version-info 1:0:0 +# +# OpenGL in Win32 +# +libQFwgl_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) libQFwgl_la_SOURCES= $(in_common_SOURCE) in_win.c qfgl_ext.c vid.c vid_common_gl.c vid_wgl.c -libQFwgl.la: $(libQFwgl_la_OBJECTS) $(libQFwgl_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFwgl_la_LDFLAGS) $(libQFwgl_la_OBJECTS) $(libQFwgl_la_LIBADD) $(LIBS) -libQFx11_la_LDFLAGS= -version-info 1:0:0 $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) +# +# X11 software rendering +# +libQFx11_la_LDFLAGS= -version-info 1:0:0 -rpath $(libdir) +libQFx11_la_LIBADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) libQFx11_la_SOURCES= $(in_common_SOURCE) in_x11.c vid.c context_x11.c dga_check.c vid_common_sw.c vid_x11.c -libQFx11.la: $(libQFx11_la_OBJECTS) $(libQFx11_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libQFx11_la_LDFLAGS) $(libQFx11_la_OBJECTS) $(libQFx11_la_LIBADD) $(LIBS) - - -LIBLIST = $(lib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@ # Kill the temp files, hopefully. CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)