summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-12-04 20:34:59 +0000
committerbjarni <bjarni@openttd.org>2004-12-04 20:34:59 +0000
commit477bee544d9ad983abc42a662ecb5c20ff9f305e (patch)
tree4f8c18d0c4c783aa0f7fcf9586df521de2e94557 /Makefile
parentf16b4adfc55bf5926d4ccbfb6d73e32653d12a5f (diff)
downloadopenttd-477bee544d9ad983abc42a662ecb5c20ff9f305e.tar.xz
(svn r949) Makefile: added DEDICATED flag to allow complilation of dedicated servers without linking to SDL. Request by Jezral
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0dd0b564e..ec75285dc 100644
--- a/Makefile
+++ b/Makefile
@@ -103,6 +103,7 @@
# 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
##############################################################################
@@ -112,7 +113,7 @@
# Makefile version tag
# it checks if the version tag in makefile.config is the same and force update outdated config files
-MAKEFILE_VERSION:=3
+MAKEFILE_VERSION:=4
# CONFIG_WRITER have to be found even for manual configuration
CONFIG_WRITER=makefiledir/Makefile.config_writer
@@ -207,9 +208,17 @@ endif
# Force SDL on UNIX platforms
ifndef WITH_SDL
ifdef UNIX
-$(error You need to have SDL installed in order to run OpenTTD on UNIX.)
+ifndef DEDICATED
+$(error You need to have SDL installed in order to run OpenTTD on UNIX. Use DEDICATED if you want to compile a CLI based server)
endif
endif
+endif
+
+# For some reason it will not link with libpng if SDL is disabled
+# this automatically disables libpng if no SDL is found
+ifndef WITH_SDL
+WITH_PNG:=
+endif