src/tclx/ucbsrc/makefile: Micropolis build fixes for recent macOS

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index 9705d6e025af407b98ec4af7344ce080dbecf3f3..3f29de75539fbab2e3b1522b9fc84ed8b7a7ee73 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -5,21 +5,24 @@ TCLXHOME = ../tclx
 TCLLIBRARY = /usr/local/lib/tcl
 TKLIBRARY = /usr/local/lib/tk
 
 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
 
 
 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 -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
 
 #LDFLAGS = -Bstatic
 LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib


@@ -28,7 +31,6 @@ INSTALL = install -s
 
 INCLUDES = \
        -Iheaders \
 
 INCLUDES = \
        -Iheaders \

-       -I$(XPMHOME) \

        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \