aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-10-30 01:18:42 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-10-30 01:18:42 +0000
commitc321f673095506f7fd67af8298eaf361f89fe554 (patch)
treea45cb378118ed99ce2dcd8963b84279faa6fb096
parent7f7f98734192824c3899458963861f2f62b9ed2c (diff)
enabled system emulator build on PowerPC - increased portability of soft mmu code
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@435 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--Makefile.target21
1 files changed, 19 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index cb6a0cc60a..5bd8a8c3b6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -20,11 +20,19 @@ endif
ifdef CONFIG_USER_ONLY
PROGS=$(QEMU_USER)
else
-ifeq ($(ARCH),i386)
ifeq ($(TARGET_ARCH), i386)
+
+ifeq ($(ARCH), i386)
+PROGS+=$(QEMU_SYSTEM)
+endif
+
+ifeq ($(ARCH), ppc)
+ifdef CONFIG_SOFTMMU
PROGS+=$(QEMU_SYSTEM)
endif
endif
+
+endif
endif
ifdef CONFIG_STATIC
@@ -174,8 +182,17 @@ VL_OBJS+=sdl.o
SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm
endif
+VL_LDFLAGS=
+# 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
+VL_LDFLAGS+=-static
+endif
+
$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
- $(CC) -static -Wl,-T,$(SRC_PATH)/i386-vl.ld -o $@ $^ $(LIBS) $(SDL_LIBS)
+ $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS)
sdl.o: sdl.c
$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<