david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new disk image layer

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1030 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-08-01 21:46:49 +00:00
parent 3eb2619fe5
commit b932caba32
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,6 +1,6 @@
include config-host.mak include config-host.mak
CFLAGS=-Wall -O2 -g CFLAGS=-Wall -O2 -g -fno-strict-aliasing
ifdef CONFIG_DARWIN ifdef CONFIG_DARWIN
CFLAGS+= -mdynamic-no-pic CFLAGS+= -mdynamic-no-pic
endif endif
@ -10,9 +10,7 @@ endif
LDFLAGS=-g LDFLAGS=-g
LIBS= LIBS=
DEFINES+=-D_GNU_SOURCE DEFINES+=-D_GNU_SOURCE
ifndef CONFIG_WIN32 TOOLS=qemu-img
TOOLS=qemu-mkcow vmdk2raw
endif
ifdef CONFIG_STATIC ifdef CONFIG_STATIC
LDFLAGS+=-static LDFLAGS+=-static
endif endif
@ -22,11 +20,8 @@ all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
$(MAKE) -C $$d $@ || exit 1 ; \ $(MAKE) -C $$d $@ || exit 1 ; \
done done
qemu-mkcow: qemu-mkcow.c qemu-img: qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c
$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS) $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
vmdk2raw: vmdk2raw.c
$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
dyngen$(EXESUF): dyngen.c dyngen$(EXESUF): dyngen.c
$(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
@ -99,7 +94,7 @@ tarbin:
$(bindir)/qemu-arm \ $(bindir)/qemu-arm \
$(bindir)/qemu-sparc \ $(bindir)/qemu-sparc \
$(bindir)/qemu-ppc \ $(bindir)/qemu-ppc \
$(bindir)/qemu-mkcow $(bindir)/vmdk2raw \ $(bindir)/qemu-img \
$(datadir)/bios.bin \ $(datadir)/bios.bin \
$(datadir)/vgabios.bin \ $(datadir)/vgabios.bin \
$(datadir)/vgabios-cirrus.bin \ $(datadir)/vgabios-cirrus.bin \

6
Makefile.target
View File

@ -161,6 +161,9 @@ endif
DEFINES+=-D_GNU_SOURCE DEFINES+=-D_GNU_SOURCE
LIBS+=-lm LIBS+=-lm
ifndef CONFIG_USER_ONLY
LIBS+=-lz
endif
ifdef CONFIG_WIN32 ifdef CONFIG_WIN32
LIBS+=-lwinmm -lws2_32 -liphlpapi LIBS+=-lwinmm -lws2_32 -liphlpapi
endif endif
@ -237,7 +240,8 @@ ifeq ($(ARCH),alpha)
endif endif
# must use static linking to avoid leaving stuff in virtual address space # must use static linking to avoid leaving stuff in virtual address space
VL_OBJS=vl.o osdep.o block.o monitor.o pci.o console.o VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o
VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o
ifeq ($(TARGET_ARCH), i386) ifeq ($(TARGET_ARCH), i386)
# Hardware support # Hardware support