mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-04-23 16:39:16 -04:00
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
This commit is contained in:
parent
35354bb73c
commit
c615a0302b
@ -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 ######################################
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
#include <stdio.h>
|
||||
#include <QtGui/QApplication>
|
||||
#include "mainwindow.h"
|
||||
#include "peernet.h"
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <QTimer>
|
||||
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
|
||||
#include "peernet.h"
|
||||
#include <stdio.h>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user