Real SCSI device passthrough (v4), by Laurent Vivier.

[mirror_qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 5eae9428b475fd5c5931d034e24c1383c786e0f6..ce76352e64ea2d2738b177643ac8d129151eebb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ OBJS+=irq.o
 OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
 OBJS+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o
 OBJS+=scsi-disk.o cdrom.o
+OBJS+=scsi-generic.o
 OBJS+=usb.o usb-hub.o usb-linux.o usb-hid.o usb-msd.o usb-wacom.o
 OBJS+=sd.o ssi-sd.o
 
@@ -119,9 +120,16 @@ libqemu_common.a: $(OBJS)
        rm -f $@ 
        $(AR) rcs $@ $(OBJS)
 
+QEMU_IMG_BLOCK_OBJS = $(BLOCK_OBJS)
+ifdef CONFIG_WIN32
+QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
+else
+QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-posix.o
+endif
+
 ######################################################################
 
-qemu-img$(EXESUF): qemu-img.o qemu-img-block.o qemu-img-block-raw.o $(BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-img-block.o $(QEMU_IMG_BLOCK_OBJS)
        $(CC) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
 
 qemu-img-%.o: %.c