Disable qemu-io on Win32

[qemu] / Makefile.target

diff --git a/Makefile.target b/Makefile.target
index 5158c89..b32d1af 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -84,19 +84,13 @@ ifeq ($(ARCH),i386)
 HELPER_CFLAGS+=-fomit-frame-pointer
 endif
 
-ifeq ($(ARCH),sparc)
-  CFLAGS+=-ffixed-g2 -ffixed-g3
-  ifneq ($(CONFIG_SOLARIS),yes)
-    CFLAGS+=-ffixed-g1 -ffixed-g6
-    HELPER_CFLAGS+=-ffixed-i0
-  endif
+ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc)
+translate.o: CFLAGS := $(CFLAGS) $(call cc-option, $(CFLAGS), -fno-unit-at-a-time,)
 endif
 
-ifeq ($(ARCH),sparc64)
+ifeq ($(ARCH),sparc)
   ifneq ($(CONFIG_SOLARIS),yes)
-    CFLAGS+=-ffixed-g5 -ffixed-g6 -ffixed-g7
-  else
-    CFLAGS+=-ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7
+    HELPER_CFLAGS+=-ffixed-i0
   endif
 endif
 
@@ -554,6 +548,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 LIBS += $(CONFIG_VNC_TLS_LIBS)
 endif
 
+ifdef CONFIG_VNC_SASL
+CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS)
+LIBS += $(CONFIG_VNC_SASL_LIBS)
+endif
+
 ifdef CONFIG_BLUEZ
 LIBS += $(CONFIG_BLUEZ_LIBS)
 endif
@@ -574,12 +573,16 @@ OBJS += pcnet.o
 OBJS += rtl8139.o
 OBJS += e1000.o
 
+# Serial mouse
+OBJS += msmouse.o
+
 ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
 OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
-OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
+OBJS+= cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
+OBJS += device-hotplug.o pci-hotplug.o
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
@@ -598,6 +601,8 @@ OBJS+= unin_pci.o ppc_newworld.o
 # PowerPC 4xx boards
 OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
 OBJS+= ppc440.o ppc440_bamboo.o
+# PowerPC E500 boards
+OBJS+= ppce500_pci.o ppce500_mpc8544ds.o
 ifdef FDT_LIBS
 OBJS+= device_tree.o
 LIBS+= $(FDT_LIBS)
@@ -661,6 +666,7 @@ OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
 OBJS+= tsc2005.o bt-hci-csr.o
 OBJS+= mst_fpga.o mainstone.o
 OBJS+= musicpal.o pflash_cfi02.o
+OBJS+= framebuffer.o
 CPPFLAGS += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_BASE_ARCH), sh4)
@@ -718,6 +724,8 @@ LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
 
+vl.o: qemu-options.h
+
 $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
 
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
@@ -726,20 +734,22 @@ $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
 endif # !CONFIG_USER_ONLY
 
 gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
-       rm -f $@
 ifeq ($(TARGET_XML_FILES),)
-       echo > $@
+       $(call quiet-command,rm -f $@ && echo > $@,"  GEN   $(TARGET_DIR)$@")
 else
-       $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)
+       $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   $(TARGET_DIR)$@")
 endif
 
+qemu-options.h: $(SRC_PATH)/qemu-options.hx
+       $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
+
 clean:
-       rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
+       rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o qemu-options.h gdbstub-xml.c
        rm -f *.d */*.d tcg/*.o
 
 install: all
 ifneq ($(PROGS),)
-       $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+       $(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)"
 endif
 
 # Include automatically generated dependency files