Mercurial > hg > octave-lyh
changeset 15053:6889217b9d78 gui
Modified GUI sources so they can be build inside the source tree, without installing octave first.
* octave-event.h: Modified includes.
* octave-link.h: Modified includes.
* src.pro: Removed all mkoctfile references and added paths.
* symbol-information.h: Modified includes.
author | Jacob Dawid <jacob.dawid@gmail.com> |
---|---|
date | Mon, 30 Jul 2012 09:55:57 +0200 |
parents | ab771158224e |
children | 48ae6a7c69c1 |
files | gui/src/octave-adapter/octave-event.h gui/src/octave-adapter/octave-link.h gui/src/src.pro gui/src/symbol-information.h |
diffstat | 4 files changed, 75 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/octave-adapter/octave-event.h +++ b/gui/src/octave-adapter/octave-event.h @@ -20,7 +20,7 @@ #include <string> #include "octave-event-observer.h" -#include "octave/config.h" +#include "config.h" #include "symtab.h" #include "oct-env.h" #include "pt-eval.h"
--- a/gui/src/octave-adapter/octave-link.h +++ b/gui/src/octave-adapter/octave-link.h @@ -25,34 +25,34 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION #undef PACKAGE_URL -#include "octave/config.h" -#include "octave/cmd-edit.h" -#include "octave/error.h" -#include "octave/file-io.h" -#include "octave/input.h" -#include "octave/lex.h" -#include "octave/load-path.h" -#include "octave/octave.h" -#include "octave/oct-hist.h" -#include "octave/oct-map.h" -#include "octave/oct-obj.h" -#include "octave/ops.h" -#include "octave/ov.h" -#include "octave/ov-usr-fcn.h" -#include "octave/symtab.h" -#include "octave/pt.h" -#include "octave/pt-eval.h" -#include "octave/config.h" -#include "octave/Range.h" -#include "octave/toplev.h" -#include "octave/procstream.h" -#include "octave/sighandlers.h" -#include "octave/debug.h" -#include "octave/sysdep.h" -#include "octave/ov.h" -#include "octave/unwind-prot.h" -#include "octave/utils.h" -#include "octave/variables.h" +#include "config.h" +#include "cmd-edit.h" +#include "error.h" +#include "file-io.h" +#include "input.h" +#include "lex.h" +#include "load-path.h" +#include "octave.h" +#include "oct-hist.h" +#include "oct-map.h" +#include "oct-obj.h" +#include "ops.h" +#include "ov.h" +#include "ov-usr-fcn.h" +#include "symtab.h" +#include "pt.h" +#include "pt-eval.h" +#include "config.h" +#include "Range.h" +#include "toplev.h" +#include "procstream.h" +#include "sighandlers.h" +#include "debug.h" +#include "sysdep.h" +#include "ov.h" +#include "unwind-prot.h" +#include "utils.h" +#include "variables.h" #include "oct-mutex.h" // Standard includes
--- a/gui/src/src.pro +++ b/gui/src/src.pro @@ -31,26 +31,30 @@ win32-msvc*: include(msvc.pri) LIBS += -lreadline -lqscintilla2 \ - -L../qterminal/libqterminal/$$LIBDIR_SUFFIX -lqterminal \ - $$system(mkoctfile -p LIBS) \ - $$system(mkoctfile -p OCTAVE_LIBS) + -L../qterminal/libqterminal/$$LIBDIR_SUFFIX -lqterminal -lm \ + -L../../libcruft/.libs -lcruft \ + -L../../liboctave/.libs -loctave \ + -L../../src/.libs -loctinterp mac { CONFIG -= app_bundle } # Includepaths and libraries to link against: -INCLUDEPATH += . octave-adapter m-editor ../qterminal/libqterminal /usr/include/qt4 \ - $$system(mkoctfile -p INCFLAGS) -INCFLAGS += $$system(mkoctfile -p INCFLAGS) -mac { - INCFLAGS += -I/opt/local/include -} +INCLUDEPATH += . \ + octave-adapter \ + m-editor \ + ../qterminal/libqterminal \ + /usr/include/qt4 \ + ../.. \ + ../../src \ + ../../liboctave \ + ../../libcruft/misc -QMAKE_LIBDIR += $$system(octave-config -p OCTLIBDIR) -unix { - QMAKE_RPATHDIR += $$system(octave-config -p OCTLIBDIR) -} +#QMAKE_LIBDIR += $$system(octave-config -p OCTLIBDIR) +#unix { +# QMAKE_RPATHDIR += $$system(octave-config -p OCTLIBDIR) +#} mac { LFLAGS += -L/opt/local/lib @@ -69,7 +73,7 @@ QMAKE_CXXFLAGS += -wd4244 } -QMAKE_LFLAGS += $$LFLAGS $$system(mkoctfile -p RLD_FLAG) +QMAKE_LFLAGS += $$LFLAGS QMAKE_CXXFLAGS += $$INCFLAGS # Files associated with the project:
--- a/gui/src/symbol-information.h +++ b/gui/src/symbol-information.h @@ -30,34 +30,34 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION #undef PACKAGE_URL -#include "octave/config.h" -#include "octave/cmd-edit.h" -#include "octave/error.h" -#include "octave/file-io.h" -#include "octave/input.h" -#include "octave/lex.h" -#include "octave/load-path.h" -#include "octave/octave.h" -#include "octave/oct-hist.h" -#include "octave/oct-map.h" -#include "octave/oct-obj.h" -#include "octave/ops.h" -#include "octave/ov.h" -#include "octave/ov-usr-fcn.h" -#include "octave/symtab.h" -#include "octave/pt.h" -#include "octave/pt-eval.h" -#include "octave/config.h" -#include "octave/Range.h" -#include "octave/toplev.h" -#include "octave/procstream.h" -#include "octave/sighandlers.h" -#include "octave/debug.h" -#include "octave/sysdep.h" -#include "octave/ov.h" -#include "octave/unwind-prot.h" -#include "octave/utils.h" -#include "octave/variables.h" +#include "config.h" +#include "cmd-edit.h" +#include "error.h" +#include "file-io.h" +#include "input.h" +#include "lex.h" +#include "load-path.h" +#include "octave.h" +#include "oct-hist.h" +#include "oct-map.h" +#include "oct-obj.h" +#include "ops.h" +#include "ov.h" +#include "ov-usr-fcn.h" +#include "symtab.h" +#include "pt.h" +#include "pt-eval.h" +#include "config.h" +#include "Range.h" +#include "toplev.h" +#include "procstream.h" +#include "sighandlers.h" +#include "debug.h" +#include "sysdep.h" +#include "ov.h" +#include "unwind-prot.h" +#include "utils.h" +#include "variables.h" /** * \struct symbol_information