Revision de5eaa64 Makefile.target
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) |
Also available in: Unified diff