XINCLUDE: use /usr/X11R6/include everywhere

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index 9705d6e025af407b98ec4af7344ce080dbecf3f3..afc440ab8c143b3727c26fe7a97f61cb26ffbb67 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -1,25 +1,28 @@
-XINCLUDE = /usr/include/X11
+XINCLUDE = /usr/X11R6/include
 TCLHOME = ../tcl
 TKHOME = ../tk
 TCLXHOME = ../tclx
 TCLLIBRARY = /usr/local/lib/tcl
 TKLIBRARY = /usr/local/lib/tk
 
-SDLINCLUDE =
-SDLLIBS = -lSDL -lSDL_mixer
- 
-#SDLINCLUDE += $$(pkg-config -cflags sdl)
-#SDLLIBS += $$(pkg-config -libs sdl)
+SDLINCLUDE := $(shell /bin/sh sdl_helper cflags)
+SDLLIBS := $(shell /bin/sh sdl_helper libs)
 
 CC = gcc
 
 OPTFLAGS = -O3
 #OPTFLAGS = -g
 
+#Possible defines:
+#ORIGINAL_MONSTER_BEHAVIOUR: The monster is able to walk over water and not die
+#NO_AIRCRASH: The Aircrash-Disaster is disables completely
+#CAM: ?
+#NET: ?
+
 #DEFINES = -DIS_LINUX -DCAM -DNET
-DEFINES = -DIS_LINUX -DNO_AIRCRASH
+DEFINES = -DIS_LINUX -DORIGINAL_MONSTER_BEHAVIOUR #-DNO_AIRCRASH
 
-CFLAGS = $(OPTFLAGS) $(DEFINES)
+CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
 
 #LDFLAGS = -Bstatic
 LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib
@@ -28,7 +31,6 @@ INSTALL = install -s
 
 INCLUDES = \
        -Iheaders \
-       -I$(XPMHOME) \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \