From c615a0302b32389cf00d745c52ad9956419ebf28 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 15 Jun 2011 18:24:47 +0000 Subject: [PATCH] fixed compilation on ubuntu git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-peernet@4270 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- PeerNetQt/src/PeerNetQt.pro | 16 ++++++++++++++-- PeerNetQt/src/main.cpp | 1 + PeerNetQt/src/mainwindow.cpp | 1 + PeerNetQt/src/peernet.cc | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/PeerNetQt/src/PeerNetQt.pro b/PeerNetQt/src/PeerNetQt.pro index 6811c78e6..2c35998b4 100644 --- a/PeerNetQt/src/PeerNetQt.pro +++ b/PeerNetQt/src/PeerNetQt.pro @@ -12,8 +12,8 @@ UI_DIR = temp/ui MOC_DIR = temp/moc CONFIG += bitdht librs -#CONFIG += qt gui uic qrc resources uitools idle bitdht # framecatcher# blogs -#QT += network xml script +CONFIG += qt gui uic qrc resources uitools idle bitdht # framecatcher# blogs +QT += network xml script SOURCES += main.cpp\ mainwindow.cpp \ @@ -62,6 +62,18 @@ macx { CONFIG -= uitools } +linux-g++ { + #CONFIG += version_detail_bash_script + LIBS += ../../libretroshare/src/lib/libretroshare.a + + LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error + + INCLUDEPATH += . + #DEFINES* = MAC_IDLE # for idle feature + CONFIG -= uitools + +} + ############################## Common stuff ###################################### diff --git a/PeerNetQt/src/main.cpp b/PeerNetQt/src/main.cpp index eff11bffc..b6393c800 100644 --- a/PeerNetQt/src/main.cpp +++ b/PeerNetQt/src/main.cpp @@ -1,3 +1,4 @@ +#include #include #include "mainwindow.h" #include "peernet.h" diff --git a/PeerNetQt/src/mainwindow.cpp b/PeerNetQt/src/mainwindow.cpp index bfa769938..798d8bd53 100644 --- a/PeerNetQt/src/mainwindow.cpp +++ b/PeerNetQt/src/mainwindow.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include diff --git a/PeerNetQt/src/peernet.cc b/PeerNetQt/src/peernet.cc index cfc341ae6..d64cc5e36 100644 --- a/PeerNetQt/src/peernet.cc +++ b/PeerNetQt/src/peernet.cc @@ -1,5 +1,6 @@ #include "peernet.h" +#include #include #include