explicitly start sdl_helper with /bin/sh

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index 9705d6e025af407b98ec4af7344ce080dbecf3f3..7e4dd05c1c7a5c30124d5b10f52a98f8d06570d0 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -5,11 +5,8 @@ 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 = $$(/bin/sh ./sdl_helper cflags)
+SDLLIBS = $$(/bin/sh ./sdl_helper libs)

 
 CC = gcc
 
 
 CC = gcc
 


@@ -19,7 +16,7 @@ OPTFLAGS = -O3
 #DEFINES = -DIS_LINUX -DCAM -DNET
 DEFINES = -DIS_LINUX -DNO_AIRCRASH
 
 #DEFINES = -DIS_LINUX -DCAM -DNET
 DEFINES = -DIS_LINUX -DNO_AIRCRASH
 

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

 
 #LDFLAGS = -Bstatic
 LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib
 
 #LDFLAGS = -Bstatic
 LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib