diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index b68f7ded6..a0f1ed842 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -183,7 +183,7 @@ linux-* { INCLUDEPATH *= /usr/lib/x86_64-linux-gnu/glib-2.0/include/ INCLUDEPATH *= /usr/lib/i386-linux-gnu/glib-2.0/include/ - OPENPGPSDK_DIR = ../../openpgpsdk/include + OPENPGPSDK_DIR = ../../openpgpsdk/src INCLUDEPATH *= $${OPENPGPSDK_DIR} DESTDIR = lib diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc index 10c32219f..24f072fa0 100644 --- a/libretroshare/src/pgp/pgphandler.cc +++ b/libretroshare/src/pgp/pgphandler.cc @@ -13,7 +13,7 @@ extern "C" { #include #include #include -#include +#include } #include "pgphandler.h" #include "retroshare/rsiface.h" // For rsicontrol. diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index 1d5503674..1973c70a6 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -35,10 +35,10 @@ linux-* { QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64 PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a - PRE_TARGETDEPS *= ../../openpgpsdk/lib/libops.a + PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a LIBS += ../../libretroshare/src/lib/libretroshare.a - LIBS += ../../openpgpsdk/lib/libops.a -lbz2 + LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += -lssl -lupnp -lixml -lXss -lgnome-keyring LIBS *= -rdynamic DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions @@ -114,7 +114,7 @@ win32 { PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a - LIBS += ../../openpgpsdk/lib/libops.a -lbz2 + LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += -L"../../../lib" LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz # added after bitdht