Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 14:20:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* minor changes required to get the gui working with PGP,

Browse source 
* improved NetworkView to show signatures, and friends.

I expect these will be cleaned up later - these were purely functional so i could test pgp.

Enable using RS_USE_PGPSSL in rsiface/rsinit.h
   


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-23 15:13:01 +00:00
parent 5f28f76b07
commit 100cf75439
19 changed files with 695 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

36
retroshare-gui/src/RetroShare.pro
View file

@ -9,25 +9,14 @@ UI_DIR = temp/ui
MOC_DIR = temp/moc
################################# Linux ##########################################
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
LIBS += ../../../../lib/linux-g++/libretroshare.a
LIBS += ../../../../lib/linux-g++/libminiupnpc.a
LIBS += ../../../../lib/linux-g++/libssl.a
LIBS += ../../../../lib/linux-g++/libcrypto.a
LIBS += -lQtUiTools
LIBS += -lz
QMAKE_LFLAGS += -L"../../../../lib/linux-g++"
}
linux-g++-64 {
OBJECTS_DIR = temp/linux-g++-64/obj
LIBS += ../../../../lib/linux-g++-64/libretroshare.a
LIBS += ../../../../lib/linux-g++-64/libminiupnpc.a
LIBS += ../../../../lib/linux-g++-64/libssl.a
LIBS += ../../../../lib/linux-g++-64/libcrypto.a
LIBS += -lz
QMAKE_LFLAGS += -L"../../../../lib/linux-g++-64"
}
#################### Cross compilation for windows under Linux ###################
@ -35,15 +24,10 @@ linux-g++-64 {
win32-x-g++ {
OBJECTS_DIR = temp/win32-x-g++/obj
LIBS += ../../../../lib/win32-x-g++/libretroshare.a
LIBS += ../../../../lib/win32-x-g++/libssl.a
LIBS += ../../../../lib/win32-x-g++/libcrypto.a
LIBS += ../../../../lib/win32-x-g++/libminiupnpc.a
LIBS += ../../../../lib/win32-x-g++/libz.a
LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
LIBS += -lQtUiTools
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
LIBS += -lole32 -lwinmm
LIBS += -L"../../../../lib/win32-x-g++"
LIBS += -lpthreadGCE2
LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm
DEFINES *= WIN32
@ -80,6 +64,10 @@ macx {
############################## Common stuff ######################################
LIBS += -lretroshare -lminiupnpc -lssl -lcrypto
LIBS += -lz -lgpgme
LIBS += -lQtUiTools
DEPENDPATH += . \
rsiface \
control \
@ -225,6 +213,7 @@ HEADERS += rshare.h \
gui/channels/mySubscriptionsDialog.h \
gui/elastic/graphwidget.h \
gui/elastic/edge.h \
gui/elastic/arrow.h \
gui/elastic/node.h \
gui/NewsFeed.h \
gui/PeersFeed.h \
@ -429,6 +418,7 @@ SOURCES += main.cpp \
gui/channels/mySubscriptionsDialog.cpp \
gui/elastic/graphwidget.cpp \
gui/elastic/edge.cpp \
gui/elastic/arrow.cpp \
gui/elastic/node.cpp \
gui/NewsFeed.cpp \
gui/PeersFeed.cpp \