Author: axeld Date: 2009-10-12 18:43:23 +0200 (Mon, 12 Oct 2009) New Revision: 33556 Changeset: http://dev.haiku-os.org/changeset/33556/haiku Modified: haiku/trunk/src/bin/gdb/gdb/Jamfile haiku/trunk/src/bin/gdb/gdb/config-x86/config.h haiku/trunk/src/bin/gdb/gdb/config-x86/init.c Log: * Applied patch by "v" to enable the TUI mode in gdb, see ticket #4738. Modified: haiku/trunk/src/bin/gdb/gdb/Jamfile =================================================================== --- haiku/trunk/src/bin/gdb/gdb/Jamfile 2009-10-12 14:52:17 UTC (rev 33555) +++ haiku/trunk/src/bin/gdb/gdb/Jamfile 2009-10-12 16:43:23 UTC (rev 33556) @@ -10,10 +10,11 @@ # Use gawk's libintl for the time being. # TODO: Put a current version of intl ot src/libs and build a static lib # all interested apps can link against. +UseLibraryHeaders ncurses ; UsePrivateHeaders debug ; SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR=\\\"/etc/locale\\\" - -DMI_OUT=1 ; + -DMI_OUT=1 -DTUI=1 ; # filter warnings we don't want here TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) @@ -22,6 +23,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) cli ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) mi ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) signals ] ; +SEARCH_SOURCE += [ FDirName $(SUBDIR) tui ] ; # architecture specific sources local gdbHaikuArchTargetSources ; @@ -215,6 +217,26 @@ mi-symbol-cmds.c ; +local gdbTUISources = + tui-command.c + tui-data.c + tui-disasm.c + tui-file.c + tui-hooks.c + tui-interp.c + tui-io.c + tui-layout.c + tui-out.c + tui-regs.c + tui-source.c + tui-stack.c + tui-win.c + tui-windata.c + tui-wingeneral.c + tui-winsource.c + tui.c +; + local gdbHaikuTargetSources = haiku-tdep.c solib.c @@ -232,6 +254,7 @@ $(gdbBaseSources) $(gdbGeneratedSources) $(gdbHostSources) + $(gdbTUISources) $(gdbHaikuTargetSources) $(gdbHaikuNativeSources) $(gdbHaikuArchTargetSources) @@ -257,7 +280,7 @@ <gdb>libreadline.a <gawk>libintl.a # use gawk's libintl for the time being - libtermcap.a + libncurses.a libroot.so libdebug.so Modified: haiku/trunk/src/bin/gdb/gdb/config-x86/config.h =================================================================== --- haiku/trunk/src/bin/gdb/gdb/config-x86/config.h 2009-10-12 14:52:17 UTC (rev 33555) +++ haiku/trunk/src/bin/gdb/gdb/config-x86/config.h 2009-10-12 16:43:23 UTC (rev 33556) @@ -310,7 +310,7 @@ #define HAVE_MEMORY_H 1 /* Define if you have the <ncurses.h> header file. */ -/* #undef HAVE_NCURSES_H */ +#define HAVE_NCURSES_H 1 /* Define if you have the <ncurses/ncurses.h> header file. */ /* #undef HAVE_NCURSES_NCURSES_H */ Modified: haiku/trunk/src/bin/gdb/gdb/config-x86/init.c =================================================================== --- haiku/trunk/src/bin/gdb/gdb/config-x86/init.c 2009-10-12 14:52:17 UTC (rev 33555) +++ haiku/trunk/src/bin/gdb/gdb/config-x86/init.c 2009-10-12 16:43:23 UTC (rev 33556) @@ -103,6 +103,13 @@ extern initialize_file_ftype _initialize_mi_cmd_env; extern initialize_file_ftype _initialize_mi_interp; extern initialize_file_ftype _initialize_mi_main; +extern initialize_file_ftype _initialize_tui_hooks; +extern initialize_file_ftype _initialize_tui_interp; +extern initialize_file_ftype _initialize_tui_layout; +extern initialize_file_ftype _initialize_tui_out; +extern initialize_file_ftype _initialize_tui_regs; +extern initialize_file_ftype _initialize_tui_stack; +extern initialize_file_ftype _initialize_tui_win; void initialize_all_files (void) { @@ -207,4 +214,11 @@ _initialize_mi_cmd_env (); _initialize_mi_interp (); _initialize_mi_main (); + _initialize_tui_hooks (); + _initialize_tui_interp (); + _initialize_tui_layout (); + _initialize_tui_out (); + _initialize_tui_regs (); + _initialize_tui_stack (); + _initialize_tui_win (); }