diff options
| author | manuel <manuel@mausz.at> | 2011-04-09 18:19:25 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-04-09 18:19:25 +0200 |
| commit | 4e3c33632e811d5b57c9b61ec7f219fa06856fd2 (patch) | |
| tree | e1ef4bf222454f7b557ae070dff5fc51ce0f2aca | |
| parent | c13a773ef924f7edaa93ab2d2b9f461324d0d447 (diff) | |
| download | foop-4e3c33632e811d5b57c9b61ec7f219fa06856fd2.tar.gz foop-4e3c33632e811d5b57c9b61ec7f219fa06856fd2.tar.bz2 foop-4e3c33632e811d5b57c9b61ec7f219fa06856fd2.zip | |
proto stuff again
| -rw-r--r-- | pacman-c++/pacman.pro | 1 | ||||
| -rw-r--r-- | pacman-c++/pacman.server.pro | 1 | ||||
| -rw-r--r-- | pacman-c++/protobuf.pri | 2 |
3 files changed, 1 insertions, 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 += \ | |||
| 40 | pacman.proto | 40 | pacman.proto |
| 41 | 41 | ||
| 42 | PROTOS = pacman.proto | 42 | PROTOS = pacman.proto |
| 43 | PROTOPATH += $(INCPATH) | ||
| 44 | include(protobuf.pri) | 43 | include(protobuf.pri) |
| 45 | LIBS += -lprotobuf | 44 | 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 += \ | |||
| 40 | pacman.rc | 40 | pacman.rc |
| 41 | 41 | ||
| 42 | PROTOS = pacman.proto | 42 | PROTOS = pacman.proto |
| 43 | PROTOPATH += $(INCPATH) | ||
| 44 | include(protobuf.pri) | 43 | include(protobuf.pri) |
| 45 | LIBS += -lprotobuf | 44 | 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} | |||
| 20 | protobuf_decl.name = protobuf header | 20 | protobuf_decl.name = protobuf header |
| 21 | protobuf_decl.input = PROTOS | 21 | protobuf_decl.input = PROTOS |
| 22 | protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h | 22 | protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h |
| 23 | protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} ${QMAKE_FILE_IN} | 23 | protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} $(INCPATH) ${QMAKE_FILE_IN} |
| 24 | protobuf_decl.variable_out = GENERATED_FILES | 24 | protobuf_decl.variable_out = GENERATED_FILES |
| 25 | QMAKE_EXTRA_COMPILERS += protobuf_decl | 25 | QMAKE_EXTRA_COMPILERS += protobuf_decl |
| 26 | 26 | ||
