diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-10 17:57:08 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-10 17:57:42 -0500 |
| commit | 2670257db0b987176c8d3fd5194fcdee835f893f (patch) | |
| tree | be251bff47472c0e0bd6857780f4edd80ed3ce5c | |
| parent | aae9547639f0b6c3090f759d7a1653c583ff7da7 (diff) | |
| download | qemu-2670257db0b987176c8d3fd5194fcdee835f893f.tar.gz | |
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 <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.target | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -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 |