From 4e3c33632e811d5b57c9b61ec7f219fa06856fd2 Mon Sep 17 00:00:00 2001 From: manuel Date: Sat, 9 Apr 2011 18:19:25 +0200 Subject: proto stuff again --- pacman-c++/pacman.pro | 1 - pacman-c++/pacman.server.pro | 1 - pacman-c++/protobuf.pri | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro index 9274297..3670bc0 100644 --- a/pacman-c++/pacman.pro +++ b/pacman-c++/pacman.pro @@ -40,6 +40,5 @@ OTHER_FILES += \ pacman.proto PROTOS = pacman.proto -PROTOPATH += $(INCPATH) include(protobuf.pri) LIBS += -lprotobuf diff --git a/pacman-c++/pacman.server.pro b/pacman-c++/pacman.server.pro index 5045cd2..7e23f21 100644 --- a/pacman-c++/pacman.server.pro +++ b/pacman-c++/pacman.server.pro @@ -40,6 +40,5 @@ OTHER_FILES += \ pacman.rc PROTOS = pacman.proto -PROTOPATH += $(INCPATH) include(protobuf.pri) LIBS += -lprotobuf diff --git a/pacman-c++/protobuf.pri b/pacman-c++/protobuf.pri index 03b9514..718cb70 100644 --- a/pacman-c++/protobuf.pri +++ b/pacman-c++/protobuf.pri @@ -20,7 +20,7 @@ for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p} protobuf_decl.name = protobuf header protobuf_decl.input = PROTOS protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h -protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} ${QMAKE_FILE_IN} +protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} $(INCPATH) ${QMAKE_FILE_IN} protobuf_decl.variable_out = GENERATED_FILES QMAKE_EXTRA_COMPILERS += protobuf_decl -- cgit v1.2.3