Mercurial > hg > octave-terminal
changeset 15663:0af1a3d65264 draft
Add msvc-specific qmake bits.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 02 Feb 2012 17:33:59 +0000 |
| parents | 5758e0013246 |
| children | bc807a4a31ab |
| files | libqterminal/libqterminal.pro msvc.pri qterminal/qterminal.pro |
| diffstat | 3 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libqterminal/libqterminal.pro +++ b/libqterminal/libqterminal.pro @@ -60,6 +60,10 @@ win32/QWinTerminalImpl.cpp } +win32-msvc* { + include(../msvc.pri) +} + HEADERS += QTerminal.h \ QTerminal \ QTerminalInterface.h
new file mode 100644 --- /dev/null +++ b/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/qterminal/qterminal.pro +++ b/qterminal/qterminal.pro @@ -7,13 +7,9 @@ INCLUDEPATH = ../libqterminal win32 { - win32-msvc* { - debug: LIBS += -L../libqterminal/debug - release: LIBS += -L../libqterminal/release - } else { - LIBS += -L../libqterminal - } - LIBS += -lqterminal -luser32 -lkernel32 + win32-msvc*: include(../msvc.pri) + LIBS += -L../libqterminal/$$LIBDIR_SUFFIX \ + -lqterminal -luser32 -lkernel32 } else { LIBS += -L../libqterminal -lqterminal -lutil }