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

(svn r856) Makefile: added the flags CYGWIN and MINGW to libdetection. They were missing in the autodetected makefile.config

Browse Source
This commit is contained in:
Bjarni 2004-11-29 20:26:00 +00:00
parent a580b4c21e
commit 00d6b3609f
1 changed files with 100 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
makefiledir/Makefile.libdetection
View File

@ -1,98 +1,100 @@
# this file detects what OS and libs the computer have/are running # this file detects what OS and libs the computer have/are running
# Automatically recognize if building on Win32 # Automatically recognize if building on Win32
ifdef WINDIR ifdef WINDIR
ifndef UNIX ifndef UNIX
WIN32:=1 WIN32:=1
endif CYGWIN:=1
else MINGW:=1
UNIX:=1 endif
endif else
UNIX:=1
# Automatically recognize if building on FreeBSD endif
ifeq ($(shell uname),FreeBSD)
FREEBSD:=1 # Automatically recognize if building on FreeBSD
endif ifeq ($(shell uname),FreeBSD)
FREEBSD:=1
# Automatically recognize if building on MacOSX endif
ifeq ($(VENDOR), apple)
OSX:=1 # Automatically recognize if building on MacOSX
# OSX uses the unix setup too ifeq ($(VENDOR), apple)
UNIX:=1 OSX:=1
endif # OSX uses the unix setup too
UNIX:=1
# Automatically recognize if building on MorphOS endif
ifeq ($(shell uname), MorphOS)
MORPHOS:=1 # Automatically recognize if building on MorphOS
# MorphOS uses UNIX setup too ifeq ($(shell uname), MorphOS)
UNIX:=1 MORPHOS:=1
endif # MorphOS uses UNIX setup too
UNIX:=1
# Automatically recognize if building on BeOS endif
ifeq ($(shell uname), BeOS)
BEOS:=1 # Automatically recognize if building on BeOS
# BeOS uses UNIX setup too ifeq ($(shell uname), BeOS)
UNIX:=1 BEOS:=1
# Except that in BeOS 5.0 we need to use net_server, not BONE networking # BeOS uses UNIX setup too
ifeq ($(shell uname -r), 5.0) UNIX:=1
BEOS_NET_SERVER:=1 # Except that in BeOS 5.0 we need to use net_server, not BONE networking
endif ifeq ($(shell uname -r), 5.0)
endif BEOS_NET_SERVER:=1
endif
# Automatically recognize if building on SunOS/Solaris endif
ifeq ($(shell uname), SunOS)
SUNOS:=1 # Automatically recognize if building on SunOS/Solaris
# SunOS uses UNIX setup too ifeq ($(shell uname), SunOS)
UNIX:=1 SUNOS:=1
endif # SunOS uses UNIX setup too
UNIX:=1
# FreeBSD uses sdl11 instead of sdl endif
ifdef FREEBSD
SDL-CONFIG:=sdl11-config # FreeBSD uses sdl11 instead of sdl
else ifdef FREEBSD
SDL-CONFIG:=sdl-config SDL-CONFIG:=sdl11-config
endif else
SDL-CONFIG:=sdl-config
endif
# Library detections
WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
# Library detections
# libpng detection WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
ifdef FREEBSD
# a little hack was needed for FreeBSD because it misses libpng-config # libpng detection
WITH_PNG:=$(shell ls /usr/lib | grep "libpng" 2>/dev/null) $(shell \ ifdef FREEBSD
ls /usr/local/lib | grep "libpng" 2>/dev/null) # a little hack was needed for FreeBSD because it misses libpng-config
ifdef WITH_PNG WITH_PNG:=$(shell ls /usr/lib | grep "libpng" 2>/dev/null) $(shell \
# makes the flag look nicer in makefile.config ls /usr/local/lib | grep "libpng" 2>/dev/null)
WITH_PNG:=1 ifdef WITH_PNG
endif # makes the flag look nicer in makefile.config
else WITH_PNG:=1
WITH_PNG:=$(shell libpng-config --version 2>/dev/null) endif
endif else
WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
ifdef WITH_PNG endif
# LibPNG depends on Zlib
WITH_ZLIB:=1 ifdef WITH_PNG
else # LibPNG depends on Zlib
# We go looking for zlib with a little hack WITH_ZLIB:=1
WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \ else
$(shell ls /usr/local/include | grep "zlib.h" 2>/dev/null) # We go looking for zlib with a little hack
ifdef WITH_ZLIB WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
WITH_ZLIB:=1 $(shell ls /usr/local/include | grep "zlib.h" 2>/dev/null)
endif ifdef WITH_ZLIB
endif WITH_ZLIB:=1
endif
endif
# sets the default paths
ifdef UNIX
ifndef OSX # sets the default paths
ifndef MORPHOS ifdef UNIX
ifndef BIN_DIR ifndef OSX
#BINARY_DIR:= ifndef MORPHOS
#DATA_DIR_PREFIX:= ifndef BIN_DIR
#INSTALL_DIR:=/usr/local/ #BINARY_DIR:=
#USE_HOMEDIR:= #DATA_DIR_PREFIX:=
endif #INSTALL_DIR:=/usr/local/
endif #USE_HOMEDIR:=
endif endif
endif endif
endif
endif