Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switched on Markdown Rendering in the GUI.

Browse Source 
Enabled linking against pegmarkdown library.
Added Circle files to .pro, but disabled for now.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-12-12 19:27:02 +00:00
parent 3eaf844ec8
commit 2d4c89aacf
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
retroshare-gui/src/RetroShare.pro
View File

@ -3,12 +3,13 @@ CONFIG += qt gui uic qrc resources uitools idle bitdht
# Below is for GXS services. # Below is for GXS services.
CONFIG += photoshare CONFIG += photoshare
CONFIG += wikipoos CONFIG += wikipoos
#CONFIG += thewire
CONFIG += identities CONFIG += identities
CONFIG += gxsforums CONFIG += gxsforums
CONFIG += posted CONFIG += posted
CONFIG += unfinished CONFIG += unfinished
CONFIG += gxsgui CONFIG += gxsgui
#CONFIG += circles
#CONFIG += thewire
#CONFIG += pluginmgr #CONFIG += pluginmgr
@ -53,6 +54,7 @@ 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 LIBS += -lsqlite3
LIBS *= -rdynamic LIBS *= -rdynamic
@ -128,6 +130,7 @@ 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
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 += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a
@ -161,6 +164,7 @@ macx {
CONFIG += version_detail_bash_script CONFIG += version_detail_bash_script
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 -lcrypto -lz LIBS += -lssl -lcrypto -lz
#LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
LIBS += ../../../miniupnpc-1.0/libminiupnpc.a LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
@ -179,6 +183,7 @@ macx {
freebsd-* { freebsd-* {
INCLUDEPATH *= /usr/local/include/gpgme INCLUDEPATH *= /usr/local/include/gpgme
LIBS *= ../../libretroshare/src/lib/libretroshare.a LIBS *= ../../libretroshare/src/lib/libretroshare.a
LIBS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
LIBS *= -lssl LIBS *= -lssl
LIBS *= -lgpgme LIBS *= -lgpgme
LIBS *= -lupnp LIBS *= -lupnp
@ -226,6 +231,7 @@ DEPENDPATH += . \
gui/elastic gui/elastic
INCLUDEPATH += ../../libretroshare/src/ INCLUDEPATH += ../../libretroshare/src/
INCLUDEPATH += ../../supportlibs/pegmarkdown
# Input # Input
HEADERS += rshare.h \ HEADERS += rshare.h \
@ -964,6 +970,19 @@ identities {
} }
circles {
HEADERS += \
gui/Circles/CirclesDialog.h \
FORMS += gui/Circles/CirclesDialog.ui \
SOURCES += \
gui/Circles/CirclesDialog.cpp \
}
gxsforums { gxsforums {
HEADERS += gui/GxsForumsDialog.h \ HEADERS += gui/GxsForumsDialog.h \

2
retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
View File

@ -37,7 +37,7 @@
#include <QTimer> #include <QTimer>
//#define USE_PEGMMD_RENDERER 1 #define USE_PEGMMD_RENDERER 1
#ifdef USE_PEGMMD_RENDERER #ifdef USE_PEGMMD_RENDERER
#include "markdown_lib.h" #include "markdown_lib.h"

2
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View File

@ -28,7 +28,7 @@
#include <iostream> #include <iostream>
//#define USE_PEGMMD_RENDERER 1 #define USE_PEGMMD_RENDERER 1
#ifdef USE_PEGMMD_RENDERER #ifdef USE_PEGMMD_RENDERER
#include "markdown_lib.h" #include "markdown_lib.h"