Mercurial > octave-nkf
view src/main.cc @ 15262:ad1a980b0cb5
install default values before initializing interpreter (bug #37161)
* octave.cc (octave_initialize_interpreter): Don't call
install_defaults here.
(octave_main): Call install_defaults here.
* main.cc (main): Likewise.
* main-cli.cc (main): Likewise.
* src/Makefile.am (AM_CPPFLAGS): Include -I$(srcdir)/../libcruft/misc,
-I$(srcdir)/../liboctave, and -I$(top_builddir)/libinterp/interpfcn in
the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 30 Aug 2012 12:05:04 -0400 |
parents | a44e4a08fc55 |
children | 9ede91b3872b |
line wrap: on
line source
/* Copyright (C) 2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "defaults.h" #include "octave.h" #include "octave-gui.h" int main (int argc, char **argv) { int retval = 0; octave_process_command_line (argc, argv); install_defaults (); if (octave_starting_gui ()) retval = octave_start_gui (argc, argv); else { octave_initialize_interpreter (argc, argv, 0); retval = octave_execute_interpreter (); } return retval; }