ia64/xen-unstable

changeset 3907:a456c4743c0f

bitkeeper revision 1.1236.1.8 (421da0af_4ZHSxnqpym3nlttZ_d5fQ)

[PATCH] term.patch

Enable text and RFB interface in the device models

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

===== gui/Makefile 1.2 vs edited =====
author arun.sharma@intel.com[kaf24]
date Thu Feb 24 09:38:55 2005 +0000 (2005-02-24)
parents 8e0ac8ed218b
children 71408f3fa741
files tools/ioemu/gui/Makefile tools/ioemu/include/config.h tools/ioemu/iodev/Makefile tools/ioemu/iodev/main.cc
line diff
     1.1 --- a/tools/ioemu/gui/Makefile	Thu Feb 24 09:11:55 2005 +0000
     1.2 +++ b/tools/ioemu/gui/Makefile	Thu Feb 24 09:38:55 2005 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  TOPDIR= ..
     1.5  CXXFLAGS=-I. -I../include -I..
     1.6 -OBJS= gui.o keymap.o siminterface.o textconfig.o x.o
     1.7 +OBJS= gui.o keymap.o siminterface.o textconfig.o x.o rfb.o term.o
     1.8  
     1.9  all: libgui.a
    1.10  
     2.1 --- a/tools/ioemu/include/config.h	Thu Feb 24 09:11:55 2005 +0000
     2.2 +++ b/tools/ioemu/include/config.h	Thu Feb 24 09:38:55 2005 +0000
     2.3 @@ -388,8 +388,8 @@
     2.4  #define BX_WITH_MACOS 0
     2.5  #define BX_WITH_CARBON 0
     2.6  #define BX_WITH_NOGUI 0
     2.7 -#define BX_WITH_TERM 0
     2.8 -#define BX_WITH_RFB 0
     2.9 +#define BX_WITH_TERM 1
    2.10 +#define BX_WITH_RFB 1
    2.11  #define BX_WITH_AMIGAOS 0
    2.12  #define BX_WITH_SDL 0
    2.13  #define BX_WITH_SVGA 0
     3.1 --- a/tools/ioemu/iodev/Makefile	Thu Feb 24 09:11:55 2005 +0000
     3.2 +++ b/tools/ioemu/iodev/Makefile	Thu Feb 24 09:38:55 2005 +0000
     3.3 @@ -2,7 +2,7 @@ TOPDIR= ..
     3.4  CXXFLAGS=-I. -I../include -I..
     3.5  OBJS=$(patsubst %.cc,%.o,$(wildcard *.cc))
     3.6  BXLIBS = ../gui/libgui.a ../memory/libmemory.a  
     3.7 -LDLIBS= $(BXLIBS) -L/usr/X11R6/lib -lX11 -lXpm -lstdc++ -L ../../../tools/libxc -L ../../../tools/libxutil -lxc -lxutil
     3.8 +LDLIBS= $(BXLIBS) -L/usr/X11R6/lib -lX11 -lXpm -lstdc++ -L ../../../tools/libxc -L ../../../tools/libxutil -lxc -lxutil -lpthread -lncurses
     3.9  
    3.10  all: device-model
    3.11  
     4.1 --- a/tools/ioemu/iodev/main.cc	Thu Feb 24 09:11:55 2005 +0000
     4.2 +++ b/tools/ioemu/iodev/main.cc	Thu Feb 24 09:38:55 2005 +0000
     4.3 @@ -1964,6 +1964,10 @@ bx_bool load_and_init_display_lib () {
     4.4    if (!strcmp (gui_name, "x")) 
     4.5      PLUG_load_plugin (x, PLUGTYPE_OPTIONAL);
     4.6  #endif
     4.7 +#if BX_WITH_TERM
     4.8 +  if (!strcmp (gui_name, "term"))
     4.9 +    PLUG_load_plugin (term, PLUGTYPE_OPTIONAL);
    4.10 +#endif
    4.11  
    4.12  #if BX_GUI_SIGHANDLER
    4.13    // set the flag for guis requiring a GUI sighandler.