petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled

Browse Source
This commit is contained in:
bjarni
2004-09-09 19:16:27 +00:00
parent 216abe4e93
commit cbdd088649
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -105,15 +105,24 @@ endif
# updates makefile.config if it's outdated # updates makefile.config if it's outdated
ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION)) ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
UPDATECONFIG:=upgradeconf ifndef MANUAL_CONFIG # manual config should not check this
CONFIG_INCLUDED:= UPDATECONFIG:=upgradeconf
CONFIG_INCLUDED:=
else
# this should define SDL-CONFIG for manual configuration
ifeq ($(shell uname),FreeBSD)
SDL-CONFIG:=sdl11-config
else
SDL-CONFIG:=sdl-config
endif
endif
else else
# this should define SDL-CONFIG for manual configuration # this should define SDL-CONFIG for manual configuration
ifeq ($(shell uname),FreeBSD) ifeq ($(shell uname),FreeBSD)
SDL-CONFIG:=sdl11-config SDL-CONFIG:=sdl11-config
else else
SDL-CONFIG:=sdl-config SDL-CONFIG:=sdl-config
endif endif
endif endif
ifndef CONFIG_INCLUDED ifndef CONFIG_INCLUDED