diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-05-01 09:29:23 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-05-01 09:29:23 +0000 |
commit | 58b5f5e029207632b93bd211e746cf85d59c00ca (patch) | |
tree | 5c4b5ed65df2a6fde68fa131993b8928385f3e8e /Makefile.target | |
parent | ee6610785e4979770409fc675f7d889aa390aae5 (diff) | |
parent | 0adb124659cfadf9f0b5c99874c476116f0cf74f (diff) |
Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber
* 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber:
Drop darwin-user
configure: add '--disable-cocoa' switch
raw-posix: Do not use CONFIG_COCOA macro
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/Makefile.target b/Makefile.target index af1cdbc4ab..9f8cb0c495 100644 --- a/Makefile.target +++ b/Makefile.target @@ -153,34 +153,6 @@ obj-y += $(libobj-y) endif #CONFIG_LINUX_USER ######################################################### -# Darwin user emulator target - -ifdef CONFIG_DARWIN_USER - -$(call set-vpath, $(SRC_PATH)/darwin-user) - -QEMU_CFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH) - -# Leave some space for the regular program loading zone -LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000 - -LIBS+=-lmx - -obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \ - gdbstub.o user-exec.o - -obj-i386-y += ioport-user.o - -$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) - -obj-y += $(addprefix ../, $(universal-obj-y)) -obj-y += $(addprefix ../libuser/, $(user-obj-y)) -obj-y += $(addprefix ../libdis-user/, $(libdis-y)) -obj-y += $(libobj-y) - -endif #CONFIG_DARWIN_USER - -######################################################### # BSD user emulator target ifdef CONFIG_BSD_USER |