Revision 6774e44a
b/Makefile | ||
---|---|---|
88 | 88 |
endif |
89 | 89 |
|
90 | 90 |
$(common-obj-y): $(GENERATED_HEADERS) |
91 |
subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o qemu-timer-common.o |
|
92 |
|
|
91 | 93 |
$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis |
92 | 94 |
|
93 | 95 |
$(filter %-user,$(SUBDIR_RULES)): $(GENERATED_HEADERS) $(trace-obj-y) subdir-libdis-user subdir-libuser |
b/Makefile.objs | ||
---|---|---|
7 | 7 |
####################################################################### |
8 | 8 |
# oslib-obj-y is code depending on the OS (win32 vs posix) |
9 | 9 |
oslib-obj-y = osdep.o |
10 |
oslib-obj-$(CONFIG_WIN32) += oslib-win32.o |
|
11 |
oslib-obj-$(CONFIG_POSIX) += oslib-posix.o |
|
10 |
oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
|
|
11 |
oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
|
|
12 | 12 |
|
13 | 13 |
####################################################################### |
14 | 14 |
# block-obj-y is code used by both qemu system emulation and qemu-img |
... | ... | |
143 | 143 |
common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y)) |
144 | 144 |
|
145 | 145 |
common-obj-y += iov.o acl.o |
146 |
common-obj-$(CONFIG_POSIX) += qemu-thread-posix.o compatfd.o |
|
147 |
common-obj-$(CONFIG_WIN32) += qemu-thread-win32.o |
|
146 |
common-obj-$(CONFIG_POSIX) += compatfd.o |
|
148 | 147 |
common-obj-y += notify.o event_notifier.o |
149 | 148 |
common-obj-y += qemu-timer.o qemu-timer-common.o |
150 | 149 |
|
b/libcacard/Makefile | ||
---|---|---|
4 | 4 |
|
5 | 5 |
$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/libcacard) |
6 | 6 |
|
7 |
ifeq ($(CONFIG_WIN32),y) |
|
8 |
QEMU_THREAD=qemu-thread-win32.o |
|
9 |
else |
|
10 |
QEMU_THREAD=qemu-thread-posix.o |
|
11 |
endif |
|
12 |
|
|
13 |
|
|
14 |
QEMU_OBJS=$(addprefix ../, $(QEMU_THREAD) $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o qemu-timer-common.o) |
|
7 |
QEMU_OBJS=$(addprefix ../, $(oslib-obj-y) $(trace-obj-y) qemu-malloc.o qemu-timer-common.o) |
|
15 | 8 |
|
16 | 9 |
QEMU_CFLAGS+=-I../ |
17 | 10 |
|
Also available in: Unified diff