Enable warnings and fix them, all of them

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index e74f94e25e986d1553ca167ca2c65b58eccf713b..f773cd9a3ae65bb60df3808e4ba66010694a2163 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -5,18 +5,21 @@ TCLXHOME = ../tclx
 TCLLIBRARY = /usr/local/lib/tcl
 TKLIBRARY = /usr/local/lib/tk
 
+SDLINCLUDE = $$(/bin/sh ./sdl_helper cflags)
+SDLLIBS = $$(/bin/sh ./sdl_helper libs)
+
 CC = gcc
 
 OPTFLAGS = -O3
 #OPTFLAGS = -g
 
-#DEFINES = -DIS_LINUX -DIS_INTEL -DCAM -DNET
-DEFINES = -DIS_LINUX -DIS_INTEL
+#DEFINES = -DIS_LINUX -DCAM -DNET
+DEFINES = -DIS_LINUX #-DNO_AIRCRASH
 
-CFLAGS = $(OPTFLAGS) $(DEFINES)
+CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
 
 #LDFLAGS = -Bstatic
-LDFLAGS=-L/usr/X11/lib
+LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib
 
 INSTALL = install -s
 
@@ -26,7 +29,8 @@ INCLUDES = \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \
-       -I$(TKHOME)
+       -I$(TKHOME) \
+       $(SDLINCLUDE)
 
 CPPFLAGS = $(INCLUDES)
 
@@ -35,7 +39,8 @@ LIBS =        $(TCLXHOME)/libtk.a \
        -lm \
         -lX11 \
         -lXext \
-       -lXpm
+       -lXpm \
+       $(SDLLIBS)
 
 SRCS = \
        sim.c \
@@ -97,7 +102,7 @@ all: sim
 lint:
        alint $(INCLUDES) $(SRCS) > LINT
 
-sim: $(ALLOBJS)
+sim: $(ALLOBJS) $(TCLXHOME)/libtk.a $(TCLXHOME)/libtcl.a
        $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(ALLOBJS) $(LIBS) -o sim
 
 clean: