cpp/openttd-patchpack/source Changeset - r1029:ea38d27e1d01

Changeset - r1029:ea38d27e1d01

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

bjarni - 20 years ago 2005-01-15 21:30:16
bjarni@openttd.org

(svn r1530) Makefilefix: now the binary never links to SDL if DEDICATED is set. Thanks to igor2code for making me aware of this issue even through I fixed it in a different way than his patch did. (I made dedicated never link to sdl, nomatter what makefile.config says)

1 file changed with 4 insertions and 0 deletions:

Makefile

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -181,96 +181,100 @@ endif @@
 ifdef NOVERBOSE
 VERBOSE_FILTER =  >/dev/null 2>&1
 else
 VERBOSE_FILTER =
 endif
 ifdef DISPLAY_WARNINGS
 WARNING_DISPLAY:=-fstrict-aliasing
 VERBOSE_FILTER =
 else
 WARNING_DISPLAY:=-fno-strict-aliasing
 endif
 ifdef SUPRESS_LANG_ERRORS
 ifndef VERBOSE_FILTER
 LANG_ERRORS =  >/dev/null 2>&1
 endif
 endif
 ifdef STATIC
 ifndef WIN32
 ifndef OSX
 ifndef MORPHOS
 ifndef SKIP_STATIC_CHECK
 $(error Static is only known to work on MorphOS and MacOSX!!! --- Check makefile.config for more info and howto bypass this check)
 endif
 endif
 endif
 endif
 endif
 ifdef RELEASE
 ifdef OSX
 ifndef STATIC
 $(error do not make dynamically linked releases. Most users can't use those)
 endif
 endif
 endif
 # Force SDL on UNIX platforms
 ifndef WITH_SDL
 ifdef 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
 # remove the dependancy for sdl if DEDICALTED is used
 ifdef DEDICATED
 WITH_SDL:=
 endif
 ##############################################################################
+#
 # Compiler configuration
+#
 CC=gcc
 CXX=g++
 ifdef MORPHOS
 CC += -noixemul -pipe
 CXX += -noixemul -pipe
 endif
 # Executable file extension
 ifdef WIN32
 EXE=.exe
 else
 EXE=
 endif
 # Set output executable names
 TTD=openttd$(EXE)
 ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"
 # What revision are we compiling, if we have an idea?
 REV_NUMBER := $(shell if test -d .svn; then svnversion . | tr -dc 0-9; fi)
 ifdef RELEASE
 REV:=$(RELEASE)
 else
 REV := $(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi)
 tmp_test:=$(shell echo "$(REV)" | grep "M" )
 ifdef tmp_test
 REV_NUMBER:=1
 endif
 endif
 ifndef REV_NUMBER
 REV_NUMBER:=0
 endif
 # MorphOS needs builddate
 BUILDDATE=`date +%d.%m.%y`
 # AMD64 needs a little more settings to work

0 comments (0 inline, 0 general)