# HG changeset patch # User koda # Date 1362389456 -3600 # Node ID fa8cd97a0a0963308cf6761ef42dcd772f12e5e0 # Parent c1c6b815691e400ee8d9451504b7ba5d5029ef5f convert HAVE_NETSERVER to check for file existance, so that it's easier to provide missing servers diff -r c1c6b815691e -r fa8cd97a0a09 CMakeLists.txt --- a/CMakeLists.txt Mon Mar 04 10:08:38 2013 +0100 +++ b/CMakeLists.txt Mon Mar 04 10:30:56 2013 +0100 @@ -261,7 +261,6 @@ endif() if(ghc_executable) - set(HAVE_NETSERVER true) add_subdirectory(gameServer) message(STATUS "Found GHC: ${ghc_executable}") else() diff -r c1c6b815691e -r fa8cd97a0a09 QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Mon Mar 04 10:08:38 2013 +0100 +++ b/QTfrontend/hwconsts.cpp.in Mon Mar 04 10:30:56 2013 +0100 @@ -73,7 +73,5 @@ QString * netHost = new QString(); quint16 netPort = NETGAME_DEFAULT_PORT; -bool haveServer = ${HAVE_NETSERVER}; - int season = SEASON_NONE; int years_since_foundation = 0; diff -r c1c6b815691e -r fa8cd97a0a09 QTfrontend/hwconsts.h --- a/QTfrontend/hwconsts.h Mon Mar 04 10:08:38 2013 +0100 +++ b/QTfrontend/hwconsts.h Mon Mar 04 10:30:56 2013 +0100 @@ -50,7 +50,6 @@ extern QString * netHost; extern quint16 netPort; -extern bool haveServer; //Current season, SEASON_NONE by default extern int season; diff -r c1c6b815691e -r fa8cd97a0a09 QTfrontend/ui/page/pagenet.cpp --- a/QTfrontend/ui/page/pagenet.cpp Mon Mar 04 10:08:38 2013 +0100 +++ b/QTfrontend/ui/page/pagenet.cpp Mon Mar 04 10:30:56 2013 +0100 @@ -72,7 +72,12 @@ BtnNetSvrStart = formattedButton(QPushButton::tr("Start server")); BtnNetSvrStart->setMinimumWidth(180); - BtnNetSvrStart->setVisible(haveServer); + QString serverPath = bindir->absolutePath() + "/hedgewars-server"; +#ifdef Q_WS_WIN + serverPath += + ".exe"; +#endif + QFile server(serverPath); + BtnNetSvrStart->setVisible(server.exists()); footerLayout->addStretch(); footerLayout->addWidget(BtnNetSvrStart);