# HG changeset patch # User Michael Goffioul # Date 1328204039 0 # Node ID 0af1a3d65264be14bafbeca4945141f6b61edfbe # Parent 5758e00132468fed8bfe25a8dc47cae1d1b48c9a Add msvc-specific qmake bits. diff -r 5758e0013246 -r 0af1a3d65264 libqterminal/libqterminal.pro --- a/libqterminal/libqterminal.pro Thu Feb 02 15:01:22 2012 +0000 +++ b/libqterminal/libqterminal.pro Thu Feb 02 17:33:59 2012 +0000 @@ -60,6 +60,10 @@ win32/QWinTerminalImpl.cpp } +win32-msvc* { + include(../msvc.pri) +} + HEADERS += QTerminal.h \ QTerminal \ QTerminalInterface.h diff -r 5758e0013246 -r 0af1a3d65264 msvc.pri --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/msvc.pri Thu Feb 02 17:33:59 2012 +0000 @@ -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 +} diff -r 5758e0013246 -r 0af1a3d65264 qterminal/qterminal.pro --- a/qterminal/qterminal.pro Thu Feb 02 15:01:22 2012 +0000 +++ b/qterminal/qterminal.pro Thu Feb 02 17:33:59 2012 +0000 @@ -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 }