Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r2760) Remove stale comments, long unused stuff and simplify some checks

Browse Source
This commit is contained in:
tron 2005-07-30 16:29:23 +00:00
parent b629745c16
commit 2f54ad9310
1 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@ -1,16 +1,5 @@
# $Id$ # $Id$
# This Makefile is partially based on "a completely generic Makefile",
# originally created by Justin Husted <husted@cs>
#
# Rewrite and sane dependencies support by Petr Baudis <pasky@ucw.cz>
# Cygwin support and configuration by Jaen Saul <slowbyte@hot.ee>
# A lot of modifications by Bjarni Corfitzen <bjarni@openttd.com>
#
# Last modified by: $Author: strigeus $
# On: $Date: 2004/03/11 19:15:06 $
############################################################################## ##############################################################################
# #
# Usage # Usage
@ -293,27 +282,19 @@ ifndef CFLAGS_HOST
CFLAGS_HOST = $(BASECFLAGS) CFLAGS_HOST = $(BASECFLAGS)
endif endif
# When calling the compiler, use these flags
# -g debugging symbols
# -Wall all warnings
# -s automatic strip
#
# You may also want:
# -O optimize or -O2 fully optimize (O's above 2 are not recommended)
# -pg profile - generate profiling data. See "man gprof" to use this.
CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3) CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3)
# GNU make can only test for (in)equality # GNU make can only test for (in)equality
# this is a workaround to test for >= # this is a workaround to test for >=
ifeq ($(shell if test $(CC_VERSION) -ge 29; then echo true; fi), true) ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes
CFLAGS += -Wwrite-strings -Wpointer-arith CFLAGS += -Wwrite-strings -Wpointer-arith
endif endif
ifeq ($(shell if test $(CC_VERSION) -ge 30; then echo true; fi), true) ifeq ($(shell expr $(CC_VERSION) \>= 30), 1)
CFLAGS += -W -Wno-unused-parameter CFLAGS += -W -Wno-unused-parameter
endif endif
ifeq ($(shell if test $(CC_VERSION) -ge 34; then echo true; fi), true) ifeq ($(shell expr $(CC_VERSION) \>= 34), 1)
CFLAGS += -Wdeclaration-after-statement -Wold-style-definition CFLAGS += -Wdeclaration-after-statement -Wold-style-definition
endif endif
@ -534,15 +515,6 @@ CDEFS += -DENABLE_NETWORK
ifdef QNX ifdef QNX
LIBS += -lsocket LIBS += -lsocket
endif endif
ifdef UNIX
ifndef OSX
ifndef MORPHOS
# this have caused problems on many platforms and disabling it didn't break anything
# now we test if disabling it as a general breaks it for anybody
#LIBS += -lresolv
endif
endif
endif
endif endif