From b0d63dc95ab5ed4496e0c4b888af06edace456d4 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Thu, 12 May 2011 18:07:31 +0200
Subject: - fix protoc call on osx (that's the correct way now anyway) - fix
 compiler warning

---
 pacman-c++/proto/protobuf.pri | 3 ++-
 pacman-c++/server/server.cpp  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pacman-c++/proto/protobuf.pri b/pacman-c++/proto/protobuf.pri
index 718cb70..38fccde 100644
--- a/pacman-c++/proto/protobuf.pri
+++ b/pacman-c++/proto/protobuf.pri
@@ -16,11 +16,12 @@
 PROTOPATH += .
 PROTOPATHS =
 for(p, PROTOPATH):PROTOPATHS += --proto_path=$${p}
+PROTOPATHS += $$join(INCLUDEPATH, " -I", "-I")
 
 protobuf_decl.name  = protobuf header
 protobuf_decl.input = PROTOS
 protobuf_decl.output  = ${QMAKE_FILE_BASE}.pb.h
-protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} $(INCPATH) ${QMAKE_FILE_IN}
+protobuf_decl.commands = protoc --cpp_out="." $${PROTOPATHS} -I ${QMAKE_FILE_IN_PATH} ${QMAKE_FILE_IN}
 protobuf_decl.variable_out = GENERATED_FILES
 QMAKE_EXTRA_COMPILERS += protobuf_decl
 
diff --git a/pacman-c++/server/server.cpp b/pacman-c++/server/server.cpp
index 316b719..a39d975 100644
--- a/pacman-c++/server/server.cpp
+++ b/pacman-c++/server/server.cpp
@@ -14,7 +14,8 @@ Server::Server(QWidget *parent)
   m_rounds(3), m_curRound(0), m_running(false), m_finishRound(false)
 {
   /* determine max players by using order array */
-  for(m_maxplayers = 0; Color::order[m_maxplayers] != Color::none; ++m_maxplayers);
+  for(m_maxplayers = 0; Color::order[m_maxplayers] != Color::none; ++m_maxplayers)
+  {};
 }
 
 Server::~Server()
-- 
cgit v1.2.3