SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

static config for SDL

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@465 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2003-11-16 23:18:17 +00:00
parent 7517502475
commit de5eaa6452
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.target
View File

@ -24,6 +24,9 @@ ifeq ($(TARGET_ARCH), i386)
ifeq ($(ARCH), i386) ifeq ($(ARCH), i386)
PROGS+=$(QEMU_SYSTEM) PROGS+=$(QEMU_SYSTEM)
ifndef CONFIG_SOFTMMU
CONFIG_STATIC=y
endif
endif endif
ifeq ($(ARCH), ppc) ifeq ($(ARCH), ppc)
@ -179,17 +182,19 @@ endif
VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o
ifdef CONFIG_SDL ifdef CONFIG_SDL
VL_OBJS+=sdl.o 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 endif
VL_LDFLAGS= VL_LDFLAGS=
# specific flags are needed for non soft mmu emulator # 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 ifdef CONFIG_STATIC
VL_LDFLAGS+=-static VL_LDFLAGS+=-static
endif endif
ifndef CONFIG_SOFTMMU
VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld
endif
$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
$(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS)

1
configure vendored
View File

@ -301,6 +301,7 @@ if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=yes" >> $config_mak echo "CONFIG_SDL=yes" >> $config_mak
echo "#define CONFIG_SDL 1" >> $config_h echo "#define CONFIG_SDL 1" >> $config_h
echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak 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 echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak
fi fi
echo -n "VERSION=" >>$config_mak echo -n "VERSION=" >>$config_mak