mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-30 09:48:59 -04:00
Disable compiling of pegmarkdown by default, only used for wiki
- Move unfinished CONFIGs to common retroshare.pri file - Compile and link pegmarkdown only if CONFIG+=wikipoos is set
This commit is contained in:
parent
6bc6e22e12
commit
4e917ea26c
3 changed files with 18 additions and 18 deletions
|
@ -34,13 +34,6 @@ CONFIG += gxsgui
|
|||
|
||||
DEFINES += RS_ENABLE_GXS
|
||||
|
||||
unfinished {
|
||||
CONFIG += gxscircles
|
||||
CONFIG += gxsthewire
|
||||
CONFIG += gxsphotoshare
|
||||
CONFIG += wikipoos
|
||||
}
|
||||
|
||||
# Other Disabled Bits.
|
||||
#CONFIG += framecatcher
|
||||
#CONFIG += blogs
|
||||
|
@ -80,8 +73,6 @@ linux-* {
|
|||
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
||||
LIBS *= -lX11 -lXss
|
||||
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
|
||||
#LIBS *= -lglib-2.0
|
||||
LIBS *= -rdynamic -ldl
|
||||
DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
|
||||
|
@ -199,7 +190,6 @@ win32 {
|
|||
LIBS += ../../libretroshare/src/lib/libretroshare.a
|
||||
LIBS += -L"$$LIBS_DIR/lib"
|
||||
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
LIBS += -lsqlcipher
|
||||
|
||||
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz -lws2_32
|
||||
|
@ -245,8 +235,6 @@ macx {
|
|||
LIBS += -framework CoreFoundation
|
||||
LIBS += -framework Security
|
||||
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
|
||||
LIBS += ../../../lib/libsqlcipher.a
|
||||
#LIBS += -lsqlite3
|
||||
|
||||
|
@ -266,7 +254,6 @@ freebsd-* {
|
|||
LIBS *= -lgnome-keyring
|
||||
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
|
||||
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
LIBS += -lsqlite3
|
||||
}
|
||||
|
||||
|
@ -284,7 +271,6 @@ openbsd-* {
|
|||
LIBS *= -lgnome-keyring
|
||||
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
|
||||
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
LIBS += -lsqlite3
|
||||
|
||||
LIBS *= -rdynamic
|
||||
|
@ -302,6 +288,10 @@ openbsd-* {
|
|||
DEPENDPATH += . ../../libretroshare/src/
|
||||
INCLUDEPATH += ../../libretroshare/src/
|
||||
|
||||
wikipoos {
|
||||
LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
|
||||
}
|
||||
|
||||
# webinterface
|
||||
DEPENDPATH += ../../libresapi/src
|
||||
INCLUDEPATH += ../../libresapi/src
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue