Mercurial > octave-nkf
view .hgignore @ 15257:7ee62f559a73
Fix compilation under Windows with GUI and LLVM enabled.
* configure.ac (OCTGUI_DLL_DEFS): New substituted variabled. Define it to
-DOCTGUI_DLL under MinGW and MSVC platforms.
(QT_INCDIR, QT_LIBDIR): Replace backslash with forward slash characters.
(OCTGUI_API): New config.h macro.
* src/Makefile.am (MOC_CPPFLAGS): New variable. Define it to -DWIN32 when
compiling Win32 terminal implementation.
(moc-%.cc rule): Use it.
(libqterminal_la_CPPFLAGS): New variable defined to -DWIN32 when compiling
the win32 terminal implementation.
(liboctgui_la_CPPFLAGS): Add @OCTGUI_DLL_DEFS@.
* libgui/src/m-editor/file-editor-tab.cc (QApplication, QFileDialog,
QTextStream): New includes.
* libgui/src/m-editor/find-dialog.cc (find_dialog::search_next): Temporary
fix for compilation with QScintilla < 2.6.
* libgui/src/main-window.cc (QApplication, QLabel): New includes.
* libgui/src/octave-gui.h (octave_start_gui): Decorate with OCTGUI_API.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 30 Aug 2012 15:52:44 +0100 |
parents | 2f2fb099ac3a |
children | d9b955926a50 |
line wrap: on
line source
syntax: regexp # The recurrent (^|/) idiom in the regexps below should be understood # to mean "at any directory" while the ^ idiom means "from the # project's top-level directory". # This one gets created by gnulib during the build, contains no Octave # files. ^gnulib/ # These directories mostly contain cruft during build time, but they # do contain some Octave code. ^libgnu/ ^m4/ # Emacs tools create these (^|/)TAGS$ (^|/)semantic.cache$ (/|^)Makefile\.in$ ^INSTALL$ ^aclocal\.m4 ^build-.*($|/) ^configure$ ^autom4te\.cache($|/) ^config\.h\.in$ # e.g. doc/faq/OctaveFAQ.info # doc/interpreter/octave.info-4 ^doc/.*\.info(-\d)?$ ^doc/\w*/stamp-vti$ ^doc/\w*/version\.texi$ ^doc/interpreter/images\.mk$ # e.g. liboctave/smx-op-inc.mk ^liboctave/[\w-]*\.mk$ ^libinterp/dldfcn/module\.mk$