Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes for bitdht compilation.

Browse Source 
* disabled BlogItems, when BLOGS not defined.
 * added bitdht compile option to Retroshare.pro.
 * disabled BLOGS until it can compile in libretroshare



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-31 18:19:12 +00:00
parent fcdd7ee113
commit 6a9be43f31
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
CONFIG += qt gui uic qrc resources uitools idle blogs CONFIG += qt gui uic qrc resources uitools idle # bitdht blogs
QT += network xml script opengl QT += network xml script opengl
TEMPLATE = app TEMPLATE = app
@ -14,6 +14,7 @@ debug {
QMAKE_CFLAGS += -g QMAKE_CFLAGS += -g
} }
################################# Linux ########################################## ################################# Linux ##########################################
# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib # Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
linux-* { linux-* {
@ -119,6 +120,9 @@ macx {
# ########################################### # ###########################################
bitdht {
LIBS += ../../libbitdht/src/lib/libbitdht.a
}
DEPENDPATH += . \ DEPENDPATH += . \
rsiface \ rsiface \
@ -275,8 +279,6 @@ HEADERS += rshare.h \
gui/feeds/MsgItem.h \ gui/feeds/MsgItem.h \
gui/feeds/ChanNewItem.h \ gui/feeds/ChanNewItem.h \
gui/feeds/ChanMsgItem.h \ gui/feeds/ChanMsgItem.h \
gui/feeds/BlogNewItem.h \
gui/feeds/BlogMsgItem.h \
gui/feeds/SubFileItem.h \ gui/feeds/SubFileItem.h \
gui/feeds/SubDestItem.h \ gui/feeds/SubDestItem.h \
gui/feeds/AttachFileItem.h \ gui/feeds/AttachFileItem.h \
@ -351,8 +353,6 @@ FORMS += gui/StartDialog.ui \
gui/feeds/MsgItem.ui \ gui/feeds/MsgItem.ui \
gui/feeds/ChanNewItem.ui \ gui/feeds/ChanNewItem.ui \
gui/feeds/ChanMsgItem.ui \ gui/feeds/ChanMsgItem.ui \
gui/feeds/BlogNewItem.ui \
gui/feeds/BlogMsgItem.ui \
gui/feeds/SubFileItem.ui \ gui/feeds/SubFileItem.ui \
gui/feeds/SubDestItem.ui \ gui/feeds/SubDestItem.ui \
gui/feeds/AttachFileItem.ui gui/feeds/AttachFileItem.ui
@ -478,8 +478,6 @@ SOURCES += main.cpp \
gui/feeds/MsgItem.cpp \ gui/feeds/MsgItem.cpp \
gui/feeds/ChanNewItem.cpp \ gui/feeds/ChanNewItem.cpp \
gui/feeds/ChanMsgItem.cpp \ gui/feeds/ChanMsgItem.cpp \
gui/feeds/BlogNewItem.cpp \
gui/feeds/BlogMsgItem.cpp \
gui/feeds/SubFileItem.cpp \ gui/feeds/SubFileItem.cpp \
gui/feeds/SubDestItem.cpp \ gui/feeds/SubDestItem.cpp \
gui/feeds/AttachFileItem.cpp \ gui/feeds/AttachFileItem.cpp \
@ -542,19 +540,25 @@ HEADERS += gui/unfinished/blogs/BlogsDialog.h \
gui/unfinished/blogs/CreateBlog.h \ gui/unfinished/blogs/CreateBlog.h \
gui/unfinished/blogs/CreateBlogMsg.h \ gui/unfinished/blogs/CreateBlogMsg.h \
gui/unfinished/blogs/BlogsMsgItem.h \ gui/unfinished/blogs/BlogsMsgItem.h \
gui/unfinished/blogs/BlogDetails.h gui/unfinished/blogs/BlogDetails.h \
gui/feeds/BlogNewItem.h \
gui/feeds/BlogMsgItem.h \
FORMS += gui/unfinished/blogs/BlogsDialog.ui \ FORMS += gui/unfinished/blogs/BlogsDialog.ui \
gui/unfinished/blogs/CreateBlog.ui \ gui/unfinished/blogs/CreateBlog.ui \
gui/unfinished/blogs/CreateBlogMsg.ui \ gui/unfinished/blogs/CreateBlogMsg.ui \
gui/unfinished/blogs/BlogsMsgItem.ui \ gui/unfinished/blogs/BlogsMsgItem.ui \
gui/unfinished/blogs/BlogDetails.ui gui/unfinished/blogs/BlogDetails.ui \
gui/feeds/BlogNewItem.ui \
gui/feeds/BlogMsgItem.ui \
SOURCES += gui/unfinished/blogs/BlogsDialog.cpp \ SOURCES += gui/unfinished/blogs/BlogsDialog.cpp \
gui/unfinished/blogs/CreateBlog.cpp \ gui/unfinished/blogs/CreateBlog.cpp \
gui/unfinished/blogs/CreateBlogMsg.cpp \ gui/unfinished/blogs/CreateBlogMsg.cpp \
gui/unfinished/blogs/BlogsMsgItem.cpp \ gui/unfinished/blogs/BlogsMsgItem.cpp \
gui/unfinished/blogs/BlogDetails.cpp gui/unfinished/blogs/BlogDetails.cpp \
gui/feeds/BlogNewItem.cpp \
gui/feeds/BlogMsgItem.cpp \
DEFINES *= BLOGS DEFINES *= BLOGS
} }

8
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -29,8 +29,12 @@
#include "feeds/ChanMsgItem.h" #include "feeds/ChanMsgItem.h"
#include "feeds/ForumNewItem.h" #include "feeds/ForumNewItem.h"
#include "feeds/ForumMsgItem.h" #include "feeds/ForumMsgItem.h"
#ifdef BLOGS
#include "feeds/BlogNewItem.h" #include "feeds/BlogNewItem.h"
#include "feeds/BlogMsgItem.h" #include "feeds/BlogMsgItem.h"
#endif
#include "feeds/MsgItem.h" #include "feeds/MsgItem.h"
#include "feeds/PeerItem.h" #include "feeds/PeerItem.h"
@ -325,6 +329,7 @@ void NewsFeed::addFeedItemForumMsg(RsFeedItem &fi)
void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi) void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
{ {
#ifdef BLOGS
/* make new widget */ /* make new widget */
BlogNewItem *bni = new BlogNewItem(this, NEWSFEED_BLOGNEWLIST, fi.mId1, false, true); BlogNewItem *bni = new BlogNewItem(this, NEWSFEED_BLOGNEWLIST, fi.mId1, false, true);
@ -332,6 +337,7 @@ void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
/* add to layout */ /* add to layout */
verticalLayout->addWidget(bni); verticalLayout->addWidget(bni);
#endif
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemBlogNew()"; std::cerr << "NewsFeed::addFeedItemBlogNew()";
@ -341,6 +347,7 @@ void NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi) void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
{ {
#ifdef BLOGS
/* make new widget */ /* make new widget */
BlogMsgItem *bm = new BlogMsgItem(this, NEWSFEED_BLOGMSGLIST, fi.mId1, fi.mId2, false); BlogMsgItem *bm = new BlogMsgItem(this, NEWSFEED_BLOGMSGLIST, fi.mId1, fi.mId2, false);
@ -348,6 +355,7 @@ void NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
/* add to layout */ /* add to layout */
verticalLayout->addWidget(bm); verticalLayout->addWidget(bm);
#endif
#ifdef NEWS_DEBUG #ifdef NEWS_DEBUG
std::cerr << "NewsFeed::addFeedItemBlogMsg()"; std::cerr << "NewsFeed::addFeedItemBlogMsg()";