From 2670257db0b987176c8d3fd5194fcdee835f893f Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Fri, 10 Jul 2009 17:57:08 -0500 Subject: Revert "Make sure to use SDL_CFLAGS everywhere we include SDL headers" This reverts commit accceed914ff6cd0ba9258ff76659141ea24bb62. This has proven to cause all sorts of odd build breakages. I don't think it's quite ready for stable. Signed-off-by: Anthony Liguori --- Makefile | 2 +- Makefile.target | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2894496608..4f7a55ae01 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 baum.o: CFLAGS += $(SDL_CFLAGS) +sdl.o audio/sdlaudio.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 ba315d6cc9..f33f7621f7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -724,8 +724,6 @@ 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 -- cgit v1.2.1