Commit 5c7351a6 authored by Steven Fuller's avatar Steven Fuller

Fixed gcc 3.0 warnings

parent 2e4f156b
...@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
#define BRGR 0x42524752 #define BRGR 0x42524752
......
...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software ...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
/********************************** /**********************************
......
...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software ...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
/* static object info*/ /* static object info*/
......
CC = gcc CC = gcc
#CC = g++ #CC = gcc-3.0
#CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro #CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
#CFLAGS = -g -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro #CFLAGS = -g -Wall -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
...@@ -47,22 +47,22 @@ $(DOBJS): Sounds.h Sprites.h States.h Wolf.h burger.h wolfdef.h ...@@ -47,22 +47,22 @@ $(DOBJS): Sounds.h Sprites.h States.h Wolf.h burger.h wolfdef.h
$(NASM) -f elf -o $@ $< $(NASM) -f elf -o $@ $<
vi_gtk.o: vi_gtk.c vi_gtk.o: vi_gtk.c
gcc -c vi_gtk.c $(CFLAGS) `gtk-config --cflags` $(CC) -c vi_gtk.c $(CFLAGS) `gtk-config --cflags`
swolf3d: $(SOBJS) swolf3d: $(SOBJS)
gcc -o swolf3d $(SOBJS) $(SLFLAGS) $(CC) -o swolf3d $(SOBJS) $(SLFLAGS)
xwolf3d: $(XOBJS) xwolf3d: $(XOBJS)
gcc -o xwolf3d $(XOBJS) $(XLFLAGS) $(CC) -o xwolf3d $(XOBJS) $(XLFLAGS)
gwolf3d: $(GOBJS) gwolf3d: $(GOBJS)
gcc -o gwolf3d $(GOBJS) $(GLFLAGS) $(CC) -o gwolf3d $(GOBJS) $(GLFLAGS)
glwolf3d: $(GLOBJS) glwolf3d: $(GLOBJS)
gcc -o glwolf3d $(GLOBJS) $(GLLFLAGS) $(CC) -o glwolf3d $(GLOBJS) $(GLLFLAGS)
sdlwolf3d: $(DOBJS) sdlwolf3d: $(DOBJS)
gcc -o sdlwolf3d $(DOBJS) $(DLFLAGS) $(CC) -o sdlwolf3d $(DOBJS) $(DLFLAGS)
clean: clean:
rm -rf swolf3d xwolf3d gwolf3d glwolf3d sdlwolf3d *.o rm -rf swolf3d xwolf3d gwolf3d glwolf3d sdlwolf3d *.o
......
...@@ -91,7 +91,7 @@ GPL (see LICENSE) and Bill Heineman (Programmer and Project Lead of the ...@@ -91,7 +91,7 @@ GPL (see LICENSE) and Bill Heineman (Programmer and Project Lead of the
Macintosh version) for answering my inquiries. Macintosh version) for answering my inquiries.
Steven Fuller <relnev@users.sourceforge.net> Steven Fuller <relnev@atdot.org>
---------------------------- ----------------------------
TODO (Stuff to Write About): TODO (Stuff to Write About):
......
...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software ...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
Word *src1,*src2,*dest; /* Used by the sort */ Word *src1,*src2,*dest; /* Used by the sort */
......
...@@ -17,7 +17,9 @@ along with this program; if not, write to the Free Software ...@@ -17,7 +17,9 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include <math.h> #include <math.h>
#include "wolfdef.h" #include "wolfdef.h"
#define DOORPIC 59 #define DOORPIC 59
......
...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software ...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
unsigned char *VideoPointer; unsigned char *VideoPointer;
......
TODO: TODO:
* See TODO in src/TODO
* FX_GLIDE_SWAPINTERVAL=0 is needed for me to prevent jerkyness
* Pause key * Pause key
- With windowed systems, put paused in the title bar? - With windowed systems, put paused in the title bar?
+ Being in a text menu could be the "pause" + Being in a text menu could be the "pause"
......
...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software ...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
/********************************** /**********************************
......
...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software ...@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include "wolfdef.h" #include "wolfdef.h"
/********************************** /**********************************
......
...@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <stdint.h> #include <stdint.h>
#include "wolfdef.h" #include "wolfdef.h"
......
...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <ctype.h> #include <ctype.h>
#include <getopt.h> #include <getopt.h>
#include <setjmp.h> #include <setjmp.h>
......
...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <ctype.h> #include <ctype.h>
#include <SDL/SDL.h> #include <SDL/SDL.h>
......
...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <getopt.h> #include <getopt.h>
#include <vga.h> #include <vga.h>
......
...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <ctype.h> #include <ctype.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment