From: Deanna Phillips Date: Mon, 11 Feb 2008 13:56:15 +0000 (-0500) Subject: Fix SDL includes for OS X. X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis/commitdiff_plain/0a295df9a93949ae9df6a209c1222547eb4fb091?ds=sidebyside 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 8f4ad9b..85c2286 100644 --- a/src/sim/makefile +++ b/src/sim/makefile @@ -19,7 +19,7 @@ OPTFLAGS = -O3 #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 diff --git a/src/sim/w_sound.c b/src/sim/w_sound.c index f1641e8..bbe918a 100644 --- 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. */ -#include -#include +#include "SDL.h" +#include "SDL_mixer.h" #include "sim.h"