Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-25 14:56:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove gxs CONFIG, it's always enabled now anyways

Browse Source
This commit is contained in:
AsamK 2015-09-04 17:48:20 +02:00
parent 4e917ea26c
commit 1f134d3431
4 changed files with 107 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/libretroshare.pro
View File

@ -7,11 +7,6 @@ CONFIG -= qt
TARGET = retroshare TARGET = retroshare
TARGET_PRL = libretroshare TARGET_PRL = libretroshare
#GXS Stuff.
# This should be disabled for releases until further notice.
CONFIG += gxs
#CONFIG += dsdv #CONFIG += dsdv
profiling { profiling {
@ -696,8 +691,6 @@ SOURCES += zeroconf/p3zcnatassist.cc \
# new gxs cache system # new gxs cache system
# this should be disabled for releases until further notice. # this should be disabled for releases until further notice.
gxs {
DEFINES *= RS_ENABLE_GXS
DEFINES *= SQLITE_HAS_CODEC DEFINES *= SQLITE_HAS_CODEC
DEFINES *= GXS_ENABLE_SYNC_MSGS DEFINES *= GXS_ENABLE_SYNC_MSGS
@ -818,7 +811,6 @@ gxs {
SOURCES += services/p3photoservice.cc \ SOURCES += services/p3photoservice.cc \
serialiser/rsphotoitems.cc \ serialiser/rsphotoitems.cc \
}
@ -858,6 +850,3 @@ test_bitdht {
# ENABLED UDP NOW. # ENABLED UDP NOW.
} }

4
retroshare-gui/src/retroshare-gui.pro
View File

@ -30,10 +30,6 @@ CONFIG += gxschannels
CONFIG += posted CONFIG += posted
CONFIG += gxsgui CONFIG += gxsgui
# Gxs is always enabled now.
DEFINES += RS_ENABLE_GXS
# Other Disabled Bits. # Other Disabled Bits.
#CONFIG += framecatcher #CONFIG += framecatcher
#CONFIG += blogs #CONFIG += blogs

4
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -10,10 +10,6 @@ CONFIG += webui
CONFIG -= qt xml gui CONFIG -= qt xml gui
CONFIG += link_prl CONFIG += link_prl
# if you are linking against the libretroshare with gxs.
# this option links against the required sqlite library.
CONFIG += gxs
#CONFIG += debug #CONFIG += debug
debug { debug {
QMAKE_CFLAGS -= -O2 QMAKE_CFLAGS -= -O2

3
retroshare.pri
View File

@ -1,3 +1,6 @@
# Gxs is always enabled now.
DEFINES *= RS_ENABLE_GXS
unix { unix {
isEmpty(PREFIX) { PREFIX = "/usr" } isEmpty(PREFIX) { PREFIX = "/usr" }
isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" } isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" }