From 5a80ce90f501602eaddbd70823c44b6382ccd1e7 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 15 Apr 2001 05:04:03 +0000 Subject: [PATCH] fix the -Wno-error issue and vid_fbdev.c is a little closer to compiling --- configure.in | 3 +-- libs/video/targets/Makefile.am | 11 +++++++---- libs/video/targets/vid_fbdev.c | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index db7fc6cab..9f8cfdac7 100644 --- a/configure.in +++ b/configure.in @@ -1258,8 +1258,7 @@ fi dnl We want warnings, lots of warnings... if test "x$GCC" = xyes; then - CFLAGS="$CFLAGS -Wall" -# CFLAGS="$CFLAGS -Wall -Werror" + CFLAGS="$CFLAGS -Wall -Werror" # CFLAGS="$CFLAGS -Wall -pedantic" fi diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index 98afead63..1ebd708d5 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -24,10 +24,10 @@ libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l vid_fbdev.c in_fb 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.o: fbset_modes_y.c - $(COMPILE) -Wno-error -c fbset_modes_y.c -fbset_modes_l.o: fbset_modes_l.c - $(COMPILE) -Wno-error -c fbset_modes_l.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 $< ##libQFmgl_la_LDFLAGS= -version-info 1:0:0 ##libQFmgl_la_SOURCES= in_win.c vid_common_sw.c vid_mgl.c @@ -48,3 +48,6 @@ libQFtdfx_la_SOURCES= in_svgalib.c vid_common_gl.c vid_3dfxsvga.c ##libQFwgl_la_SOURCES= in_win.c vid_wgl.c LIBLIST = $(lib_LTLIBRARIES) @LIBRARY_SEARCH_PATH@ + +# Kill the temp files, hopefully. +CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES) diff --git a/libs/video/targets/vid_fbdev.c b/libs/video/targets/vid_fbdev.c index 690513df3..18ca7971f 100644 --- a/libs/video/targets/vid_fbdev.c +++ b/libs/video/targets/vid_fbdev.c @@ -56,6 +56,7 @@ #include #include #include +#include #include "QF/cmd.h" #include "QF/console.h" @@ -64,6 +65,7 @@ #include "QF/qargs.h" #include "QF/qendian.h" #include "QF/sys.h" +#include "QF/vid.h" #include "fbset.h"