瀏覽代碼

* Linux build fixes

mateuszb 14 年之前
父節點
當前提交
b18cbcbda7
共有 3 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      Odpalarka/Makefile.am
  2. 2 2
      Odpalarka/main.cpp
  3. 2 2
      server/CVCMIServer.cpp

+ 1 - 1
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 = \

+ 2 - 2
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;
 

+ 2 - 2
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++)
 	{