diff run-octave.in @ 25931:332be8be16eb

dynamically load qt graphics * configure.ac (QT_OPENGL_LIBS): New variable. (LIBOCTGUI_LINK_DEPS): Delete $OPENGL_LIBS from the list. * acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Check for Qt OpenGL module separately from other Qt modules. * subst-cross-config-vals.in.sh, subst-config-vals.in.sh: Substitute it. * build-env.h, build-env.in.cc, toplev.cc: Include QT_OPENGL_LIBS in build info. * libgui/src/module.mk (%canon_reldir%_%canon_reldir%_la_CPPFLAGS): Delete -I$(srcdir)/libgui/graphics from the list. * __init_qt__.cc: Use DEFUN_DLD and DEFMETHOD_DLD macros. Include comment to register qt toolkit using PKG_ADD file. * libgui/graphics/module.mk: Build __init_qt__.oct. * libgui/module.mk (%canon_reldir%_liboctgui_la_LIBADD): Delete $(LIBOCTGUI_GRAPHICS_LIB) from the list. Use $(QT_LIBS) instead of $(LIBOCTGUI_LINK_DEPS). * main-window.cc: (octave_interpreter::octave_interpreter): Don't call install___init_qt___functions or register qt graphics toolkit. * run-octave.in: Add $builddir/libgui/graphics directory to LOADPATH.
author John W. Eaton <jwe@octave.org>
date Fri, 28 Sep 2018 18:18:09 -0400
parents 74ece2b45b4f
children 00f796120a6d
line wrap: on
line diff
--- a/run-octave.in	Mon Oct 15 15:27:36 2018 -0400
+++ b/run-octave.in	Fri Sep 28 18:18:09 2018 -0400
@@ -35,6 +35,7 @@
 d2="$builddir/scripts"
 d3="$builddir/libinterp"
 d4="$top_srcdir/examples/data"
+d5="$builddir/libgui/graphics"
 
 d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
 d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
@@ -48,7 +49,7 @@
 
 octave_executable="$builddir/src/octave"
 
-LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path"
+LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path:$d5"
 IMAGEPATH=".:$top_srcdir/scripts/image"
 DOCFILE="$builddir/doc/interpreter/doc-cache"
 BUILT_IN_DOCSTRINGS_FILE="$builddir/libinterp/DOCSTRINGS"