mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-01-22 23:26:34 +00:00
(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled
This commit is contained in:
parent
216abe4e93
commit
cbdd088649
25
Makefile
25
Makefile
@ -105,15 +105,24 @@ endif
|
||||
|
||||
# updates makefile.config if it's outdated
|
||||
ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
|
||||
UPDATECONFIG:=upgradeconf
|
||||
CONFIG_INCLUDED:=
|
||||
ifndef MANUAL_CONFIG # manual config should not check this
|
||||
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
|
||||
# this should define SDL-CONFIG for manual configuration
|
||||
ifeq ($(shell uname),FreeBSD)
|
||||
SDL-CONFIG:=sdl11-config
|
||||
else
|
||||
SDL-CONFIG:=sdl-config
|
||||
endif
|
||||
# this should define SDL-CONFIG for manual configuration
|
||||
ifeq ($(shell uname),FreeBSD)
|
||||
SDL-CONFIG:=sdl11-config
|
||||
else
|
||||
SDL-CONFIG:=sdl-config
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef CONFIG_INCLUDED
|
||||
|
Loading…
Reference in New Issue
Block a user