diff options
| -rw-r--r-- | Makefile.target | 13 | ||||
| -rwxr-xr-x | configure | 1 |
2 files changed, 10 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) @@ -301,6 +301,7 @@ if test "$sdl" = "yes" ; then echo "CONFIG_SDL=yes" >> $config_mak echo "#define CONFIG_SDL 1" >> $config_h echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak + echo "SDL_STATIC_LIBS=`sdl-config --static-libs`" >> $config_mak echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak fi echo -n "VERSION=" >>$config_mak |