diff options
| author | Lars Knoll <lars@trolltech.com> | 2005-07-12 14:50:10 +0000 |
|---|---|---|
| committer | Lars Knoll <lars@trolltech.com> | 2005-07-12 14:50:10 +0000 |
| commit | cda9c7b2678ea08ac6176a9eee72e6e511134b8e (patch) | |
| tree | 62daf8ff7080e4c634ba3307b6d567ddedfca47b | |
| parent | 41002623f314444bd416fd5f445a0425c5b59df0 (diff) | |
add x86emu.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/int10/Makefile.am | 3 | ||||
| -rw-r--r-- | hw/xfree86/x86emu/Makefile.am | 8 |
4 files changed, 13 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index a395ec8b8..ae2e32bf8 100644 --- a/configure.ac +++ b/configure.ac @@ -567,7 +567,7 @@ fi AC_DEFINE_UNQUOTED(X_BYTE_ORDER,[$ENDIAN],[Endian order]) XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" test x$XORG = xyes && case $host_os in - linux-gnu*) + linux*) XORG_OS="linux" XORG_OS_SUBDIR="linux" ;; @@ -750,6 +750,7 @@ hw/xfree86/scanpci/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile +hw/xfree86/x86emu/Makefile hw/xfree86/xaa/Makefile hw/xfree86/xf1bpp/Makefile hw/xfree86/xf4bpp/Makefile diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index af35efe05..fedf47542 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac \ +SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ xf8_32wid loader scanpci dixmods diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index b0ff56f9f..acf8cf8ee 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -17,9 +17,10 @@ endif if INT10_X86EMU AM_CFLAGS = -D_X86EMU -D_PC $(XORG_CFLAGS) -INCLUDES = $(XORG_INCS) -I/home/daniels/x/xorg/xc/extras/x86emu/include -I/home/daniels/x/xorg/xc/extras/x86emu/src/x86emu +INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \ xf86int10.c xf86x86emu.c generic.c x86emu.c +libint10_la_LIBADD = $(srcdir)/../x86emu/libx86emu.a endif if INT10_STUB diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am new file mode 100644 index 000000000..207ac1a58 --- /dev/null +++ b/hw/xfree86/x86emu/Makefile.am @@ -0,0 +1,8 @@ +noinst_LIBRARIES = libx86emu.a + +libx86emu_a_SOURCES = debug.c decode.c fpu.c ops2.c ops.c prim_ops.c sys.c validate.c + +INCLUDES = + +AM_CFLAGS = $(XORG_CFLAGS) + |