Commit de5eaa6452e8bace2251592475459f6d0fde2c15
1 parent
75175024
static config for SDL
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@465 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
10 additions
and
4 deletions
Makefile.target
| @@ -24,6 +24,9 @@ ifeq ($(TARGET_ARCH), i386) | @@ -24,6 +24,9 @@ ifeq ($(TARGET_ARCH), i386) | ||
| 24 | 24 | ||
| 25 | ifeq ($(ARCH), i386) | 25 | ifeq ($(ARCH), i386) |
| 26 | PROGS+=$(QEMU_SYSTEM) | 26 | PROGS+=$(QEMU_SYSTEM) |
| 27 | +ifndef CONFIG_SOFTMMU | ||
| 28 | +CONFIG_STATIC=y | ||
| 29 | +endif | ||
| 27 | endif | 30 | endif |
| 28 | 31 | ||
| 29 | ifeq ($(ARCH), ppc) | 32 | ifeq ($(ARCH), ppc) |
| @@ -179,17 +182,19 @@ endif | @@ -179,17 +182,19 @@ endif | ||
| 179 | VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o | 182 | VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o |
| 180 | ifdef CONFIG_SDL | 183 | ifdef CONFIG_SDL |
| 181 | VL_OBJS+=sdl.o | 184 | VL_OBJS+=sdl.o |
| 182 | -SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm | 185 | +ifdef CONFIG_STATIC |
| 186 | +SDL_LIBS:=$(SDL_STATIC_LIBS) | ||
| 187 | +endif | ||
| 183 | endif | 188 | endif |
| 184 | 189 | ||
| 185 | VL_LDFLAGS= | 190 | VL_LDFLAGS= |
| 186 | # specific flags are needed for non soft mmu emulator | 191 | # specific flags are needed for non soft mmu emulator |
| 187 | -ifndef CONFIG_SOFTMMU | ||
| 188 | -VL_LDFLAGS+=-static -Wl,-T,$(SRC_PATH)/i386-vl.ld | ||
| 189 | -endif | ||
| 190 | ifdef CONFIG_STATIC | 192 | ifdef CONFIG_STATIC |
| 191 | VL_LDFLAGS+=-static | 193 | VL_LDFLAGS+=-static |
| 192 | endif | 194 | endif |
| 195 | +ifndef CONFIG_SOFTMMU | ||
| 196 | +VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld | ||
| 197 | +endif | ||
| 193 | 198 | ||
| 194 | $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a | 199 | $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a |
| 195 | $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) | 200 | $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) |
configure
| @@ -301,6 +301,7 @@ if test "$sdl" = "yes" ; then | @@ -301,6 +301,7 @@ if test "$sdl" = "yes" ; then | ||
| 301 | echo "CONFIG_SDL=yes" >> $config_mak | 301 | echo "CONFIG_SDL=yes" >> $config_mak |
| 302 | echo "#define CONFIG_SDL 1" >> $config_h | 302 | echo "#define CONFIG_SDL 1" >> $config_h |
| 303 | echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak | 303 | echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak |
| 304 | + echo "SDL_STATIC_LIBS=`sdl-config --static-libs`" >> $config_mak | ||
| 304 | echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak | 305 | echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak |
| 305 | fi | 306 | fi |
| 306 | echo -n "VERSION=" >>$config_mak | 307 | echo -n "VERSION=" >>$config_mak |