mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-17 21:25:40 +00:00
(svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure
This commit is contained in:
parent
273533d4c7
commit
be15d8ec2e
2
Makefile
2
Makefile
@ -974,7 +974,7 @@ depend:
|
||||
@true # The include handles this automagically
|
||||
|
||||
# Introduce the dependencies
|
||||
ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper),)
|
||||
ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper upgradeconf $(MAKE_CONFIG)),)
|
||||
-include $(DEPS)
|
||||
endif
|
||||
|
||||
|
@ -6,6 +6,8 @@ endif
|
||||
|
||||
ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1)
|
||||
|
||||
ifndef BYPASS_OS_DETECT
|
||||
|
||||
# Automatically recognize if building on Win32
|
||||
ifdef WINDIR
|
||||
ifndef UNIX
|
||||
@ -56,6 +58,9 @@ SUNOS:=1
|
||||
UNIX:=1
|
||||
endif
|
||||
|
||||
# END BYPASS_OS_DETECT
|
||||
endif
|
||||
|
||||
# FreeBSD uses sdl11 instead of sdl
|
||||
ifdef FREEBSD
|
||||
SDL-CONFIG:=sdl11-config
|
||||
|
Loading…
Reference in New Issue
Block a user