Fix SDL includes for OS X.

[micropolis] / src / sim / makefile

diff --git a/src/sim/makefile b/src/sim/makefile
index 9705d6e025af407b98ec4af7344ce080dbecf3f3..85c2286d0748339178e7d8bdcaa547b614647708 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -8,8 +8,8 @@ TKLIBRARY = /usr/local/lib/tk
 SDLINCLUDE =
 SDLLIBS = -lSDL -lSDL_mixer
  
 SDLINCLUDE =
 SDLLIBS = -lSDL -lSDL_mixer
  

-#SDLINCLUDE += $$(pkg-config -cflags sdl)
-#SDLLIBS += $$(pkg-config -libs sdl)
+#SDLINCLUDE += $$(pkg-config --cflags sdl)
+#SDLLIBS += $$(pkg-config --libs sdl)

 
 CC = gcc
 
 
 CC = gcc
 


@@ -19,7 +19,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