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

(svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure

Browse Source
This commit is contained in:
truelight
2006-03-14 19:10:33 +00:00
parent 42d1731cc1
commit cc2993992f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -974,7 +974,7 @@ depend:
@true # The include handles this automagically @true # The include handles this automagically
# Introduce the dependencies # Introduce the dependencies
ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper),) ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper upgradeconf $(MAKE_CONFIG)),)
-include $(DEPS) -include $(DEPS)
endif endif

5
makefiledir/Makefile.libdetection
View File

@@ -6,6 +6,8 @@ endif
ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1) ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1)
ifndef BYPASS_OS_DETECT
# Automatically recognize if building on Win32 # Automatically recognize if building on Win32
ifdef WINDIR ifdef WINDIR
ifndef UNIX ifndef UNIX
@@ -56,6 +58,9 @@ SUNOS:=1
UNIX:=1 UNIX:=1
endif endif
# END BYPASS_OS_DETECT
endif
# FreeBSD uses sdl11 instead of sdl # FreeBSD uses sdl11 instead of sdl
ifdef FREEBSD ifdef FREEBSD
SDL-CONFIG:=sdl11-config SDL-CONFIG:=sdl11-config