/[qemu]/qemu/Makefile.target
ViewVC logotype

Diff of /qemu/Makefile.target

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.10 by bellard, Thu Nov 13 01:46:15 2003 UTC revision 1.11 by bellard, Sun Nov 16 23:18:17 2003 UTC
# Line 24  ifeq ($(TARGET_ARCH), i386) Line 24  ifeq ($(TARGET_ARCH), i386)
24    
25  ifeq ($(ARCH), i386)  ifeq ($(ARCH), i386)
26  PROGS+=$(QEMU_SYSTEM)  PROGS+=$(QEMU_SYSTEM)
27    ifndef CONFIG_SOFTMMU
28    CONFIG_STATIC=y
29    endif
30  endif  endif
31    
32  ifeq ($(ARCH), ppc)  ifeq ($(ARCH), ppc)
# Line 179  endif Line 182  endif
182  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
183  ifdef CONFIG_SDL  ifdef CONFIG_SDL
184  VL_OBJS+=sdl.o  VL_OBJS+=sdl.o
185  SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm  ifdef CONFIG_STATIC
186    SDL_LIBS:=$(SDL_STATIC_LIBS)
187    endif
188  endif  endif
189    
190  VL_LDFLAGS=  VL_LDFLAGS=
191  # 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  
192  ifdef CONFIG_STATIC  ifdef CONFIG_STATIC
193  VL_LDFLAGS+=-static  VL_LDFLAGS+=-static
194  endif  endif
195    ifndef CONFIG_SOFTMMU
196    VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld
197    endif
198    
199  $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a  $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
200          $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS)          $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS)

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26