summaryrefslogtreecommitdiff
path: root/config.lib
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2019-03-20 17:01:13 +0100
committerPatric Stout <truebrain@openttd.org>2019-03-20 19:24:55 +0100
commite3c639a09f1d2251477f69496120d057dd8320a9 (patch)
tree7d66891ae41db811e1edd13647b05092dca54b5a /config.lib
parent72c5f2b3eed77120d86ecf636e07c71eb23b4bd5 (diff)
downloadopenttd-e3c639a09f1d2251477f69496120d057dd8320a9.tar.xz
Remove: ENABLE_NETWORK switch
This switch has been a pain for years. Often disabling broke compilation, as no developer compiles OpenTTD without, neither do any of our official binaries. Additionaly, it has grown so hugely in our codebase, that it clearly shows that the current solution was a poor one. 350+ instances of "#ifdef ENABLE_NETWORK" were in the code, of which only ~30 in the networking code itself. The rest were all around the code to do the right thing, from GUI to NewGRF. A more proper solution would be to stub all the functions, and make sure the rest of the code can simply assume network is available. This was also partially done, and most variables were correct if networking was disabled. Despite that, often the #ifdefs were still used. With the recent removal of DOS, there is also no platform anymore which we support where networking isn't working out-of-the-box. All in all, it is time to remove the ENABLE_NETWORK switch. No replacement is planned, but if you feel we really need this option, we welcome any Pull Request which implements this in a way that doesn't crawl through the code like this diff shows we used to.
Diffstat (limited to 'config.lib')
-rw-r--r--config.lib31
1 files changed, 5 insertions, 26 deletions
diff --git a/config.lib b/config.lib
index 18ea119c4..026f7bfb3 100644
--- a/config.lib
+++ b/config.lib
@@ -52,7 +52,6 @@ set_default() {
enable_profiling="0"
enable_lto="0"
enable_dedicated="0"
- enable_network="1"
enable_static="1"
enable_translator="0"
enable_unicode="1"
@@ -130,7 +129,6 @@ set_default() {
enable_profiling
enable_lto
enable_dedicated
- enable_network
enable_static
enable_translator
enable_unicode
@@ -289,9 +287,6 @@ detect_params() {
--enable-ipo=*) enable_lto="$optarg";;
--enable-dedicated) enable_dedicated="1";;
--enable-dedicated=*) enable_dedicated="$optarg";;
- --enable-network) enable_network="2";;
- --enable-network=*) enable_network="$optarg";;
- --disable-network) enable_network="0";;
--disable-static) enable_static="0";;
--enable-static) enable_static="2";;
--enable-static=*) enable_static="$optarg";;
@@ -749,11 +744,6 @@ check_params() {
if [ "$enable_dedicated" != "0" ]; then
log 1 "checking GDI video driver... dedicated server, skipping"
log 1 "checking dedicated... found"
-
- if [ "$enable_network" = "0" ]; then
- log 1 "configure: error: building a dedicated server without network support is pointless"
- exit 1
- fi
else
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
log 1 "checking GDI video driver... found"
@@ -784,12 +774,6 @@ check_params() {
log 1 "checking console application... enabled"
fi
- if [ "$enable_network" != "0" ]; then
- log 1 "checking network... found"
- else
- log 1 "checking network... disabled"
- fi
-
log 1 "checking squirrel... found"
SCRIPT_SRC_DIR="$ROOT_DIR/src/3rdparty/squirrel/include"
@@ -1833,16 +1817,12 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -DUNICODE -D_UNICODE"
fi
- if [ "$enable_network" != "0" ]; then
- CFLAGS="$CFLAGS -DENABLE_NETWORK"
-
- if [ "$os" = "HAIKU" ]; then
- LDFLAGS="$LDFLAGS -lnetwork"
- fi
+ if [ "$os" = "HAIKU" ]; then
+ LDFLAGS="$LDFLAGS -lnetwork"
+ fi
- if [ "$os" = "SUNOS" ]; then
- LDFLAGS="$LDFLAGS -lnsl -lsocket"
- fi
+ if [ "$os" = "SUNOS" ]; then
+ LDFLAGS="$LDFLAGS -lnsl -lsocket"
fi
if [ "$enable_static" != "0" ]; then
@@ -3499,7 +3479,6 @@ showhelp() {
echo " --enable-console compile as a console application instead of as a GUI application."
echo " If this setting is active, debug output will appear in the same"
echo " console instead of opening a new window. (Win32 ONLY)"
- echo " --disable-network disable network support"
echo " --disable-assert disable asserts (continue on errors)"
echo " --enable-strip enable any possible stripping"
echo " --without-osx-sysroot disable the automatic adding of sysroot "