aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-11-01 11:14:39 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-01 11:14:39 -0500
commit4ba79505f43bd0ace35c3fe42197eb02e7e0478e (patch)
treeeb1ecd216c1134a88ac0e2d3bc7185319c82fb95 /Makefile.objs
parentd971919f08ca300e7b3595a4c5ddaea2ce8fc3ba (diff)
parent64f735920ad319aee860e56bb9bad6cfccf4ad40 (diff)
downloadqemu-4ba79505f43bd0ace35c3fe42197eb02e7e0478e.zip
qemu-4ba79505f43bd0ace35c3fe42197eb02e7e0478e.tar.gz
qemu-4ba79505f43bd0ace35c3fe42197eb02e7e0478e.tar.bz2
Merge remote-tracking branch 'kraxel/pixman.v3' into staging
* kraxel/pixman.v3: (22 commits) pixman: drop obsolete fields from DisplaySurface pixman/vnc: remove dead code. pixman/vnc: remove rgb_prepare_row* functions pixman/vnc: use pixman images in vnc. pixman: switch screendump function. vga: stop direct access to DisplaySurface fields. qxl: stop direct access to DisplaySurface fields. console: don't set PixelFormat alpha fields for 32bpp console: make qemu_alloc_display static pixman: add pixman image to DisplaySurface pixman: helper functions pixman: windup in configure & makefiles pixman: add submodule console: remove DisplayAllocator console: remove dpy_gfx_fill vga: fix text mode updating console: init displaychangelisteners on register console: untangle gfx & txt updates console: s/TextConsole/QemuConsole/ console: move set_mouse + cursor_define callbacks ... Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 2b5427e..593a592 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -65,6 +65,7 @@ common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net.o net/
common-obj-y += qom/
common-obj-y += readline.o console.o cursor.o
+common-obj-y += qemu-pixman.o
common-obj-y += $(oslib-obj-y)
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o