games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-17 20:58:07 +02:00
Code Issues Releases Activity

* Linux build fixes

Browse Source
This commit is contained in:
mateuszb 2011-10-23 13:53:37 +00:00
parent 8de4a4aef2
commit b18cbcbda7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Odpalarka/Makefile.am
View File

@ -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 = \

4
Odpalarka/main.cpp
View File

@ -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;

4
server/CVCMIServer.cpp
View File

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