diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-03-19 09:42:56 +1030 |
| commit | 015d728bcde5b16a72a976579755421e3023626b (patch) | |
| tree | a77516504f14c8b20f844727f1cb2d4dcb87e757 /hw/xfree86/ramdac | |
| parent | 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070 (diff) | |
| parent | b167583fe234a536aa6187e17f21da85be4f0b7f (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
Diffstat (limited to 'hw/xfree86/ramdac')
| -rw-r--r-- | hw/xfree86/ramdac/Makefile.am | 6 | ||||
| -rw-r--r-- | hw/xfree86/ramdac/xf86Cursor.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index 8d944455f..2b84cb4dd 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -1,8 +1,6 @@ -module_LTLIBRARIES = libramdac.la +noinst_LIBRARIES = libramdac.a -libramdac_la_LDFLAGS = -avoid-version - -libramdac_la_SOURCES = xf86RamDacMod.c xf86RamDac.c xf86RamDacCmap.c \ +libramdac_a_SOURCES = xf86RamDac.c xf86RamDacCmap.c \ xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \ xf86BitOrder.c diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index 08cca6b96..469f48f01 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -44,5 +44,8 @@ void xf86ForceHWCursor (ScreenPtr pScreen, Bool on); #define HARDWARE_CURSOR_NIBBLE_SWAPPED 0x00000800 #define HARDWARE_CURSOR_SHOW_TRANSPARENT 0x00001000 #define HARDWARE_CURSOR_UPDATE_UNHIDDEN 0x00002000 +#ifdef ARGB_CURSOR +#define HARDWARE_CURSOR_ARGB 0x00004000 +#endif #endif /* _XF86CURSOR_H */ |