Mercurial > hg > octave-terminal
changeset 14318:df86157a4912 gui
Re-enable MSVC/Win32 compilation.
* gui/src/MainWindow.h: Include <QCloseEvent>.
* gui/src/msvc.pri: New file
* gui/src/src.pro: Use it.
* .hgsubstate: Update to current tip of qirc and qterminal repos.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 02 Feb 2012 22:32:30 +0000 |
parents | 3b6177bd63b0 |
children | 136ee6bcadc0 |
files | .hgsubstate gui/src/MainWindow.h gui/src/msvc.pri gui/src/src.pro |
diffstat | 4 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate +++ b/.hgsubstate @@ -1,3 +1,3 @@ f9813bce2c06a6130a68db4478d1b16ddadaf276 gnulib -86a267ce6ab8c3c9fa40f3e0dbc109a26479384e gui/qirc -4535670b65621538da028b2e54b2ba30b7839f95 gui/qterminal +34c2a274a1b607d2616d9903099a0905237c8f80 gui/qirc +75e8afc065a08cbf8400dcb3386c5dc030cf8719 gui/qterminal
--- a/gui/src/MainWindow.h +++ b/gui/src/MainWindow.h @@ -27,6 +27,7 @@ #include <QQueue> #include <Qsci/qsciapis.h> #include <QMdiSubWindow> +#include <QCloseEvent> #include "ResourceManager.h" #include "OctaveLink.h" #include "WorkspaceView.h"
new file mode 100644 --- /dev/null +++ b/gui/src/msvc.pri @@ -0,0 +1,11 @@ +CONFIG += release + +QMAKE_CXXFLAGS += -MP +LIBDIR_SUFFIX = release + +msvc-debug { + QMAKE_CXXFLAGS_RELEASE += -Zi + QMAKE_CXXFLAGS_RELEASE -= -O2 + QMAKE_LFLAGS_RELEASE += -debug + QMAKE_CLEAN += $(DESTDIR)$(QMAKE_TARGET).pdb +}
--- a/gui/src/src.pro +++ b/gui/src/src.pro @@ -27,9 +27,12 @@ languages/es-es.ts \ languages/ru-ru.ts \ languages/uk-ua.ts # Available translations + +win32-msvc*: include(msvc.pri) + LIBS += -lqscintilla2 \ - -L../qirc/libqirc -lqirc \ - -L../qterminal/libqterminal -lqterminal \ + -L../qirc/libqirc/$$LIBDIR_SUFFIX -lqirc \ + -L../qterminal/libqterminal/$$LIBDIR_SUFFIX -lqterminal \ $$system(mkoctfile -p LIBS) \ $$system(mkoctfile -p OCTAVE_LIBS) @@ -64,8 +67,7 @@ win32-msvc* { DEFINES += QSCINTILLA_DLL - #CONFIG += console - include(msvc-debug.pri) + QMAKE_CXXFLAGS += -wd4244 } QMAKE_LFLAGS += $$LFLAGS $$system(mkoctfile -p RLD_FLAG)