makefiledir/Makefile.libdetection
author bjarni
Tue, 05 Dec 2006 22:40:42 +0000
changeset 5255 b693a9941b8c
parent 5117 d64bf0093ff4
permissions -rw-r--r--
(svn r7385) -Fix: FS#418 Deleting Train in depot with autoreplace failes
This turned out to be due to continue to drag the old vehicle, that autoreplace sold
This could also be triggered if more than one player used the same company
Now deleting a vehicle will remove all depot highlights of that vehicle
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
     1
# this file detects what OS and libs the computer have/are running
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
     2
3083
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
     3
ifndef CONFIG_VERSION
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
     4
CONFIG_VERSION:=0
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
     5
endif
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
     6
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
     7
ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1)
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
     8
3197
078a10118842 (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure
truelight
parents: 3083
diff changeset
     9
ifndef BYPASS_OS_DETECT
078a10118842 (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure
truelight
parents: 3083
diff changeset
    10
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    11
# Automatically recognize if building on Win32
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    12
ifdef WINDIR
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    13
ifndef UNIX
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    14
WIN32:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    15
CYGWIN:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    16
MINGW:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    17
STATIC:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    18
SKIP_STATIC_CHECK:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    19
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    20
else
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    21
UNIX:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    22
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    23
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    24
# Automatically recognize if building on FreeBSD
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    25
ifeq ($(shell uname),FreeBSD)
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    26
FREEBSD:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    27
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    28
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    29
# Automatically recognize if building on MacOSX
2000
0742fdd448e3 (svn r2506) - Fix: [OSX, makefile] The makefile can now also see OSX 10.4 as OSX
bjarni
parents: 1955
diff changeset
    30
ifeq ($(shell uname), Darwin)
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    31
OSX:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    32
# OSX uses the unix setup too
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    33
UNIX:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    34
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    35
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    36
# Automatically recognize if building on MorphOS
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    37
ifeq ($(shell uname), MorphOS)
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    38
MORPHOS:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    39
# MorphOS uses UNIX setup too
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    40
UNIX:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    41
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    42
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    43
# Automatically recognize if building on BeOS
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    44
ifeq ($(shell uname), BeOS)
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    45
BEOS:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    46
# BeOS uses UNIX setup too
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    47
UNIX:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    48
# Except that in BeOS 5.0 we need to use net_server, not BONE networking
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    49
ifeq ($(shell uname -r), 5.0)
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    50
BEOS_NET_SERVER:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    51
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    52
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    53
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    54
# Automatically recognize if building on SunOS/Solaris
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    55
ifeq ($(shell uname), SunOS)
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    56
SUNOS:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    57
# SunOS uses UNIX setup too
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    58
UNIX:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    59
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    60
3197
078a10118842 (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure
truelight
parents: 3083
diff changeset
    61
# END BYPASS_OS_DETECT
078a10118842 (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure
truelight
parents: 3083
diff changeset
    62
endif
078a10118842 (svn r3864) -Fix: small problems with make-system, making room for a wrapper-configure
truelight
parents: 3083
diff changeset
    63
3406
ee3af0f1932b (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG
peter1138
parents: 3389
diff changeset
    64
SDL_CONFIG:=sdl-config
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    65
3380
2d02cfdf6d14 (svn r4183) -Codechange: [Makefile]: removed MANUAL_CONFIG as it's not used anymore
bjarni
parents: 3313
diff changeset
    66
# set libpng-config to the default value
3406
ee3af0f1932b (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG
peter1138
parents: 3389
diff changeset
    67
LIBPNG_CONFIG :=libpng-config
3380
2d02cfdf6d14 (svn r4183) -Codechange: [Makefile]: removed MANUAL_CONFIG as it's not used anymore
bjarni
parents: 3313
diff changeset
    68
5108
aeaef6fe53b7 (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents: 4628
diff changeset
    69
# set freetype-config to the default value
aeaef6fe53b7 (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents: 4628
diff changeset
    70
FREETYPE_CONFIG:=freetype-config
aeaef6fe53b7 (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents: 4628
diff changeset
    71
5117
d64bf0093ff4 (svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
rubidium
parents: 5108
diff changeset
    72
# set pkg-config to the default value
d64bf0093ff4 (svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
rubidium
parents: 5108
diff changeset
    73
FONTCONFIG_CONFIG:=pkg-config fontconfig
d64bf0093ff4 (svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
rubidium
parents: 5108
diff changeset
    74
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    75
# Networking, enabled by default
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    76
WITH_NETWORK:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    77
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    78
# Library detections
3406
ee3af0f1932b (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG
peter1138
parents: 3389
diff changeset
    79
WITH_SDL:=$(shell $(SDL_CONFIG) --version 2>/dev/null)
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    80
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    81
# libpng detection
3406
ee3af0f1932b (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and LIBPNG_CONFIG
peter1138
parents: 3389
diff changeset
    82
WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null)
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    83
5108
aeaef6fe53b7 (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents: 4628
diff changeset
    84
# Freetype detection
aeaef6fe53b7 (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents: 4628
diff changeset
    85
WITH_FREETYPE:=$(shell $(FREETYPE_CONFIG) --ftversion 2>/dev/null)
aeaef6fe53b7 (svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents: 4628
diff changeset
    86
5117
d64bf0093ff4 (svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
rubidium
parents: 5108
diff changeset
    87
# fontconfig detection
d64bf0093ff4 (svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
rubidium
parents: 5108
diff changeset
    88
WITH_FONTCONFIG:=$(shell $(FONTCONFIG_CONFIG) --modversion 2>/dev/null)
d64bf0093ff4 (svn r7196) -Feature: use fontconfig so one can set the font family name in openttd.cfg instead of the full path to the font.
rubidium
parents: 5108
diff changeset
    89
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    90
ifdef WITH_PNG
3389
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
    91
	# LibPNG depends on Zlib
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
    92
	WITH_ZLIB:=1
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    93
else
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    94
# We go looking for zlib with a little hack
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    95
WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    96
$(shell ls /usr/local/include | grep "zlib.h" 2>/dev/null)
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    97
ifdef WITH_ZLIB
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    98
WITH_ZLIB:=1
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
    99
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   100
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   101
3389
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   102
ifdef WITH_ZLIB
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   103
	TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   104
	ifdef TEMP
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   105
		STATIC_ZLIB_PATH:=/lib/$(TEMP)
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   106
	else
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   107
		TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   108
		ifdef TEMP
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   109
			STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   110
		else
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   111
			TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   112
			ifdef TEMP
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   113
				STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   114
			endif
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   115
		endif
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   116
	endif
56f72f7838cc (svn r4197) reentered STATIC_ZLIB_PATH (removed in 4183) since it turned out that it's used after all
bjarni
parents: 3380
diff changeset
   117
endif
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   118
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   119
# sets the default paths
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   120
ifdef UNIX
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   121
ifndef OSX
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   122
ifndef MORPHOS
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   123
ifndef BIN_DIR
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   124
#BINARY_DIR:=
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   125
#DATA_DIR_PREFIX:=
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   126
#INSTALL_DIR:=/usr/local/
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   127
#USE_HOMEDIR:=
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   128
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   129
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   130
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   131
endif
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   132
2736
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   133
ifdef OSX
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   134
# we prefer to use cocoa drivers rather than SDL drivers
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   135
# if you really want SDL drivers, you can always modify Makefile.config
3308
94df0004ebf1 (svn r4070) -Fix: on OSX COCOA was set by default, even with DEDICATED, while those 2 conflict
truelight
parents: 3197
diff changeset
   136
ifndef DEDICATED
2736
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   137
WITH_COCOA:=1
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   138
WITH_SDL:=
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   139
endif
3308
94df0004ebf1 (svn r4070) -Fix: on OSX COCOA was set by default, even with DEDICATED, while those 2 conflict
truelight
parents: 3197
diff changeset
   140
endif
2736
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   141
3d6487cbbb69 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
bjarni
parents: 2688
diff changeset
   142
543
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   143
# workaround
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   144
# cygwin have problems with libpng, so we will just disable it for now until the problem is solved
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   145
ifdef CYGWIN
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   146
WITH_PNG:=
946badd71033 (svn r942) -Merged branch/network back into the trunk
truelight
parents: 528
diff changeset
   147
endif
3083
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
   148
8afc31558162 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed
bjarni
parents: 2736
diff changeset
   149
endif