Enough build fixes to get {sdl,ephyr,fake} to link.

This commit is contained in:
Adam Jackson
2005-12-28 10:02:54 +00:00
parent aeb770f645
commit 05c139d4cd
7 changed files with 42 additions and 28 deletions

View File

@@ -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

View File

@@ -1512,3 +1512,5 @@ DPMSSupported (void)
return FALSE;
}
#endif
void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }

View File

@@ -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));
}