From: Anthony Liguori Date: Tue, 16 Jun 2009 20:17:22 +0000 (-0500) Subject: Make sure to use SDL_CFLAGS everywhere we include SDL headers X-Git-Tag: v0.10.6~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=accceed914ff6cd0ba9258ff76659141ea24bb62;p=thirdparty%2Fqemu.git Make sure to use SDL_CFLAGS everywhere we include SDL headers (cherry picked from commit 537fe2d63f744e7c96ff45b60d09486a81958e06) Signed-off-by: Anthony Liguori --- diff --git a/Makefile b/Makefile index 4f7a55ae01c..28944966081 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ cocoa.o: cocoa.m sdl.o: sdl.c keymaps.c sdl_keysym.h -sdl.o audio/sdlaudio.o: CFLAGS += $(SDL_CFLAGS) +sdl.o audio/sdlaudio.o baum.o: CFLAGS += $(SDL_CFLAGS) vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h diff --git a/Makefile.target b/Makefile.target index f33f7621f7e..ba315d6cc92 100644 --- a/Makefile.target +++ b/Makefile.target @@ -724,6 +724,8 @@ LDFLAGS+=-p main.o: CFLAGS+=-p endif +vl.o: CFLAGS+=$(SDL_CFLAGS) + $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a