[network] Move the definitions of the master/motd/auth/autoupdate server URLS to appConfig.hpp.

[network] Move the definitions of the master/motd/auth/autoupdate
server URLS to appConfig.hpp.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f75b88b..bba4e0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,10 @@ include( CMakeDependentOption )
 set( GAME_APP_NAME "" CACHE            STRING "The Application name")
 set( GAME_APP_VERSION "" CACHE         STRING "The Application version")
 set( GAME_APP_STAGE "" CACHE           STRING "The Application stage")
+set( URL_MASTER_SERVER "" CACHE        STRING "The URL for the Master Server")
+set( URL_MOTD_SERVER "" CACHE          STRING "The URL for the MOTD Server")
+set( URL_AUTHORIZE_SERVER "" CACHE     STRING "The URL for the Authorize Server")
+set( URL_AUTOUPDATE_SERVER "" CACHE    STRING "The URL for the Autoupdate Server")
 
 string( REPLACE " " "" GAME_APP_NAME_UPPER ${GAME_APP_NAME} )
 string( TOLOWER ${GAME_APP_NAME} GAME_APP_NAME_LOWER )
@@ -31,6 +35,22 @@ if("${GAME_APP_STAGE}" STREQUAL "")
 	message(FATAL_ERROR "Please set GAME_APP_STAGE first")
 endif()
 
+if("${URL_MASTER_SERVER}" STREQUAL "")
+	message(FATAL_ERROR "Please set URL_MASTER_SERVER first")
+endif()
+
+if("${URL_MOTD_SERVER}" STREQUAL "")
+	message(FATAL_ERROR "Please set URL_MOTD_SERVER first")
+endif()
+
+if("${URL_AUTHORIZE_SERVER}" STREQUAL "")
+	message(FATAL_ERROR "Please set URL_AUTHORIZE_SERVER first")
+endif()
+
+if("${URL_AUTOUPDATE_SERVER}" STREQUAL "")
+	message(FATAL_ERROR "Please set URL_AUTOUPDATE_SERVER first")
+endif()
+
 # This line has to appear before 'PROJECT' in order to be able to disable incremental linking
 set( MSVC_INCREMENTAL_DEFAULT ON )
 
diff --git a/cmake/appConfig.hpp.in b/cmake/appConfig.hpp.in
index 2065021..8c85465 100644
--- a/cmake/appConfig.hpp.in
+++ b/cmake/appConfig.hpp.in
@@ -87,4 +87,20 @@
 #define CONFIG_NAME "owconfig.cfg"
 #endif //!CONFIG_NAME
 
+#ifndef MASTER_SERVER_NAME
+#define MASTER_SERVER_NAME      "@URL_MASTER_SERVER@"
+#endif //!MASTER_SERVER_NAME
+
+#ifndef MOTD_SERVER_NAME
+#define MOTD_SERVER_NAME        "@URL_MOTD_SERVER@"
+#endif //!MOTD_SERVER_NAME
+
+#ifndef AUTHORIZE_SERVER_NAME
+#define AUTHORIZE_SERVER_NAME   "@URL_AUTHORIZE_SERVER@"
+#endif //!AUTHORIZE_SERVER_NAME
+
+#ifndef AUTOUPDATE_SERVER_NAME
+#define AUTOUPDATE_SERVER_NAME  "@URL_AUTOUPDATE_SERVER@"
+#endif //!AUTOUPDATE_SERVER_NAME
+
 #endif //!__APPCONFIG_H__
diff --git a/src/engine/qcommon/qcommon.hpp b/src/engine/qcommon/qcommon.hpp
index 191d43a..03d6f77 100644
--- a/src/engine/qcommon/qcommon.hpp
+++ b/src/engine/qcommon/qcommon.hpp
@@ -265,20 +265,6 @@ You or the server may be running older versions of the game. Press the auto-upda
 #define PROTOCOL_VERSION    1000
 #endif
 
-// NERVE - SMF - wolf multiplayer master servers
-#ifndef MASTER_SERVER_NAME
-#define MASTER_SERVER_NAME      "127.0.0.1"
-#endif
-#define MOTD_SERVER_NAME        "127.0.0.1"//"etmotd.idsoftware.com" // ?.?.?.?
-
-#define AUTHORIZE_SERVER_NAME   "127.0.0.1"
-
-// TTimo: override autoupdate server for testing
-#ifndef AUTOUPDATE_SERVER_NAME
-#define AUTOUPDATE_SERVER_NAME "127.0.0.1"
-//#define AUTOUPDATE_SERVER_NAME "au2rtcw2.activision.com"
-#endif
-
 // TTimo: allow override for easy dev/testing..
 // FIXME: not planning to support more than 1 auto update server
 // see cons -- update_server=myhost

GitHub
sha: 2a377689

© GrangerHub. All rights reserved. Tremulous © Darklegion Development. Granger by err-overflow and MoP licensed CC-BY-SA-2.5