Revision de5eaa64
| b/Makefile.target | ||
|---|---|---|
| 24 | 24 |
|
| 25 | 25 |
ifeq ($(ARCH), i386) |
| 26 | 26 |
PROGS+=$(QEMU_SYSTEM) |
| 27 |
ifndef CONFIG_SOFTMMU |
|
| 28 |
CONFIG_STATIC=y |
|
| 29 |
endif |
|
| 27 | 30 |
endif |
| 28 | 31 |
|
| 29 | 32 |
ifeq ($(ARCH), ppc) |
| ... | ... | |
| 179 | 182 |
VL_OBJS=vl.o block.o ide.o vga.o sb16.o dma.o oss.o |
| 180 | 183 |
ifdef CONFIG_SDL |
| 181 | 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 | 188 |
endif |
| 184 | 189 |
|
| 185 | 190 |
VL_LDFLAGS= |
| 186 | 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 | 192 |
ifdef CONFIG_STATIC |
| 191 | 193 |
VL_LDFLAGS+=-static |
| 192 | 194 |
endif |
| 195 |
ifndef CONFIG_SOFTMMU |
|
| 196 |
VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld |
|
| 197 |
endif |
|
| 193 | 198 |
|
| 194 | 199 |
$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a |
| 195 | 200 |
$(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) |
| b/configure | ||
|---|---|---|
| 301 | 301 |
echo "CONFIG_SDL=yes" >> $config_mak |
| 302 | 302 |
echo "#define CONFIG_SDL 1" >> $config_h |
| 303 | 303 |
echo "SDL_LIBS=`sdl-config --libs`" >> $config_mak |
| 304 |
echo "SDL_STATIC_LIBS=`sdl-config --static-libs`" >> $config_mak |
|
| 304 | 305 |
echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_mak |
| 305 | 306 |
fi |
| 306 | 307 |
echo -n "VERSION=" >>$config_mak |
Also available in: Unified diff