Fix SDL includes for OS X.

Append to, rather than overwrite CFLAGS.  Extra include paths can be
passed through the environment.

diff --git a/src/sim/makefile b/src/sim/makefile
index 8f4ad9b5db1e529cbb24636131b1f42d97ae0ba6..85c2286d0748339178e7d8bdcaa547b614647708 100644 (file)
--- a/src/sim/makefile
+++ b/src/sim/makefile
@@ -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

diff --git a/src/sim/w_sound.c b/src/sim/w_sound.c
index f1641e8fdb9d6b89e15cb6621cb7d576caa4000f..bbe918a11d81b19377dca28ac905548668b12ceb 100644 (file)
--- a/src/sim/w_sound.c
+++ b/src/sim/w_sound.c
@@ -63,8 +63,8 @@
  * CONSUMER, SO SOME OR ALL OF THE ABOVE EXCLUSIONS AND LIMITATIONS MAY
  * NOT APPLY TO YOU.
  */
  * CONSUMER, SO SOME OR ALL OF THE ABOVE EXCLUSIONS AND LIMITATIONS MAY
  * NOT APPLY TO YOU.
  */

-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include "SDL.h"
+#include "SDL_mixer.h"

 #include "sim.h"
 
 
 #include "sim.h"