Mercurial > octave-nkf
comparison libgui/src/main-window.cc @ 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 | 359098ad343e |
| children | c5d09a57ceb2 |
comparison
equal
deleted
inserted
replaced
| 15256:79baa37fde7a | 15257:7ee62f559a73 |
|---|---|
| 18 along with Octave; see the file COPYING. If not, see | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | 19 <http://www.gnu.org/licenses/>. |
| 20 | 20 |
| 21 */ | 21 */ |
| 22 | 22 |
| 23 #include <QApplication> | |
| 24 #include <QLabel> | |
| 23 #include <QMenuBar> | 25 #include <QMenuBar> |
| 24 #include <QMenu> | 26 #include <QMenu> |
| 25 #include <QAction> | 27 #include <QAction> |
| 26 #include <QSettings> | 28 #include <QSettings> |
| 27 #include <QStyle> | 29 #include <QStyle> |