Mercurial > octave

comparison run-octave.in @ 25931:332be8be16eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
25930:a00379f6f8c4 25931:332be8be16eb
33 33
34 d1="$top_srcdir/scripts" 34 d1="$top_srcdir/scripts"
35 d2="$builddir/scripts" 35 d2="$builddir/scripts"
36 d3="$builddir/libinterp" 36 d3="$builddir/libinterp"
37 d4="$top_srcdir/examples/data" 37 d4="$top_srcdir/examples/data"
38 d5="$builddir/libgui/graphics"
38 39
39 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/$/:/'` 40 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/$/:/'`
40 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/$/:/'` 41 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/$/:/'`
41 d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'` 42 d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
42 d4_list=`$FIND "$d4" -type d -exec echo '{}' ';' | $SED 's/$/:/'` 43 d4_list=`$FIND "$d4" -type d -exec echo '{}' ';' | $SED 's/$/:/'`
46 d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` 47 d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
47 d4_path=`echo "$d4_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` 48 d4_path=`echo "$d4_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
48 49
49 octave_executable="$builddir/src/octave" 50 octave_executable="$builddir/src/octave"
50 51
51 LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path" 52 LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path:$d5"
52 IMAGEPATH=".:$top_srcdir/scripts/image" 53 IMAGEPATH=".:$top_srcdir/scripts/image"
53 DOCFILE="$builddir/doc/interpreter/doc-cache" 54 DOCFILE="$builddir/doc/interpreter/doc-cache"
54 BUILT_IN_DOCSTRINGS_FILE="$builddir/libinterp/DOCSTRINGS" 55 BUILT_IN_DOCSTRINGS_FILE="$builddir/libinterp/DOCSTRINGS"
55 TEXIMACROSFILE="$top_srcdir/doc/interpreter/macros.texi" 56 TEXIMACROSFILE="$top_srcdir/doc/interpreter/macros.texi"
56 INFOFILE="$top_srcdir/doc/interpreter/octave.info" 57 INFOFILE="$top_srcdir/doc/interpreter/octave.info"