- Fixed generating of protobuf files in retroshare-nogui.pro for shadow build and Windows compile.

- Added dummy files for generated protobuf files. Without these files qmake doesn't add it to the makefile.
- Added svnignore:* to gencc directory.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-03-02 13:50:07 +00:00
parent 6e59ff213e
commit d1b488002e
9 changed files with 6 additions and 4231 deletions

View File

@ -83,6 +83,8 @@ win32 {
LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32
LIBS += -lole32 -lwinmm LIBS += -lole32 -lwinmm
PROTOCPATH=$$PWD/../../../lib/bin/
RC_FILE = resources/retroshare_win.rc RC_FILE = resources/retroshare_win.rc
DEFINES *= WINDOWS_SYS DEFINES *= WINDOWS_SYS
@ -228,10 +230,10 @@ sshserver {
protorpc { protorpc {
# Proto Services # Proto Services
PROTOS = core.proto peers.proto system.proto chat.proto search.proto files.proto PROTOS = core.proto peers.proto system.proto chat.proto search.proto files.proto
DESTPATH = rpc/proto/gencc DESTPATH = $$PWD/rpc/proto/gencc
PROTOPATH = ../../rsctrl/src/definition PROTOPATH = $$PWD/../../rsctrl/src/definition
CMD = CMD = echo Building protobuf files
for(pf, PROTOS):CMD += protoc --cpp_out=$${DESTPATH} --proto_path=./$${PROTOPATH} $${PROTOPATH}/$${pf}; for(pf, PROTOS):CMD += && $${PROTOCPATH}protoc --cpp_out=$${DESTPATH} --proto_path=$${PROTOPATH} $${PROTOPATH}/$${pf}
protobuf_gen.commands = $${CMD} protobuf_gen.commands = $${CMD}
QMAKE_EXTRA_TARGETS += protobuf_gen QMAKE_EXTRA_TARGETS += protobuf_gen
PRE_TARGETDEPS += protobuf_gen PRE_TARGETDEPS += protobuf_gen

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff