Mercurial > octave
diff libgui/src/module.mk @ 31222:1a0756f7c90a
disable experimental terminal widget when building without qscintilla
* command-widget.cc: inlcude into #if defined (HAVE_QSCINTILLA)
* main-window.cc: include command-widget.h only if HAVE_QSCINTILLA
* module.mk: only build moc-command-widget.cc if HAVE_QSCINTILLA
* octave-qobject.cc: include command-widget.h only if HAVE_QSCINTILLA,
(base_qobject::terminal_widget): use conditional compilation where
referring to new terminal widget
* terminal-dock-widget.cc: include command-widget.h only if HAVE_QSCINTILLA,
(terminal_dock_widget, init_command_prompt): use conditional compilation
where referring to new terminal widget
* terminal-dock-widget.h: use conditional compilation where referring to
new terminal widget Thu Sep 01 02:34:37 2022 +0200
* octave.cc (cmdline_options): only return true on experimental terminal
widget option if built with scintilla
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Sat, 03 Sep 2022 00:18:49 +0200 |
parents | a0e13472457d |
children | a103cfd738c5 |
line wrap: on
line diff
--- a/libgui/src/module.mk Wed Aug 31 22:04:02 2022 +0200 +++ b/libgui/src/module.mk Sat Sep 03 00:18:49 2022 +0200 @@ -265,17 +265,23 @@ $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | %reldir%/m-editor/$(octave_dirstamp) +OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC = \ + %reldir%/moc-command-widget.cc + +$(OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC): | %reldir%/$(octave_dirstamp) + octave_gui_MOC += \ - $(OCTAVE_GUI_SRC_M_EDITOR_MOC) + $(OCTAVE_GUI_SRC_M_EDITOR_MOC) \ + $(OCTAVE_GUI_SRC_COMMAND_WIDGET_MOC) DIRSTAMP_FILES += \ - %reldir%/m-editor/$(octave_dirstamp) + %reldir%/m-editor/$(octave_dirstamp) \ + %reldir%/$(octave_dirstamp) endif OCTAVE_GUI_SRC_MOC = \ %reldir%/moc-external-editor-interface.cc \ - %reldir%/moc-command-widget.cc \ %reldir%/moc-community-news.cc \ %reldir%/moc-dialog.cc \ %reldir%/moc-documentation-dock-widget.cc \