cpp/openttd-patchpack/source Changeset - r1164:fd63d4650504

Changeset - r1164:fd63d4650504

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 20 years ago 2005-01-25 15:38:35
tron@openttd.org

(svn r1666) Move some MorphOS compile flags to a place where they actually belong

1 file changed with 4 insertions and 5 deletions:

Makefile

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -205,53 +205,48 @@ 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
@@ @@ -348,48 +343,52 @@ ifdef MINGW @@
 BASECFLAGS += -mno-cygwin
 LDFLAGS += -mno-cygwin
 endif
 endif
 CFLAGS += $(BASECFLAGS)
 ifdef UNIX
 CDEFS += -DUNIX
 endif
 ifdef BEOS
 CDEFS += -DBEOS
 LDFLAGS += -lmidi -lbe
 ifdef WITH_NETWORK
 	ifdef BEOS_NET_SERVER
 		CDEFS += -DBEOS_NET_SERVER
 	else
 		# Zeta needs a few more libraries than R5
 		LDFLAGS += -lbind -lsocket
 	endif
 endif
 endif
 ifdef MORPHOS
 CFLAGS += -noixemul -pipe
 endif
 ifdef SUNOS
 CDEFS += -DSUNOS
 ifdef WITH_NETWORK
 LDFLAGS += -lnsl -lsocket
 endif
 endif
 # SDL config
 ifdef WITH_SDL
 CDEFS += -DWITH_SDL
 CFLAGS += `$(SDL-CONFIG) --cflags`
 ifdef STATIC
 LIBS += `$(SDL-CONFIG) --static-libs`
 else
 LIBS += `$(SDL-CONFIG) --libs`
 endif
 endif
 # zlib config
 ifdef WITH_ZLIB
 	CDEFS +=  -DWITH_ZLIB
 	ifdef STATIC
 		ifdef OSX

0 comments (0 inline, 0 general)