explicitly start sdl_helper with /bin/sh

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index bce51130d2861705997c4ebd2bebf117c4bd0d4c..7e4dd05c1c7a5c30124d5b10f52a98f8d06570d0 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
 
 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 -DCAM -DNET
 CC = gcc
 
 OPTFLAGS = -O3
 #OPTFLAGS = -g
 
 #DEFINES = -DIS_LINUX -DCAM -DNET

-DEFINES = -DIS_LINUX
+DEFINES = -DIS_LINUX -DNO_AIRCRASH

 
 

-CFLAGS = $(OPTFLAGS) $(DEFINES)
+CFLAGS += $(OPTFLAGS) $(DEFINES)

 
 #LDFLAGS = -Bstatic
 
 #LDFLAGS = -Bstatic

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

 
 INSTALL = install -s
 
 
 INSTALL = install -s
 


@@ -26,7 +29,8 @@ INCLUDES = \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \

-       -I$(TKHOME)
+       -I$(TKHOME) \
+       $(SDLINCLUDE)

 
 CPPFLAGS = $(INCLUDES)
 
 
 CPPFLAGS = $(INCLUDES)
 


@@ -35,7 +39,8 @@ LIBS =        $(TCLXHOME)/libtk.a \
        -lm \
         -lX11 \
         -lXext \
        -lm \
         -lX11 \
         -lXext \

-       -lXpm
+       -lXpm \
+       $(SDLLIBS)

 
 SRCS = \
        sim.c \
 
 SRCS = \
        sim.c \


@@ -97,7 +102,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: