Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r1274) Makefile: networking is not longer experimental

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
bjarni 20 years ago
parent 4972ba9a78
commit 7e0f47ff15
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File

6
Makefile
Unescape Escape View File

@ -67,6 +67,8 @@
# NOVERBOSE: supress all warnings and errors during compilation. # 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 # 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. # VERBOSE: actually show the commands used for compilation.
# WITH_NETWORK: enable networking
# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
# #
# Paths: # Paths:
# INSTALL: If not set, the game uses the directory of the binary to # 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 # MINGW: build with MingW compiler, link with MingW libraries
# #
# Experimental (does not work properly): # Experimental (does not work properly):
# WITH_NETWORK: enable networking
# WITH_DIRECTMUSIC: enable DirectMusic MIDI support # WITH_DIRECTMUSIC: enable DirectMusic MIDI support
# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
############################################################################## ##############################################################################
@ -118,7 +118,7 @@
# Makefile version tag # Makefile version tag
# it checks if the version tag in makefile.config is the same and force update outdated config files # 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 have to be found even for manual configuration
CONFIG_WRITER=makefiledir/Makefile.config_writer CONFIG_WRITER=makefiledir/Makefile.config_writer

6
makefiledir/Makefile.config_writer
Unescape Escape View File

@ -17,6 +17,8 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,\# MIDI: sets path to midi player) $(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,\# 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,\# 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,STATIC:=$(STATIC))
$(call CONFIG_LINE,TRANSLATOR:=$(TRANSLATOR)) $(call CONFIG_LINE,TRANSLATOR:=$(TRANSLATOR))
$(call CONFIG_LINE,DISPLAY_WARNINGS:=$(DISPLAY_WARNINGS)) $(call CONFIG_LINE,DISPLAY_WARNINGS:=$(DISPLAY_WARNINGS))
@ -25,6 +27,8 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,MIDI:=$(MIDI)) $(call CONFIG_LINE,MIDI:=$(MIDI))
$(call CONFIG_LINE,MIDI_ARG:=$(MIDI_ARG)) $(call CONFIG_LINE,MIDI_ARG:=$(MIDI_ARG))
$(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS)) $(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,)
$(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding) $(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding)
@ -44,9 +48,7 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,) $(call CONFIG_LINE,)
$(call CONFIG_LINE,\# Experimental) $(call CONFIG_LINE,\# Experimental)
$(call CONFIG_LINE,WITH_NETWORK:=$(WITH_NETWORK))
$(call CONFIG_LINE,WITH_DIRECTMUSIC:=$(WITH_DIRECTMUSIC)) $(call CONFIG_LINE,WITH_DIRECTMUSIC:=$(WITH_DIRECTMUSIC))
$(call CONFIG_LINE,DEDICATED:=$(DEDICATED))
$(call CONFIG_LINE,) $(call CONFIG_LINE,)
$(call CONFIG_LINE,) $(call CONFIG_LINE,)

Write Preview
Loading…
Cancel
Save