Changeset - r3308:acc0a7f3c5b0
[Not reviewed]
master
0 1 0
truelight - 19 years ago 2006-03-23 17:38:31
truelight@openttd.org
(svn r4070) -Fix: on OSX COCOA was set by default, even with DEDICATED, while those 2 conflict
1 file changed with 2 insertions and 0 deletions:
0 comments (0 inline, 0 general)
makefiledir/Makefile.libdetection
Show inline comments
 
@@ -62,60 +62,62 @@ endif
 
endif
 

	
 
# FreeBSD uses sdl11 instead of sdl
 
ifdef FREEBSD
 
SDL-CONFIG:=sdl11-config
 
else
 
SDL-CONFIG:=sdl-config
 
endif
 

	
 
# Networking, enabled by default
 
WITH_NETWORK:=1
 

	
 
# Library detections
 
WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
 

	
 
# libpng detection
 
WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null)
 

	
 
ifdef WITH_PNG
 
# LibPNG depends on Zlib
 
WITH_ZLIB:=1
 
else
 
# We go looking for zlib with a little hack
 
WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
 
$(shell ls /usr/local/include | grep "zlib.h" 2>/dev/null)
 
ifdef WITH_ZLIB
 
WITH_ZLIB:=1
 
endif
 
endif
 

	
 

	
 
# sets the default paths
 
ifdef UNIX
 
ifndef OSX
 
ifndef MORPHOS
 
ifndef BIN_DIR
 
#BINARY_DIR:=
 
#DATA_DIR_PREFIX:=
 
#INSTALL_DIR:=/usr/local/
 
#USE_HOMEDIR:=
 
endif
 
endif
 
endif
 
endif
 

	
 
ifdef OSX
 
# we prefer to use cocoa drivers rather than SDL drivers
 
# if you really want SDL drivers, you can always modify Makefile.config
 
ifndef DEDICATED
 
WITH_COCOA:=1
 
WITH_SDL:=
 
endif
 
endif
 

	
 

	
 
# workaround
 
# cygwin have problems with libpng, so we will just disable it for now until the problem is solved
 
ifdef CYGWIN
 
WITH_PNG:=
 
endif
 

	
 
endif
0 comments (0 inline, 0 general)