diff options
| author | Carlos Romero <kcrashcore@bellsouth.net> | 2004-07-15 09:56:40 +0000 |
|---|---|---|
| committer | Carlos Romero <kcrashcore@bellsouth.net> | 2004-07-15 09:56:40 +0000 |
| commit | 3e52373fc8179a59efc9e7ab22ce0cb5160d0409 (patch) | |
| tree | c3b64d73bebd4e90dd344b5311a2f00511297532 | |
| parent | aeb78eaa980ac93f6af3e947ab1ad8bce5bc5bd1 (diff) | |
Enable i810.
| -rw-r--r-- | hw/kdrive/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/kdrive/i810/Makefile.am | 34 | ||||
| -rw-r--r-- | hw/kdrive/i810/i810.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/i810/i810_video.c | 4 | ||||
| -rw-r--r-- | hw/kdrive/i810/i810draw.c | 2 |
5 files changed, 40 insertions, 5 deletions
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am index 603edb2d3..7c5c406e0 100644 --- a/hw/kdrive/Makefile.am +++ b/hw/kdrive/Makefile.am @@ -17,4 +17,5 @@ SUBDIRS = \ $(FBDEV_SUBDIRS) \ $(VESA_SUBDIRS) \ ati \ - fake + fake \ + i810 diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am new file mode 100644 index 000000000..673351c57 --- /dev/null +++ b/hw/kdrive/i810/Makefile.am @@ -0,0 +1,34 @@ +INCLUDES = \ + @KDRIVE_INCS@ \ + @XSERVER_CFLAGS@ + +bin_PROGRAMS = Xi810 + +noinst_LIBRARIES = libi810.a + +if TSLIB +TSLIB_FLAG = -lts +endif + +libi810_a_SOURCES = \ + i810_cursor.c \ + i810_video.c \ + i810draw.c \ + i810draw.h \ + i810reg.h \ + i810.c \ + i810.h + +Xi810_SOURCES = \ + i810stub.c + +I810_LIBS = \ + libi810.a \ + @KDRIVE_LIBS@ + +Xi810_LDADD = \ + $(I810_LIBS) \ + @XSERVER_LIBS@ \ + $(TSLIB_FLAG) + +Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@ diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c index e36ea816e..9c3f6a3e5 100644 --- a/hw/kdrive/i810/i810.c +++ b/hw/kdrive/i810/i810.c @@ -49,7 +49,7 @@ X Window System is a trademark of The Open Group */ #include "kxv.h" #include "i810.h" -#include "linux/agp.h" +#include "agp.h" #include "i810draw.h" diff --git a/hw/kdrive/i810/i810_video.c b/hw/kdrive/i810/i810_video.c index 8f4cfcf27..47db4bd06 100644 --- a/hw/kdrive/i810/i810_video.c +++ b/hw/kdrive/i810/i810_video.c @@ -75,9 +75,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kxv.h" #include "i810.h" -#include "Xv.h" +#include <X11/extensions/Xv.h> -#include "../../xfree86/common/fourcc.h" +#include "fourcc.h" typedef struct { CARD32 size; diff --git a/hw/kdrive/i810/i810draw.c b/hw/kdrive/i810/i810draw.c index d6d857c4f..2423acfad 100644 --- a/hw/kdrive/i810/i810draw.c +++ b/hw/kdrive/i810/i810draw.c @@ -45,7 +45,7 @@ X Window System is a trademark of The Open Group */ #include "i810.h" #include "i810_reg.h" -#include "Xmd.h" +//#include "Xmd.h" #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" |