OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Compile vmware_vga only once

Browse Source 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-03-27 18:18:17 +00:00
parent cc01cc8ea2
commit 57448a975e
8 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -180,6 +180,7 @@ hw-obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o
hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o
hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o
hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
hw-obj-$(CONFIG_RC4030) += rc4030.o hw-obj-$(CONFIG_RC4030) += rc4030.o
hw-obj-$(CONFIG_DP8393X) += dp8393x.o hw-obj-$(CONFIG_DP8393X) += dp8393x.o

3
Makefile.target
View File

@ -185,7 +185,7 @@ obj-i386-y = pckbd.o dma.o
obj-i386-y += vga.o obj-i386-y += vga.o
obj-i386-y += mc146818rtc.o i8259.o pc.o obj-i386-y += mc146818rtc.o i8259.o pc.o
obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o
obj-i386-y += vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += vmmouse.o vmport.o hpet.o
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
obj-i386-y += debugcon.o multiboot.o obj-i386-y += debugcon.o multiboot.o
@ -216,7 +216,6 @@ obj-mips-y += g364fb.o jazz_led.o
obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o
obj-mips-y += piix4.o cirrus_vga.o obj-mips-y += piix4.o cirrus_vga.o
obj-mips-y += pflash_cfi01.o obj-mips-y += pflash_cfi01.o
obj-mips-y += vmware_vga.o
obj-microblaze-y = petalogix_s3adsp1800_mmu.o obj-microblaze-y = petalogix_s3adsp1800_mmu.o

1
default-configs/i386-softmmu.mak
View File

@ -3,6 +3,7 @@
CONFIG_USB_OHCI=y CONFIG_USB_OHCI=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y

1
default-configs/mips-softmmu.mak
View File

@ -5,6 +5,7 @@ CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VGA_ISA_MM=y CONFIG_VGA_ISA_MM=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y

1
default-configs/mips64-softmmu.mak
View File

@ -5,6 +5,7 @@ CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VGA_ISA_MM=y CONFIG_VGA_ISA_MM=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y

1
default-configs/mips64el-softmmu.mak
View File

@ -5,6 +5,7 @@ CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VGA_ISA_MM=y CONFIG_VGA_ISA_MM=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y

1
default-configs/mipsel-softmmu.mak
View File

@ -5,6 +5,7 @@ CONFIG_ESP=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VGA_ISA_MM=y CONFIG_VGA_ISA_MM=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y

1
default-configs/x86_64-softmmu.mak
View File

@ -3,6 +3,7 @@
CONFIG_USB_OHCI=y CONFIG_USB_OHCI=y
CONFIG_VGA_PCI=y CONFIG_VGA_PCI=y
CONFIG_VGA_ISA=y CONFIG_VGA_ISA=y
CONFIG_VMWARE_VGA=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_PARALLEL=y CONFIG_PARALLEL=y
CONFIG_I8254=y CONFIG_I8254=y