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

tweaked cyrils mods to be compatible with old ssh location, and use pregenerated proto.cc files.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-10-22 18:42:54 +00:00
parent 6c784c3062
commit fde1e8d66d
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ introserver {
sshserver { sshserver {
LIBSSH_DIR = ../../libssh-0.5.2 LIBSSH_DIR = ../../../lib/libssh-0.5.2
# This Requires libssh-0.5.* to compile. # This Requires libssh-0.5.* to compile.
# Modify path below to point at it. # Modify path below to point at it.
@ -205,20 +205,37 @@ protorpc {
rpc/proto/rpcprotosearch.cc \ rpc/proto/rpcprotosearch.cc \
rpc/proto/rpcprotofiles.cc \ rpc/proto/rpcprotofiles.cc \
# Generated ProtoBuf Code the RPC System # Offical Generated Code (protobuf 2.4.1)
HEADERS += ../../rsctrl/src/gencc/core.pb.h \ HEADERS += rpc/proto/gencc/core.pb.h \
../../rsctrl/src/gencc/peers.pb.h \ rpc/proto/gencc/peers.pb.h \
../../rsctrl/src/gencc/system.pb.h \ rpc/proto/gencc/system.pb.h \
../../rsctrl/src/gencc/chat.pb.h \ rpc/proto/gencc/chat.pb.h \
../../rsctrl/src/gencc/search.pb.h \ rpc/proto/gencc/search.pb.h \
../../rsctrl/src/gencc/files.pb.h \ rpc/proto/gencc/files.pb.h \
SOURCES += ../../rsctrl/src/gencc/core.pb.cc \ SOURCES += rpc/proto/gencc/core.pb.cc \
../../rsctrl/src/gencc/peers.pb.cc \ rpc/proto/gencc/peers.pb.cc \
../../rsctrl/src/gencc/system.pb.cc \ rpc/proto/gencc/system.pb.cc \
../../rsctrl/src/gencc/chat.pb.cc \ rpc/proto/gencc/chat.pb.cc \
../../rsctrl/src/gencc/search.pb.cc \ rpc/proto/gencc/search.pb.cc \
../../rsctrl/src/gencc/files.pb.cc \ rpc/proto/gencc/files.pb.cc \
# Generated ProtoBuf Code the RPC System
# If you are developing, or have a different version of protobuf
# you can use these ones (run make inside rsctrl/src/ to generate)
#HEADERS += ../../rsctrl/src/gencc/core.pb.h \
# ../../rsctrl/src/gencc/peers.pb.h \
# ../../rsctrl/src/gencc/system.pb.h \
# ../../rsctrl/src/gencc/chat.pb.h \
# ../../rsctrl/src/gencc/search.pb.h \
# ../../rsctrl/src/gencc/files.pb.h \
#SOURCES += ../../rsctrl/src/gencc/core.pb.cc \
# ../../rsctrl/src/gencc/peers.pb.cc \
# ../../rsctrl/src/gencc/system.pb.cc \
# ../../rsctrl/src/gencc/chat.pb.cc \
# ../../rsctrl/src/gencc/search.pb.cc \
# ../../rsctrl/src/gencc/files.pb.cc \
QMAKE_CFLAGS += -pthread QMAKE_CFLAGS += -pthread
QMAKE_CXXFLAGS += -pthread QMAKE_CXXFLAGS += -pthread