# HG changeset patch
# User bjarni
# Date 1103848421 0
# Node ID 06aaddf6742b0128a8cd4b916372cbe0bb121957
# Parent  783193d834b6be2ba4bd8d86b6f03efee34d1797
(svn r1274) Makefile: networking is not longer experimental

diff -r 783193d834b6 -r 06aaddf6742b Makefile
--- a/Makefile	Fri Dec 24 00:24:13 2004 +0000
+++ b/Makefile	Fri Dec 24 00:33:41 2004 +0000
@@ -67,6 +67,8 @@
 # NOVERBOSE: supress all warnings and errors during compilation.
 #  It looks nicer, but you will not know what went wrong. Use it on released (stable) sources only
 # VERBOSE: actually show the commands used for compilation.
+# WITH_NETWORK: enable networking
+# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
 #
 # Paths:
 # INSTALL: If not set, the game uses the directory of the binary to
@@ -106,9 +108,7 @@
 # MINGW: build with MingW compiler, link with MingW libraries
 #
 # Experimental (does not work properly):
-# WITH_NETWORK: enable networking
 # WITH_DIRECTMUSIC: enable DirectMusic MIDI support
-# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
 
 
 ##############################################################################
@@ -118,7 +118,7 @@
 
 # Makefile version tag
 # it checks if the version tag in makefile.config is the same and force update outdated config files
-MAKEFILE_VERSION:=5
+MAKEFILE_VERSION:=6
 
 # CONFIG_WRITER have to be found even for manual configuration
 CONFIG_WRITER=makefiledir/Makefile.config_writer
diff -r 783193d834b6 -r 06aaddf6742b makefiledir/Makefile.config_writer
--- a/makefiledir/Makefile.config_writer	Fri Dec 24 00:24:13 2004 +0000
+++ b/makefiledir/Makefile.config_writer	Fri Dec 24 00:33:41 2004 +0000
@@ -17,6 +17,8 @@
 	$(call CONFIG_LINE,\# MIDI: sets path to midi player)
 	$(call CONFIG_LINE,\# MIDI_ARG: sets an argument which is used when calling the midi player. Default off)
 	$(call CONFIG_LINE,\# SUPRESS_LANG_ERRORS: supresses output about missing and mismatched strings)
+	$(call CONFIG_LINE,\# WITH_NETWORK: makes OpenTTD able to play multiplayer using TCP and UDP)
+	$(call CONFIG_LINE,\# DEDICATED: compiles a dedicated server. This one can only host using a CLI, but do not need SDL)
 	$(call CONFIG_LINE,STATIC:=$(STATIC))
 	$(call CONFIG_LINE,TRANSLATOR:=$(TRANSLATOR))
 	$(call CONFIG_LINE,DISPLAY_WARNINGS:=$(DISPLAY_WARNINGS))
@@ -25,6 +27,8 @@
 	$(call CONFIG_LINE,MIDI:=$(MIDI))
 	$(call CONFIG_LINE,MIDI_ARG:=$(MIDI_ARG))
 	$(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS))
+	$(call CONFIG_LINE,WITH_NETWORK:=$(WITH_NETWORK))
+	$(call CONFIG_LINE,DEDICATED:=$(DEDICATED))
 	$(call CONFIG_LINE,)
 	
 	$(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding)
@@ -44,9 +48,7 @@
 	$(call CONFIG_LINE,)
 	
 	$(call CONFIG_LINE,\# Experimental)
-	$(call CONFIG_LINE,WITH_NETWORK:=$(WITH_NETWORK))
 	$(call CONFIG_LINE,WITH_DIRECTMUSIC:=$(WITH_DIRECTMUSIC))
-	$(call CONFIG_LINE,DEDICATED:=$(DEDICATED))
 	$(call CONFIG_LINE,)
 	$(call CONFIG_LINE,)