diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-12-28 10:02:54 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-12-28 10:02:54 +0000 |
| commit | 05c139d4cdfd11d39c0168d0c80ac1dbdd069b4c (patch) | |
| tree | e449db85c8686fc8fdc5bd01abf06cbf04d1b5f1 /hw/kdrive/src | |
| parent | aeb770f645e2d591b255ec4ab06addcb1beafa5f (diff) | |
Enough build fixes to get {sdl,ephyr,fake} to link.
Diffstat (limited to 'hw/kdrive/src')
| -rw-r--r-- | hw/kdrive/src/Makefile.am | 9 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/src/kshadow.c | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am index b71748b1a..192665ec2 100644 --- a/hw/kdrive/src/Makefile.am +++ b/hw/kdrive/src/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ @KDRIVE_CFLAGS@ -noinst_LIBRARIES = libkdrive.a +noinst_LIBRARIES = libkdrive.a libkdrivestubs.a libkdrive_a_SOURCES = \ fourcc.h \ @@ -26,4 +26,9 @@ libkdrive_a_SOURCES = \ kxv.c \ kxv.h \ vga.c \ - vga.h + vga.h \ + $(top_srcdir)/mi/miinitext.c + +libkdrivestubs_a_SOURCES = \ + $(top_srcdir)/Xi/stubs.c \ + $(top_srcdir)/fb/fbcmap.c diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index cc939d43f..0ddc1cfc3 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1512,3 +1512,5 @@ DPMSSupported (void) return FALSE; } #endif + +void ddxInitGlobals(void) { /* THANK YOU XPRINT */ } diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c index 36537ad40..34e1d5de4 100644 --- a/hw/kdrive/src/kshadow.c +++ b/hw/kdrive/src/kshadow.c @@ -68,12 +68,12 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow KdScreenInfo *screen = pScreenPriv->screen; int fb; - shadowUnset (pScreen); + shadowRemove (pScreen, pScreen->GetScreenPixmap(pScreen)); for (fb = 0; fb < KD_MAX_FB && screen->fb[fb].depth; fb++) { if (screen->fb[fb].shadow) - return shadowSet (pScreen, (*pScreen->GetScreenPixmap) (pScreen), - update, window, randr, 0); + return shadowAdd (pScreen, pScreen->GetScreenPixmap(pScreen), + update, window, randr, 0); } return TRUE; } @@ -81,5 +81,5 @@ KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindow void KdShadowUnset (ScreenPtr pScreen) { - shadowUnset (pScreen); + shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); } |