diff options
| author | Keith Packard <keithp@keithp.com> | 2003-09-12 01:49:46 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-09-12 01:49:46 +0000 |
| commit | 6b16b827bb125b43b41b7f8558991e90ada316de (patch) | |
| tree | 683ccff491b65d3f25b208ee08f12f6c559a17df | |
| parent | ce55d3234dc34157f0fc8059a6793cdd17fa4519 (diff) | |
Add some configure options, make the mach64 server build
| -rw-r--r-- | hw/kdrive/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/kdrive/mach64/mach64draw.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/mach64/mach64video.c | 4 | ||||
| -rw-r--r-- | hw/kdrive/vesa/Makefile.am | 9 |
4 files changed, 11 insertions, 5 deletions
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am index 07ea3b9ad..de71762de 100644 --- a/hw/kdrive/Makefile.am +++ b/hw/kdrive/Makefile.am @@ -2,3 +2,4 @@ SUBDIRS = \ src \ linux \ vesa \ + mach64 diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c index 10b24a15b..c02f774d9 100644 --- a/hw/kdrive/mach64/mach64draw.c +++ b/hw/kdrive/mach64/mach64draw.c @@ -29,7 +29,7 @@ #include "mach64.h" #include "mach64draw.h" -#include "Xmd.h" +#include <X11/Xmd.h> #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c index 24d941584..23408fdae 100644 --- a/hw/kdrive/mach64/mach64video.c +++ b/hw/kdrive/mach64/mach64video.c @@ -25,8 +25,8 @@ #endif #include "mach64.h" -#include "Xv.h" -#include "../../xfree86/common/fourcc.h" +#include <X11/extensions/Xv.h> +#include "fourcc.h" #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index de9226b5d..4068abe4d 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -11,14 +11,19 @@ INCLUDES = \ bin_PROGRAMS = Xvesa -Xvesa_SOURCES = \ +noinst_LTLIBRARIES = libvesa.la + +libvesa_la_SOURCES = \ vesa.c \ - vesainit.c \ vbe.c \ vga.c \ vm86.c + +Xvesa_SOURCES = \ + vesainit.c Xvesa_LDADD = \ + $(top_builddir)/hw/kdrive/vesa/libvesa.la \ $(top_builddir)/dix/libdix.la \ $(top_builddir)/os/libos.la \ $(top_builddir)/miext/layer/liblayer.la \ |