Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-19 20:34:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplified gxs compilation, now a single switch.

Browse source 
attempted to fixup extra library includes (might not work for everyone).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-16 15:52:49 +00:00
parent 9b776ce6a4
commit 9217dcc8f7
1 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,22 @@
CONFIG += qt gui uic qrc resources uitools idle bitdht CONFIG += qt gui uic qrc resources uitools idle bitdht
# Below is for GXS services. # Below is for GXS services.
CONFIG += photoshare # Should be disabled for releases.
CONFIG += wikipoos CONFIG += gxs
CONFIG += identities
CONFIG += circles gxs {
CONFIG += gxsforums CONFIG += photoshare
CONFIG += posted CONFIG += wikipoos
CONFIG += unfinished CONFIG += identities
CONFIG += gxsgui CONFIG += circles
#CONFIG += thewire CONFIG += gxsforums
CONFIG += posted
CONFIG += unfinished
CONFIG += gxsgui
# thewire is incomplete - dont enable
#CONFIG += thewire
}
#CONFIG += pluginmgr #CONFIG += pluginmgr
@ -54,9 +61,13 @@ linux-* {
LIBS += ../../libretroshare/src/lib/libretroshare.a LIBS += ../../libretroshare/src/lib/libretroshare.a
LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += -lssl -lupnp -lixml -lXss -lgnome-keyring LIBS += -lssl -lupnp -lixml -lXss -lgnome-keyring
LIBS += -lsqlite3
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += -lsqlite3
}
LIBS *= -rdynamic LIBS *= -rdynamic
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
DEFINES *= UBUNTU DEFINES *= UBUNTU
@ -130,10 +141,14 @@ win32 {
#PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a #PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
PRE_TARGETDEPS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a PRE_TARGETDEPS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
LIBS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a LIBS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
gxs {
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a
#LIBS += -lsqlite3
}
LIBS += C:\Development\Rs\v0.5-gxs-b1\openpgpsdk\openpgpsdk-build-desktop\lib\libops.a LIBS += C:\Development\Rs\v0.5-gxs-b1\openpgpsdk\openpgpsdk-build-desktop\lib\libops.a
LIBS += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a
LIBS += -L"../../../lib" LIBS += -L"../../../lib"
LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz -lbz2 LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz -lbz2
# added after bitdht # added after bitdht
@ -231,7 +246,6 @@ DEPENDPATH += . \
gui/elastic gui/elastic
INCLUDEPATH += ../../libretroshare/src/ INCLUDEPATH += ../../libretroshare/src/
INCLUDEPATH += ../../supportlibs/pegmarkdown
# Input # Input
HEADERS += rshare.h \ HEADERS += rshare.h \
@ -922,6 +936,8 @@ photoshare {
wikipoos { wikipoos {
INCLUDEPATH += ../../supportlibs/pegmarkdown
HEADERS += gui/WikiPoos/WikiDialog.h \ HEADERS += gui/WikiPoos/WikiDialog.h \
gui/WikiPoos/WikiAddDialog.h \ gui/WikiPoos/WikiAddDialog.h \
gui/WikiPoos/WikiEditDialog.h \ gui/WikiPoos/WikiEditDialog.h \