From fe4e5117e16d047afdbee54426b7790b23089aa0 Mon Sep 17 00:00:00 2001 From: kh1 Date: Tue, 12 Jan 2010 15:21:46 +0100 Subject: [PATCH] Compile and link on windows. --- src/libs/3rdparty/net7ssh/src/src.pro | 2 +- src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/3rdparty/net7ssh/src/src.pro b/src/libs/3rdparty/net7ssh/src/src.pro index a2425542d38..e65d8cede29 100644 --- a/src/libs/3rdparty/net7ssh/src/src.pro +++ b/src/libs/3rdparty/net7ssh/src/src.pro @@ -15,7 +15,7 @@ win32 { win32-msvc*: QMAKE_CXXFLAGS += -wd4250 -wd4251 -wd4290 DEFINES += _CRT_SECURE_NO_WARNINGS - DEFINES += NE7SSH_EXPORTS _WINDLL _USRDLL _CONSOLE _WINDOWS + DEFINES += NE7SSH_EXPORTS=1 _WINDLL _USRDLL _CONSOLE _WINDOWS } # Input diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri index 2a7e63f88a8..13fb853cf1c 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri +++ b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri @@ -4,7 +4,9 @@ SUPPORT_QT_MAEMO = $$(QTCREATOR_WITH_MAEMO) DEFINES += QTCREATOR_WITH_MAEMO # DEFINES += USE_SSH_LIB # INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src -# LIBS += -L$$PWD/../../../../lib/qtcreator -lNet7ssh +# INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build +# LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan) + HEADERS += $$PWD/maemorunconfiguration.h \ $$PWD/maemomanager.h \ $$PWD/maemotoolchain.h \