summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-06-16 15:17:22 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-16 17:46:57 -0500
commitaccceed914ff6cd0ba9258ff76659141ea24bb62 (patch)
tree9d2495f430b99364479009259eba334ad0e61dc1
parentf29602ca0ed75cac4ef6749bbe9912c33210f72b (diff)
downloadqemu-accceed914ff6cd0ba9258ff76659141ea24bb62.tar.gz
Make sure to use SDL_CFLAGS everywhere we include SDL headers
(cherry picked from commit 537fe2d63f744e7c96ff45b60d09486a81958e06) Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile2
-rw-r--r--Makefile.target2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4f7a55ae01..2894496608 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 f33f7621f7..ba315d6cc9 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