diff options
| author | aliguori | 2008-08-21 21:25:45 +0200 |
|---|---|---|
| committer | aliguori | 2008-08-21 21:25:45 +0200 |
| commit | cd01b4a312248dd4e12c3d389d1a349cea4015d8 (patch) | |
| tree | dfa745638b54d1ef29a65fac2a2f6e2832998cf3 /Makefile | |
| parent | Fix OSS on OpenBSD (diff) | |
| download | qemu-cd01b4a312248dd4e12c3d389d1a349cea4015d8.tar.gz qemu-cd01b4a312248dd4e12c3d389d1a349cea4015d8.tar.xz qemu-cd01b4a312248dd4e12c3d389d1a349cea4015d8.zip | |
Fix windows build
Right now, the Windows build is broken because of NBD. Using a mingw32 cross
compiler is also badly broken.
This patch fixes the Windows build by stubbing out NBD support until someone
fixes it for Windows. It also santizing the mingw32 cross compiler support
by replacing the --enable-mingw32 option with a compiler check to determine
if we're on windows or not.
Also remove the weird SDL pseudo-detection for mingw32 using a cross compiler.
The hardcoded sdl-config name is seemly arbitrary. If you cross compiler SDL
correctly and modify your PATH variable appropriately, it will Just Work when
cross compiling.
The audio driver detection is also broken for cross compiling so you have to
specify the audio drivers explicitly for now.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5046 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -46,7 +46,10 @@ recurse-all: $(SUBDIR_RULES) BLOCK_OBJS=cutils.o qemu-malloc.o BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o -BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o +BLOCK_OBJS+=block-qcow2.o block-parallels.o +ifndef CONFIG_WIN32 +BLOCK_OBJS+=block-nbd.o +endif ###################################################################### # libqemu_common.a: Target independent part of system emulation. The @@ -54,10 +57,14 @@ BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o # system emulation, i.e. a single QEMU executable should support all # CPUs and machines. -OBJS=nbd.o $(BLOCK_OBJS) +OBJS=$(BLOCK_OBJS) OBJS+=readline.o console.o OBJS+=block.o +ifndef CONFIG_WIN32 +OBJS+=nbd.o +endif + 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 twl92230.o @@ -166,11 +173,11 @@ libqemu_user.a: $(USER_OBJS) rm -f $@ $(AR) rcs $@ $(USER_OBJS) -QEMU_IMG_BLOCK_OBJS = nbd.o $(BLOCK_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 +QEMU_IMG_BLOCK_OBJS += nbd.o qemu-img-block-raw-posix.o endif ###################################################################### |