aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorMichael Roth <mdroth@linux.vnet.ibm.com>2012-01-19 22:04:34 -0600
committerMichael Roth <mdroth@linux.vnet.ibm.com>2012-02-23 15:40:16 -0600
commitd8ca685acbd06b5cccd9fcd7866ded1f453b8311 (patch)
tree96257a1f3db5f9a434068951bdde63ceb594de31 /Makefile.objs
parentc216e5add11d3539810657e5524881fb0bd25d91 (diff)
downloadqemu-d8ca685acbd06b5cccd9fcd7866ded1f453b8311.zip
qemu-d8ca685acbd06b5cccd9fcd7866ded1f453b8311.tar.gz
qemu-d8ca685acbd06b5cccd9fcd7866ded1f453b8311.tar.bz2
qemu-ga: fixes for win32 build of qemu-ga
Various stubs and #ifdefs to compile for Windows using mingw cross-build. Still has 1 linker error due to a dependency on the forthcoming win32 versions of the GAChannel/transport class.
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 6ce8a1d..39c7f4e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -424,12 +424,13 @@ common-obj-y += qmp.o hmp.o
######################################################################
# guest agent
-qga-nested-y = commands.o commands-posix.o guest-agent-command-state.o
-qga-nested-y += channel-posix.o
+qga-nested-y = commands.o guest-agent-command-state.o
+qga-nested-$(CONFIG_POSIX) += commands-posix.o channel-posix.o
+qga-nested-$(CONFIG_WIN32) += commands-win32.o
qga-obj-y = $(addprefix qga/, $(qga-nested-y))
-qga-obj-y += qemu-ga.o qemu-sockets.o module.o qemu-option.o
+qga-obj-y += qemu-ga.o module.o
qga-obj-$(CONFIG_WIN32) += oslib-win32.o
-qga-obj-$(CONFIG_POSIX) += oslib-posix.o
+qga-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-sockets.o qemu-option.o
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)