Mercurial > octave-nkf
view libinterp/link-deps.mk @ 20281:6fe746def1aa stable
Also load settings and translations in --no-gui mode (bugs #44222 and #45199)
* annotation-dialog.cc (annotation_dialog::init, annotation_dialog::button_clicked): ensure settings are initialized
* octave-gui.cc (octave_start_gui): eventually run wizard, load settings and translations even when not starting the gui
* octave-gui.cc (octave_start_gui): now settings are loaded, only call "w.read_settings" when starting the gui
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Tue, 02 Jun 2015 00:12:30 +0200 |
parents | 82c94987abc6 |
children | 0ce7d8303152 |
line wrap: on
line source
include $(top_srcdir)/liboctave/link-deps.mk if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTINTERP_LINK_DEPS = else LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS) endif LIBOCTINTERP_LINK_DEPS += \ $(FT2_LIBS) \ $(HDF5_LIBS) \ $(Z_LIBS) \ $(FFTW_XLIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) \ $(GL2PS_LIBS) \ $(LLVM_LIBS) \ $(JAVA_LIBS) \ $(LAPACK_LIBS) LIBOCTINTERP_LINK_OPTS = \ $(FT2_LDFLAGS) \ $(HDF5_LDFLAGS) \ $(Z_LDFLAGS) \ $(FFTW_XLDFLAGS) \ $(LLVM_LDFLAGS) OCT_LINK_DEPS = OCT_LINK_OPTS = $(LDFLAGS) if AMCOND_LINK_ALL_DEPS LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS) LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS) OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS) OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS) OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) endif