diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2003-11-16 23:18:17 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2003-11-16 23:18:17 +0000 |
| commit | de5eaa6452e8bace2251592475459f6d0fde2c15 (patch) | |
| tree | cbb245018165dca78a3ebed427715c5459f2ca8e /Makefile.target | |
| parent | 75175024757fd716dc0f8d50d9a8837b6d88143d (diff) | |
static config for SDL
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@465 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 18daeaba19..b88887641f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -24,6 +24,9 @@ ifeq ($(TARGET_ARCH), i386) ifeq ($(ARCH), i386) PROGS+=$(QEMU_SYSTEM) +ifndef CONFIG_SOFTMMU +CONFIG_STATIC=y +endif endif ifeq ($(ARCH), ppc) @@ -179,17 +182,19 @@ endif VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o ifdef CONFIG_SDL VL_OBJS+=sdl.o -SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm +ifdef CONFIG_STATIC +SDL_LIBS:=$(SDL_STATIC_LIBS) +endif endif VL_LDFLAGS= # specific flags are needed for non soft mmu emulator -ifndef CONFIG_SOFTMMU -VL_LDFLAGS+=-static -Wl,-T,$(SRC_PATH)/i386-vl.ld -endif ifdef CONFIG_STATIC VL_LDFLAGS+=-static endif +ifndef CONFIG_SOFTMMU +VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld +endif $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) |