include xpm.h from X11/ (from Deanna Phillips' OpenBSD repository)

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index 3497eb2fb53c7842fc9c3492204c6db43d833915..13c22c54a931ba797bf043cd56383d3caaab9a08 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -10,12 +10,13 @@ CC = gcc
 OPTFLAGS = -O3
 #OPTFLAGS = -g
 
 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)
 
 #LDFLAGS = -Bstatic
 
 CFLAGS = $(OPTFLAGS) $(DEFINES)
 
 #LDFLAGS = -Bstatic

+LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib

 
 INSTALL = install -s
 
 
 INSTALL = install -s
 


@@ -96,7 +97,7 @@ all: sim
 lint:
        alint $(INCLUDES) $(SRCS) > LINT
 
 lint:
        alint $(INCLUDES) $(SRCS) > LINT
 

-sim: $(ALLOBJS)
+sim: $(ALLOBJS) $(TCLXHOME)/libtk.a $(TCLXHOME)/libtcl.a

        $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(ALLOBJS) $(LIBS) -o sim
 
 clean:
        $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDES) $(ALLOBJS) $(LIBS) -o sim
 
 clean: