From 26e114bfaec20d3ac6282b448a05de381b1680de Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 18 Oct 2011 22:27:41 +0000 Subject: [PATCH] fixed windows lib path fixed qrc resources load git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4643 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/Common/retroshare_plugin.pri | 15 +++++++++------ plugins/LinksCloud/LinksCloud.pro | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index 200ecb1e2..a76e6661a 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -13,6 +13,9 @@ win32 { QMAKE_CC = g++ OBJECTS_DIR = temp/obj MOC_DIR = temp/moc + RCC_DIR = temp/qrc + UI_DIR = temp/ui + DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW DEFINES *= MINIUPNPC_VERSION=13 DESTDIR = lib @@ -40,18 +43,18 @@ win32 { PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release ZLIB_DIR = ../../../lib/zlib-1.2.3 - SSL_DIR = ../../../OpenSSL + SSL_DIR = ../../../../OpenSSL INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src - PRE_TARGETDEPS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a - LIBS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a + PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a + LIBS += ../../libretroshare/src/lib/libretroshare.a - LIBS += ../../libbitdht/libbitdht-build-desktop/lib/libbitdht.a - PRE_TARGETDEPS *= ../../libbitdht/libbitdht-build-desktop/lib/libbitdht.a + LIBS += ../../libbitdht/src/lib/libbitdht.a + PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a - LIBS += -L"../../../lib" + LIBS += -L"../../../../lib" LIBS += -lssl -lcrypto -lgpgme -lpthreadGC2d -lminiupnpc -lz # added after bitdht LIBS += -lws2_32 diff --git a/plugins/LinksCloud/LinksCloud.pro b/plugins/LinksCloud/LinksCloud.pro index e60237825..426d4e6d9 100644 --- a/plugins/LinksCloud/LinksCloud.pro +++ b/plugins/LinksCloud/LinksCloud.pro @@ -1,6 +1,6 @@ !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") -CONFIG *= qt uic debug resources +CONFIG += qt uic qrc release resources SOURCES = p3ranking.cc LinksDialog.cpp rsrankitems.cc AddLinksDialog.cpp LinksCloudPlugin.cpp HEADERS = rsrank.h p3ranking.h LinksDialog.h rsrankitems.h AddLinksDialog.h LinksCloudPlugin.h