From b18cbcbda74bc781ac3f28ee9869da19f6fdb3a7 Mon Sep 17 00:00:00 2001
From: mateuszb <mateuszbaran89@gmail.com>
Date: Sun, 23 Oct 2011 13:53:37 +0000
Subject: [PATCH] * Linux build fixes

---
 Odpalarka/Makefile.am  | 2 +-
 Odpalarka/main.cpp     | 4 ++--
 server/CVCMIServer.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Odpalarka/Makefile.am b/Odpalarka/Makefile.am
index efa81c416..fc3f81499 100644
--- a/Odpalarka/Makefile.am
+++ b/Odpalarka/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = odpalarka
 
-odpalarka_LDADD = $(top_builddir)/lib/libvcmi.la
+odpalarka_LDADD = $(top_builddir)/lib/libvcmi.la @BOOST_PROGRAM_OPTIONS_LIB@
 odpalarka_CXXFLAGS = @SDL_CXXFLAGS@
 odpalarka_LDFLAGS = -L$(top_builddir)/lib
 odpalarka_SOURCES = \
diff --git a/Odpalarka/main.cpp b/Odpalarka/main.cpp
index 1497729aa..8ad6f5587 100644
--- a/Odpalarka/main.cpp
+++ b/Odpalarka/main.cpp
@@ -6,10 +6,10 @@ namespace po = boost::program_options;
 
 void prog_help() 
 {
-	throw std::exception("The method or operation is not implemented.");
+	throw std::string("The method or operation is not implemented.");
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
 	std::cout << "VCMI Odpalarka\nMy path: " << argv[0] << std::endl;
 
diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
index 36e9602be..d3cdff326 100644
--- a/server/CVCMIServer.cpp
+++ b/server/CVCMIServer.cpp
@@ -503,8 +503,8 @@ void CVCMIServer::startDuel(const std::string &battle, const std::string &leftAI
 	std::map<CConnection *, si32> pidsFromConns;
 	si32 PIDs[3] = {0}; //[0] left [1] right; [2] reference
 	//we need three connections
-	std::vector<boost::thread*> threads(howManyClients, NULL);
-	std::vector<CConnection*> conns(howManyClients, NULL);
+	std::vector<boost::thread*> threads(howManyClients, (boost::thread*)NULL);
+	std::vector<CConnection*> conns(howManyClients, (CConnection*)NULL);
 
 	for (int i = 0; i < howManyClients ; i++)
 	{