openttd: config.lib annotate

annotate config.lib @ 5558:7035f001461c draft

(svn r7942) Trim another 192 lines from the configure monster

author	tron <tron@openttd.org>
date	Sun, 07 Jan 2007 09:48:10 +0000
parents	5fa6a89be82a
children	df0164877d13

rev	line source
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	2 log() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	3 if [ $1 = "1" ]; then echo "$2"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	4 echo "$2" >> $config_log
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	5 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	6
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	7 set_default() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	8 ignore_extra_parameters="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	9 # We set all kinds of defaults for params. Later on the user can override
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	10 # most of them; but if they don't, this default is used.
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	11 build=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	12 host=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	13 cc_build=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	14 cc_host=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	15 cxx_host=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	16 windres=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	17 strip=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	18 lipo=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	19 os="DETECT"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	20 endian="AUTO"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	21 revision=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	22 config_log="config.log"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	23 prefix_dir="/usr/local"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	24 binary_dir="games"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	25 data_dir="share/games/openttd"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	26 icon_dir="share/pixmaps"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	27 personal_dir=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	28 custom_lang_dir=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	29 second_data_dir=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	30 install_dir="/"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	31 enable_install="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	32 enable_debug="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	33 enable_profiling="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	34 enable_dedicated="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	35 enable_network="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	36 enable_static="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	37 enable_translator="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	38 enable_assert="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	39 enable_strip="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	40 enable_universal="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	41 enable_osx_g5="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	42 with_osx_sysroot="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	43 with_application_bundle="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	44 with_sdl="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	45 with_cocoa="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	46 with_zlib="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	47 with_png="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	48 with_makedepend="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	49 with_direct_music="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	50 with_sort="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	51 with_iconv="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	52 with_midi=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	53 with_midi_arg=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	54 with_freetpye="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	55 with_fontconfig="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	56
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	57 save_params_array="build host cc_build cc_host cxx_host windres strip lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_freetype with_fontconfig CC CXX CFLAGS LDFLAGS"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	58 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	59
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	60 detect_params() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	61 # Walk over all params from the user and override any default settings if
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	62 # needed. This also handles any invalid option.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	63 for p in "$@"; do
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	64 if [ -n "$prev_p" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	65 eval "$prev_p=\$p"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	66 prev_p=
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	67 continue
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	68 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	69
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	70 optarg=`expr "x$p" : 'x[^=]=$.$'`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	71
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	72 case "$p" in
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	73 --help \| -h) showhelp; exit 0;;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	74
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	75 --config-log) prev_p="config_log";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	76 --config-log=*) config_log="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	77
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	78 --build) prev_p="build";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	79 --build=*) build="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	80
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	81 --host) prev_p="host";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	82 --host=*) host="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	83
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	84 --os) prev_p="os";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	85 --os=*) os="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	86
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	87 --revision=*) revision="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	88
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	89 --cc-build) prevp_p="cc_build";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	90 --cc-build=*) cc_build="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	91 --cc-host) prevp_p="cc_host";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	92 --cc-host=*) cc_host="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	93 --cxx-host) prevp_p="cxx_host";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	94 --cxx-host=*) cxx_host="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	95 --windres) prevp_p="windres";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	96 --windres=*) windres="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	97 --strip) prevp_p="strip";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	98 --strip=*) strip="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	99 --lipo) prevp_p="lipo";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	100 --lipo=*) lipo="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	101
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	102 --endian) prev_p="endian";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	103 --endian=*) endian="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	104
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	105
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	106
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	107 --prefix-dir) prevp_p="prefix-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	108 --prefix-dir=*) prefix_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	109
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	110 --binary-dir) prevp_p="binary-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	111 --binary-dir=*) binary_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	112
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	113 --data-dir) prevp_p="data-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	114 --data-dir=*) data_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	115
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	116 --icon-dir) prevp_p="icon-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	117 --icon-dir=*) icon_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	118
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	119 --personal-dir) prevp_p="personal-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	120 --personal-dir=*) personal_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	121
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	122 --install-dir) prevp_p="install-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	123 --install-dir=*) install_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	124
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	125 # TODO: The next few cases will be removed when the search path patch is applied
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	126 --custom-lang-dir) prevp_p="custom-lang-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	127 --custom-lang-dir=*) custom_lang_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	128
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	129 --second-data-dir) prevp_p="second-data-dir";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	130 --second-data-dir=*) second_data_dir="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	131
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	132 --enable-install) enable_install="1";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	133 --enable-install=*) enable_install="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	134 # TODO: End of to be removed cases
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	135
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	136
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	137 --enable-debug) enable_debug="1";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	138 --enable-debug=*) enable_debug="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	139 --enable-profiling) enable_profiling="1";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	140 --enable-profiling=*) enable_profiling="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	141 --enable-dedicated) enable_dedicated="1";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	142 --enable-dedicated=*) enable_dedicated="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	143 --enable-network=*) enable_network="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	144 --disable-network) enable_network="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	145 --disable-static) enable_static="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	146 --enable-static) enable_static="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	147 --enable-static=*) enable_static="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	148 --disable-translator) enable_translator="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	149 --enable-translator) enable_translator="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	150 --enable-translator=*) enable_translator="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	151 --disable-assert) enable_assert="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	152 --enable-assert) enable_assert="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	153 --enable-assert=*) enable_assert="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	154 --disable-strip) enable_strip="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	155 --enable-strip) enable_strip="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	156 --enable-strip=*) enable_strip="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	157 --disable-universal) enable_universal="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	158 --enable-universal) enable_universal="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	159 --enable-universal=*) enable_universal="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	160 --disable-osx-g5) enable_osx_g5="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	161 --enable-osx-g5) enable_osx_g5="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	162 --enable-osx-g5=*) enable_osx_g5="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	163
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	164 --with-sdl) with_sdl="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	165 --without-sdl) with_sdl="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	166 --with-sdl=*) with_sdl="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	167
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	168 --with-cocoa) with_cocoa="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	169 --without-cocoa) with_cocoa="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	170 --with-cocoa=*) with_cocoa="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	171
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	172 --with-zlib) with_zlib="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	173 --without-zlib) with_zlib="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	174 --with-zlib=*) with_zlib="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	175
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	176 --with-png) with_png="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	177 --without-png) with_png="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	178 --with-png=*) with_png="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	179 --with-libpng) with_png="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	180 --without-libpng) with_png="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	181 --with-libpng=*) with_png="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	182
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	183 --with-freetype) with_freetype="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	184 --without-freetype) with_freetype="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	185 --with-freetype=*) with_freetype="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	186 --with-libfreetype) with_freetype="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	187 --without-libfreetype) with_freetype="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	188 --with-libfreetype=*) with_freetype="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	189
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	190 --with-fontconfig) with_fontconfig="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	191 --without-fontconfig) with_fontconfig="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	192 --with-fontconfig=*) with_fontconfig="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	193 --with-libfontconfig) with_fontconfig="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	194 --without-libfontconfig) with_fontconfig="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	195 --with-libfontconfig=*) with_fontconfig="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	196
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	197 --with-makedepend) with_makedepend="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	198 --without-makedepend) with_makedepend="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	199 --with-makedepend=*) with_makedepend="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	200
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	201 --with-direct-music) with_direct_music="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	202 --without-direct-music) with_direct_music="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	203 --with-direct-music=*) with_direct_music="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	204
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	205 --with-sort) with_sort="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	206 --without-sort) with_sort="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	207 --with-sort=*) with_sort="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	208
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	209 --with-iconv) with_iconv="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	210 --without-iconv) with_iconv="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	211 --with-iconv=*) with_iconv="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	212
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	213 --with-midi=*) with_midi="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	214 --with-midi-arg=*) with_midi_arg="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	215
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	216 --without-osx-sysroot) with_osx_sysroot="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	217 --with-osx-sysroot) with_osx_sysroot="2";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	218 --with-osx-sysroot=*) with_osx_sysroot="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	219
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	220 --without-application-bundle) with_applicant_bundle="0";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	221 --with-application-bundle) with_applicant_bundle="1";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	222 --with-application-bundle=*) with_applicant_bundle="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	223
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	224 CC=* \| --CC=*) CC="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	225 CXX=* \| --CXX=*) CXX="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	226 CFLAGS=* \| --CFLAGS=*) CFLAGS="$optarg";;
53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	227 LDFLAGS=* \| --LDFLAGS=*) LDFLAGS="$optarg";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	228
5536 53ee3b852d46 (svn r7877) Improve readability and shorten the configure script by 241 lines tron <tron@openttd.org> parents: 5515 diff changeset	229 --ignore-extra-parameters) ignore_extra_parameters="1";;
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	230
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	231 --*)
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	232 if [ "$ignore_extra_parameters" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	233 echo "Unknown option $p"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	234 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	235 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	236 echo "Unknown option $p ignored"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	237 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	238 ;;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	239 esac
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	240 done
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	241
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	242 if [ -n "$prev_p" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	243 echo "configure: error: missing argument to --$prev_p"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	244 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	245 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	246
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	247 # Clean the logfile
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	248 echo "" > $config_log
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	249 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	250
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	251 save_params() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	252 # Here we save all params, so we can later on do an exact redo of this
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	253 # configuration, without having the user to re-input stuff
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	254
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	255 echo "Running configure with following options:" >> $config_log
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	256 echo "" >> $config_log
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	257
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	258 configure="$0 --ignore-extra-parameters"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	259 for p in $save_params_array; do
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	260 eval "v=\$$p"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	261 p=`echo "$p" \| sed 's/_/-/g;s/\n//g;'`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	262 # Only save those params that aren't empty
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	263 configure="$configure --$p=$v"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	264 done
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	265
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	266 echo "$configure" >> $config_log
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	267 echo "$configure" > config.cache
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	268 echo "" >> $config_log
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	269 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	270
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	271 check_params() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	272 # Some params want to be in full uppercase, else they might not work as
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	273 # expected.. fix that here
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	274
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	275 endian=`echo $endian \| tr [:lower:] [:upper:]`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	276 os=`echo $os \| tr [:lower:] [:upper:]`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	277
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	278 # Check if all params have valid values
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	279
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	280 # Endian only allows AUTO, LE and, BE
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	281 if ! echo $endian \| grep -Eq "^(AUTO\|LE\|BE)$"; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	282 echo "configure: error: invalid option --endian=$endian"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	283 echo " Available options are: --endian=[AUTO\|LE\|BE]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	284 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	285 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	286 # OS only allows DETECT, UNIX, OSX, FREEBSD, MORPHOS, BEOS, SUNOS, CYGWIN, and MINGW, OS2
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	287 if ! echo $os \| grep -Eq "^(DETECT\|UNIX\|OSX\|FREEBSD\|MORPHOS\|BEOS\|SUNOS\|CYGWIN\|MINGW\|OS2)$"; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	288 echo "configure: error: invalid option --os=$os"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	289 echo " Available options are: --os=[DETECT\|UNIX\|OSX\|FREEBSD\|MORPHOS\|BEOS\|SUNOS\|CYGWIN\|MINGW\|OS2]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	290 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	291 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	292 # enable_debug should be between 0 and 4
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	293 if ! echo $enable_debug \| grep -q "^[0123]$"; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	294 echo "configure: error: invalid option --enable-debug=$enable_debug"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	295 echo " Available options are: --enable-debug[=0123]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	296 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	297 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	298
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	299 check_build
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	300 check_host
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	301
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	302 detect_os
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	303
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	304 # We might enable universal builds always on OSX targets.. but currently we don't
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	305 # if [ "$enable_universal" = "1" ] && [ "$os" != "OSX" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	306 if [ "$enable_universal" = "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	307 enable_universal="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	308 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	309 if [ "$enable_universal" = "2" ] && [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	310 log 1 "configure: error: --enable-universal only works on OSX"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	311 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	312 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	313 if [ "$enable_universal" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	314 log 1 "checking universal build... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	315 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	316 log 1 "checking universal build... yes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	317 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	318
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	319 # Already detected by check_build
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	320 log 1 "checking for build gcc... $cc_build"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	321 log 1 "checking for host gcc... $cc_host"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	322
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	323 check_cxx
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	324 check_windres
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	325 check_strip
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	326 check_lipo
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	327 check_makedepend
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	328
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	329 if [ "$enable_static" = "1" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	330 if [ "$os" = "MINGW" ] \|\| [ "$os" = "CYGWIN" ] \|\| [ "$os" = "MORPHOS" ] \|\| [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	331 enable_static="2"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	332 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	333 enable_static="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	334 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	335 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	336
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	337 if [ "$enable_static" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	338 log 1 "checking for static... yes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	339
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	340 if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	341 log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	342 log 1 "WARNING: use static at your own risk on this platform"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	343
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	344 sleep 5
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	345 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	346 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	347 log 1 "checking for static... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	348 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	349
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	350 # Show what we configured
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	351 if [ "$enable_debug" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	352 log 1 "using debug level... no"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	353 elif [ "$enable_profiling" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	354 log 1 "using debug level... profiling (debug level $enable_debug)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	355 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	356 log 1 "using debug level... level $enable_debug"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	357 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	358
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	359 detect_sdl
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	360 detect_cocoa
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	361
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	362 if [ "$enable_dedicated" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	363 log 1 "checking GDI video driver... skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	364 log 1 "checking dedicated... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	365
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	366 if [ "$enable_network" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	367 log 1 "WARNING: compiling a dedicated server without network is pointless"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	368 sleep 5
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	369 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	370 else
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	371 if [ "$os" = "MINGW" ] \|\| [ "$os" = "CYGWIN" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	372 log 1 "checking GDI video driver... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	373 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	374 log 1 "checking GDI video driver... not Windows, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	375 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	376
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	377 if [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	378 log 1 "WARNING: no video driver found, building dedicated only"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	379 enable_dedicated="1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	380 sleep 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	381
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	382 log 1 "checking dedicated... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	383 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	384 log 1 "checking dedicated... not selected"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	385 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	386 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	387
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	388 if [ "$enable_network" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	389 log 1 "checking network... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	390 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	391 log 1 "checking network... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	392 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	393
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	394 if [ "$enable_translator" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	395 log 1 "checking translator... debug"
5485 63c1aa81e73d (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa. rubidium <rubidium@openttd.org> parents: 5479 diff changeset	396 # -t shows TODO items, normally they are muted
63c1aa81e73d (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa. rubidium <rubidium@openttd.org> parents: 5479 diff changeset	397 strgen_flags="-t"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	398 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	399 log 1 "checking translator... no"
5485 63c1aa81e73d (svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa. rubidium <rubidium@openttd.org> parents: 5479 diff changeset	400 strgen_flags=""
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	401 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	402
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	403 if [ "$enable_assert" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	404 log 1 "checking assert... enabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	405 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	406 log 1 "checking assert... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	407 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	408
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	409 detect_zlib
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	410 detect_png
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	411 detect_freetype
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	412 detect_fontconfig
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	413 detect_iconv
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	414
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	415 if [ "$with_direct_music" = "1" ] \|\| [ "$with_direct_music" = "2" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	416 if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	417 if [ "$with_direct_music" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	418 log 1 "configure: error: direct-music is only supported on Win32 targets"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	419 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	420 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	421 with_direct_music="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	422
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	423 log 1 "checking direct-music... not Windows, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	424 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	425 check_direct_music
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	426 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	427 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	428
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	429 detect_sort
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	430
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	431 if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	432 endian="PREPROCESSOR"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	433 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	434
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	435 log 1 "checking endianess... $endian"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	436
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	437 # Suppress language errors when there is a version defined, indicating a release
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	438 # It just isn't pretty if any release produces warnings in the languages.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	439 if [ -f "$ROOT_DIR/version" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	440 lang_suppress="yes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	441 log 1 "suppress language errors... yes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	442 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	443 lang_suppress=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	444 log 1 "suppress language errors... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	445 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	446
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	447 if [ "$enable_debug" = "0" ] && [ "$enable_profiling" = "0" ] && [ "$enable_strip" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	448 if [ "$os" = "MORPHOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	449 strip_arg="--strip-all --strip-unneeded --remove-section .comment"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	450 elif [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	451 strip_arg=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	452 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	453 strip_arg="-s"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	454 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	455
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	456 log 1 "checking stripping... $strip $strip_arg"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	457 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	458 strip=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	459 log 1 "checking stripping... skipped"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	460 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	461
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	462 if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	463 if [ "$with_osx_sysroot" = "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	464 with_osx_sysroot="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	465
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	466 log 1 "checking OSX sysroot... not OSX, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	467 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	468 log 1 "configure: error: --with-osx-sysroot only works if OSX is the target"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	469 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	470 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	471 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	472
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	473 if [ "$with_osx_sysroot" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	474 if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	475 log 1 "checking OSX sysroot... $with_osx_sysroot"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	476 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	477 # If autodetect and no universal, use system default
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	478 if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	479 log 1 "checking OSX sysroot... no (use system default)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	480 with_osx_sysroot="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	481 else
5541 73a0352b8303 (svn r7883) It's spelled 'automatically' tron <tron@openttd.org> parents: 5539 diff changeset	482 log 1 "checking OSX sysroot... automatically"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	483 with_osx_sysroot="3"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	484 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	485 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	486 else
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	487 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	488 log 1 "checking OSX sysroot... no (use system default)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	489 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	490 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	491
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	492 if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	493 if [ "$with_application_bundle" = "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	494 with_application_bundle="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	495
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	496 log 1 "checking OSX application bundle... not OSX, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	497 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	498 log 1 "configure: error: --with-application-bundle only works if OSX is the target"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	499 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	500 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	501 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	502
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	503 if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	504 OSXAPP="OpenTTD.app"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	505
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	506 # TODO: remove next few lines of code when the search path patch has been applied
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	507 if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "$(OSXAPP)/Contents/Lang/" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	508 log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	509 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	510 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	511
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	512 if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "$(OSXAPP)/Contents/Data/" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	513 log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	514 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	515 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	516
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	517 custom_lang_dir="${OSXAPP}/Contents/Lang/"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	518 second_data_dir="${OSXAPP}/Contents/Data/"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	519 # TODO: remove till here
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	520 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	521 OSXAPP=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	522 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	523
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	524 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	525 # Test on G5
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	526
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	527 if [ "$enable_osx_g5" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	528 log 1 "detecting G5... yes (forced)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	529 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	530 # First, are we a real OSX system, else we can't detect it
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	531 native=`LC_ALL=C uname \| tr [:upper:] [:lower:] \| grep darwin`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	532 # If $host doesn't match $build , we are cross-compiling
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	533 if [ -n "$native" ] && [ "$build" != "$host" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	534 $cc_build $SRC_DIR/os/macosx/G5_detector.c -o G5_detector
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	535 res=`./G5_detector`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	536 rm -f G5_detector
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	537 if [ -n "$res" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	538 # This is G5, add flags for it
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	539 enable_osx_g5="2"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	540
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	541 log 1 "detecting G5... yes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	542 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	543 enable_osx_g5="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	544
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	545 log 1 "detecting G5... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	546 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	547 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	548 enable_osx_g5="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	549
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	550 log 1 "detecting G5... no (cross-compiling)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	551 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	552 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	553 else
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	554 if [ "$enable_osx_g5" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	555 log 1 "configure: error: OSX G5 selected, but not compiling for OSX"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	556 log 1 "configure: error: either select OSX as OS, or deselect OSX G5"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	557
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	558 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	559 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	560 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	561 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	562
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	563 make_cflags_and_ldflags() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	564 # General CFlags for BUILD
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	565 CFLAGS_BUILD=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	566 # General CFlags for HOST
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	567 CFLAGS="$CFLAGS -D$os -DWITH_REV"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	568 # CFlags for HOST and C-Compiler
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	569 CC_FLAGS=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	570 # Libs to compile. In fact this is just LDFLAGS
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	571 LIBS="-lstdc++"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	572 # LDFLAGS used for HOST
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	573 LDFLAGS="$LDFLAGS"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	574
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	575 if [ $enable_debug = 0 ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	576 # No debug, add default stuff
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	577 OBJS_SUBDIR="release"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	578 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	579 # these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	580 CFLAGS="$CFLAGS -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	581 else
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	582 if [ "$os" = "MORPHOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	583 CFLAGS="$CFLAGS -I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	584 CFLAGS="$CFLAGS -mcpu=604 -fno-inline -mstring -mmultiple"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	585 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	586
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	587 CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	588 fi
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	589 else
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	590 OBJS_SUBDIR="debug"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	591
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	592 # Each debug level reduces the optimalization by a bit
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	593 if [ $enable_debug -ge 1 ]; then
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	594 CFLAGS="$CFLAGS -g -D_DEBUG"
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	595 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	596 if [ $enable_debug -ge 2 ]; then
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	597 CFLAGS="$CFLAGS -fno-inline"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	598 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	599 if [ $enable_debug -ge 3 ]; then
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	600 CFLAGS="$CFLAGS -O0"
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	601 else
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	602 CFLAGS="$CFLAGS -O2"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	603 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	604 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	605
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	606 if [ "$enable_profiling" != "0" ]; then
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	607 CFLAGS="$CFLAGS -p"
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	608 LDFLAGS="$LDFLAGS -pg"
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	609 fi
b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	610
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	611 # Enable some things only for certain GCC versions
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	612 cc_version=`$cc_host -dumpversion \| cut -c 1,3`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	613
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	614 if [ $cc_version -ge 29 ]; then
5551 b4c8b31cf7f9 (svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations. rubidium <rubidium@openttd.org> parents: 5549 diff changeset	615 CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	616 CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	617
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	618 CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	619 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	620
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	621 if [ $cc_version -ge 30 ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	622 CFLAGS="$CFLAGS -W -Wno-unused-parameter"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	623 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	624
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	625 if [ $cc_version -ge 34 ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	626 CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	627 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	628
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	629 if [ "$os" = "CYGWIN" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	630 CFLAGS="$CFLAGS -mwin32"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	631 LDFLAGS="$LDFLAGS -mwin32"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	632 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	633 if [ "$os" = "MINGW" ] \|\| [ "$os" = "CYGWIN" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	634 CFLAGS="$CFLAGS -mno-cygwin"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	635 LDFLAGS="$LDFLAGS -mno-cygwin"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	636 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	637
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	638 if [ "$os" = "CYGWIN" ] \|\| [ "$os" = "MINGW" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	639 LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	640 LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	641 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	642
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	643 if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	644 LIBS="$LIBS -lpthread"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	645 LIBS="$LIBS -lrt"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	646 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	647
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	648 if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	649 LIBS="$LIBS -lc"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	650 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	651
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	652 if [ "$os" = "MORPHOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	653 # -Wstrict-prototypes generates much noise because of system headers
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	654 CFLAGS="$CFLAGS -Wno-strict-prototypes"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	655 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	656
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	657 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	658 LDFLAGS="$LDFLAGS -framework Cocoa"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	659 if [ "$enable_dedicated" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	660 LIBS="$LIBS -framework QuickTime"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	661 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	662 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	663
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	664 if [ "$os" = "BEOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	665 LIBS="$LIBS -lmidi -lbe"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	666 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	667
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	668 # Most targets act like UNIX, just with some additions
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	669 if [ "$os" = "BEOS" ] \|\| [ "$os" = "OSX" ] \|\| [ "$os" = "MORPHOS" ] \|\| [ "$os" = "FREEBSD" ] \|\| [ "$os" = "SUNOS" ] \|\| [ "$os" = "OS2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	670 CFLAGS="$CFLAGS -DUNIX"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	671 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	672 # And others like Windows
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	673 if [ "$os" = "MINGW" ] \|\| [ "$os" = "CYGWIN" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	674 CFLAGS="$CFLAGS -DWIN"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	675 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	676
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	677 if [ -n "$sdl_config" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	678 CFLAGS="$CFLAGS -DWITH_SDL"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	679 CFLAGS="$CFLAGS `$sdl_config --cflags`"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	680 if [ "$enable_static" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	681 LIBS="$LIBS `$sdl_config --static-libs`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	682 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	683 LIBS="$LIBS `$sdl_config --libs`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	684 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	685 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	686
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	687 if [ "$with_cocoa" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	688 CFLAGS="$CFLAGS -DWITH_COCOA"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	689 LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	690 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	691
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	692 if [ "$with_zlib" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	693 if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	694 LIBS="$LIBS $zlib"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	695 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	696 LIBS="$LIBS -lz"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	697 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	698 CFLAGS="$CFLAGS -DWITH_ZLIB"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	699 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	700
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	701 if [ -n "$png_config" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	702 CFLAGS="$CFLAGS -DWITH_PNG"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	703 CFLAGS="$CFLAGS `$png_config --cppflags --I_opts \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	704
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	705 # The extra flags are unneeded for latest libpng-config, but some versions are so broken...
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	706 if [ "$enable_static" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	707 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	708 LIBS="$LIBS `$png_config --prefix`/lib/libpng.a"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	709 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	710 LIBS="$LIBS `$png_config --static --ldflags --libs --L_opts \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	711 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	712 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	713 LIBS="$LIBS `$png_config --ldflags --libs --L_opts \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	714 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	715 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	716
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	717 if [ -n "$freetype_config" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	718 CFLAGS="$CFLAGS -DWITH_FREETYPE"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	719 CFLAGS="$CFLAGS `$freetype_config --cflags \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	720
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	721 if [ "$enable_static" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	722 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	723 LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	724 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	725 # Is it possible to do static with freetype, if so: how?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	726 LIBS="$LIBS `$freetype_config --libs \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	727 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	728 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	729 LIBS="$LIBS `$freetype_config --libs \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	730 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	731 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	732
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	733 if [ -n "$fontconfig_config" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	734 CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	735 CFLAGS="$CFLAGS `$fontconfig_config --cflags \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	736
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	737 if [ "$enable_static" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	738 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	739 LIBS="$LIBS `$fontconfig_config --prefix`/lib/libfontconfig.a"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	740 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	741 LIBS="$LIBS `$fontconfig_config --libs --static \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	742 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	743 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	744 LIBS="$LIBS `$fontconfig_config --libs \| tr '\n\r' ' '`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	745 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	746 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	747
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	748 if [ "$with_direct_music" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	749 CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	750 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	751
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	752 if [ "$with_iconv" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	753 CFLAGS="$CFLAGS -DWITH_ICONV"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	754 LIBS="$LIBS -liconv"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	755 if [ "$with_iconv" != "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	756 CFLAGS="$CFLAGS -I$with_iconv/include"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	757 LIBS="$LIBS -L$with_iconv/lib"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	758 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	759 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	760
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	761 if [ -n "$with_midi" ]; then
5549 9035921fdb97 (svn r7922) -Fix: bad escaping in CFLAGS glx <glx@openttd.org> parents: 5541 diff changeset	762 CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\\\\\"$with_midi\\\\\""
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	763 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	764 if [ -n "$with_midi_arg" ]; then
5549 9035921fdb97 (svn r7922) -Fix: bad escaping in CFLAGS glx <glx@openttd.org> parents: 5541 diff changeset	765 CFLAGS="$CFLAGS -DMIDI_ARG=\\\\\"$with_midi_arg\\\\\""
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	766 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	767
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	768 if [ "$enable_dedicated" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	769 CFLAGS="$CFLAGS -DDEDICATED"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	770 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	771
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	772 if [ "$enable_network" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	773 CFLAGS="$CFLAGS -DENABLE_NETWORK"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	774
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	775 if [ "$os" = "BEOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	776 LDFLAGS="$LDFLAGS -lbind -lsocket"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	777 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	778
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	779 if [ "$os" = "SUNOS" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	780 LDFLAGS="$LDFLAGS -lnsl -lsocket"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	781 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	782 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	783
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	784 if [ "$enable_static" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	785 # OSX can't handle -static in LDFLAGS
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	786 if [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	787 LDFLAGS="$LDFLAGS -static"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	788 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	789 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	790
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	791 if [ "$enable_assert" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	792 CFLAGS="$CFLAGS -DNDEBUG"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	793 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	794
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	795 if [ "$enable_osx_g5" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	796 CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	797 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	798
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	799 if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	800 CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	801 LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	802 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	803
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	804 # TODO: remove next few lines of code when the search path patch has been applied
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	805 if [ -n "$second_data_dir" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	806 CFLAGS="$CFLAGS -DSECOND_DATA_DIR=\\\\\"$second_data_dir\\\\\""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	807 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	808
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	809 if [ -n "$custom_lang_dir" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	810 CFLAGS="$CFLAGS -DCUSTOM_LANG_DIR=\\\\\"$custom_lang_dir\\\\\""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	811 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	812 # TODO: remove till here
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	813
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	814 if [ "$enable_install" = "1" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	815 if [ -n "$personal_dir" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	816 CFLAGS="$CFLAGS -DUSE_HOMEDIR=1 -DPERSONAL_DIR=\\\\\"$personal_dir/\\\\\""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	817 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	818
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	819 if [ -n "$data_dir" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	820 CFLAGS="$CFLAGS -DGAME_DATA_DIR=\\\\\"$prefix_dir/$data_dir/\\\\\""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	821 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	822
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	823 if [ -n "$icon_dir" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	824 CFLAGS="$CFLAGS -DICON_DIR=\\\\\"$prefix_dir/$icon_dir/\\\\\""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	825 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	826 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	827
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	828 if [ -n "$revision" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	829 log 1 "checking revision... $revision"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	830 log 1 "WARNING: we do not advise you to use this setting"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	831 log 1 "WARNING: in most cases it is not safe for network use"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	832 log 1 "WARNING: USE WITH CAUTION!"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	833
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	834 sleep 5
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	835 elif [ -f "$ROOT_DIR/version" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	836 revision="`cat $ROOT_DIR/version`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	837
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	838 log 1 "checking revision... $revision"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	839 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	840 revision=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	841
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	842 log 1 "checking revision... svn detection"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	843 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	844
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	845 log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	846 log 1 "using LDFLAGS... $LIBS $LDFLAGS"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	847
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	848 # Makedepend doesn't like something like: -isysroot /OSX/blabla
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	849 # so convert it to: -isysroot -OSX/blabla. makedepend just ignores
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	850 # any - command it doesn't know, so we are pretty save.
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	851 # Lovely hackish, not?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	852 # Btw, this almost always comes from outside the configure, so it is
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	853 # not something we can control.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	854 if [ "$with_makedepend" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	855 cflags_makedep="` echo "$CFLAGS" \| sed 's# /# -#g'`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	856 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	857 makedepend=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	858 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	859 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	860
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	861 check_compiler() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	862 # Params:
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	863 # $1 - Type for message (build / host)
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	864 # $2 - What to fill with the found compiler
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	865 # $3 - System to try
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	866 # $4 - Compiler to try
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	867 # $5 - Env-setting to try
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	868 # $6 - GCC alike to try
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	869 # $7 - CC alike to try
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	870 # $8 - "0" gcc, "1" g++, "2" windres, "3" strip, "4" lipo
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	871 # $9 - What the command is to check for
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	872
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	873 if [ -n "$3" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	874 # Check for system
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	875 machine=`$3-$6 $9 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	876 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	877 eval "$2=$3-$6"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	878
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	879 log 2 "executing $3-$6 $9"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	880 log 2 " returned $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	881 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	882
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	883 if ( [ -z "$machine" ] && [ "$8" != "3" ] ) \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	884 log 1 "checking $1... $3-$6 not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	885 log 1 "I couldn't detect any $6 binary for $3"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	886 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	887 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	888
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	889 if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] \|\| [ "$8" = "1" ] ); then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	890 log 1 "checking $1... expected $3, found $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	891 log 1 "the compiler suggests it doesn't build code for the machine you specified"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	892 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	893 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	894 elif [ -n "$4" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	895 # Check for manual compiler
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	896 machine=`$4 $9 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	897 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	898 eval "$2=$4"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	899
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	900 log 2 "executing $4 $9"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	901 log 2 " returned $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	902 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	903
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	904 if ( [ -z "$machine" ] && [ "$8" != "3" ] ) \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	905 log 1 "checking $1... $4 not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	906 log 1 "the selected binary doesn't seem to be a $6 binary"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	907 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	908 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	909 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	910 # Nothing given, autodetect
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	911
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	912 if [ -n "$5" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	913 machine=`$5 $9 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	914 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	915 eval "$2=$5"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	916
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	917 log 2 "executing $5 $9"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	918 log 2 " returned $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	919 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	920
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	921 # The user defined a GCC that doesn't reply to $9.. abort
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	922 if ( [ -z "$machine" ] && [ "$8" != "3" ] ) \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	923 log 1 "checking $1... $5 unusable"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	924 log 1 "the CC environment variable is set, but it doesn't seem to be a $6 binary"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	925 log 1 "please redefine the CC/CXX environment to a $6 binary"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	926 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	927 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	928 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	929 log 2 "checking $1... CC/CXX not set (skipping)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	930
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	931 # No $5, so try '$6'
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	932 machine=`$6 $9 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	933 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	934 eval "$2=$6"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	935
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	936 log 2 "executing $6 $9"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	937 log 2 " returned $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	938 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	939
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	940 if ( [ -z "$machine" ] && [ "$8" != "3" ] ) \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	941 # Maybe '$7'?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	942 machine=`$7 $9 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	943 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	944 eval "$2=$7"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	945
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	946 log 2 "executing $7 $9"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	947 log 2 " returned $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	948 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	949
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	950 # All failed, abort
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	951 if [ -z "$machine" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	952 log 1 "checking $1... $6 not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	953 log 1 "I couldn't detect any $6 binary on your system"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	954 log 1 "please define the CC/CXX environment to where it is located"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	955
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	956 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	957 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	958 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	959 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	960 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	961
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	962 if [ "$8" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	963 eval "res=\$$2"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	964 log 1 "checking $1... $res"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	965 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	966 log 1 "checking $1... $machine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	967 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	968 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	969
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	970 check_build() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	971 check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	972 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	973
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	974 check_host() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	975 # By default the host is the build
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	976 if [ -z "$host" ]; then host="$build"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	977 check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	978 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	979
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	980 check_cxx() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	981 check_compiler "host g++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	982 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	983
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	984 check_windres() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	985 if [ "$os" = "MINGW" ] \|\| [ "$os" = "CYGWIN" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	986 check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	987 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	988 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	989
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	990 check_strip() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	991 if [ "$os" = "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	992 # Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	993 echo "int main(int argc, char *argv[]) { }" > strip.test.c
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	994 $cc_host strip.test.c -o strip.test
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	995 check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	996 rm -f strip.test.c strip.test
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	997 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	998 check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "-V"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	999 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1000 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1001
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1002 check_lipo() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1003 if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1004 echo "int main(int argc, char *argv[]) { }" > lipo.test.c
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1005 $cc_host lipo.test.c -o lipo.test
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1006 check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1007 rm -f lipo.test.c lipo.test
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1008 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1009 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1010
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1011 check_direct_music() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1012 echo "
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1013 #include <windows.h>
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1014 #include <dmksctrl.h>
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1015 #include <dmusici.h>
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1016 #include <dmusicc.h>
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1017 #include <dmusicf.h>
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1018 int main(int argc, char *argv[]) { }" > direct_music.test.c
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1019 $cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1020 res=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1021 rm -f direct_music.test.c direct_music.test
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1022
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1023 if [ "$res" != "0" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1024 if [ "$with_direct_music" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1025 log 1 "configure: error: direct-music is not available on this system"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1026 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1027 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1028 with_direct_music="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1029
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1030 log 1 "checking direct-music... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1031 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1032 log 1 "checking direct-music... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1033 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1034 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1035
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1036 check_makedepend() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1037 if [ "$with_makedepend" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1038 log 1 "checking makedepend... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1039 return
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1040 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1041
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1042 if [ "$with_makedepend" = "1" ] \|\| [ "$with_makedepend" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1043 makedepend="makedepend"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1044 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1045 makedepend="$with_makedepend"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1046 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1047
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1048 rm -f makedepend.tmp
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1049 touch makedepend.tmp
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1050 res=`$makedepend -fmakedepend.tmp 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1051 res=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1052 log 2 "executing $makedepend -f makedepend.tmp"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1053 log 2 " returned `cat makedepend.tmp`"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1054 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1055
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1056 if [ ! -s makedepend.tmp ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1057 rm -f makedepend.tmp makedepend.tmp.bak
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1058
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1059 if [ "$with_makedepend" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1060 log 1 "checking makedepend... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1061
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1062 log 1 "I couldn't detect any makedepend on your system"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1063 log 1 "please locate it via --makedepend=[binary]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1064
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1065 exit 1
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1066 elif [ "$with_makedepend" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1067 log 1 "checking makedepend... $makedepend not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1068
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1069 log 1 "the selected file doesn't seem to be a valid makedepend binary"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1070
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1071 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1072 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1073 log 1 "checking makedepend... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1074
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1075 with_makedepend="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1076 return
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1077 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1078 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1079
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1080 rm -f makedepend.tmp makedepend.tmp.bak
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1081
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1082 log 1 "checking makedepend... $makedepend"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1083 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1084
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1085 detect_os() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1086 if [ $os = "DETECT" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1087 # Detect UNIX, OSX, FREEBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW and OS2
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1088
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1089 # Try first via dumpmachine, then via uname
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1090 os=`echo "$host" \| tr [:upper:] [:lower:] \| awk '
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1091 /linux/ { print "UNIX"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1092 /darwin/ { print "OSX"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1093 /freebsd/ { print "FREEBSD"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1094 /morphos/ { print "MORPHOS"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1095 /beos/ { print "BEOS"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1096 /sunos/ { print "SUNOS"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1097 /cygwin/ { print "CYGWIN"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1098 /mingw/ { print "MINGW"; exit}
5539 9e37e2966e15 (svn r7881) [Configure] -Fix: OS2 GCC indentifies itself with os2, not os/2 truelight <truelight@openttd.org> parents: 5538 diff changeset	1099 /os2/ { print "OS2"; exit}
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1100 '`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1101
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1102 if [ -z "$os" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1103 os=`LC_ALL=C uname \| tr [:upper:] [:lower:] \| awk '
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1104 /linux/ { print "UNIX"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1105 /darwin/ { print "OSX"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1106 /freebsd/ { print "FREEBSD"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1107 /morphos/ { print "MORPHOS"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1108 /beos/ { print "BEOS"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1109 /sunos/ { print "SUNOS"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1110 /cygwin/ { print "CYGWIN"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1111 /mingw/ { print "MINGW"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1112 /os\/2/ { print "OS2"; exit}
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1113 '`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1114 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1115
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1116 if [ -z "$os" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1117 log 1 "detecting OS... none detected"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1118 log 1 "I couldn't detect your OS. Please use --with-os=OS to force one"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1119 log 1 "Allowed values are: UNIX, OSX, FREEBSD, MORPHOS, BEOS, SUNOS, CYGWIN, and MINGW"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1120 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1121 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1122
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1123 log 1 "detecting OS... $os"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1124 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1125 log 1 "forcing OS... $os"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1126 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1127 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1128
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1129 detect_sdl() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1130 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1131 if [ "$with_sdl" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1132 log 1 "checking SDL... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1133
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1134 sdl_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1135 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1136 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1137
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1138 if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1139 log 1 "configure: error: it is impossible to compile both SDL and COCOA"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1140 log 1 "configure: error: please deselect one of them and try again"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1141 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1142 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1143
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1144 if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1145 log 1 "configure: error: it is impossible to compile a dedicated with SDL"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1146 log 1 "configure: error: please deselect one of them and try again"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1147 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1148 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1149
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1150 if [ "$enable_dedicated" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1151 log 1 "checking SDL... skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1152
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1153 sdl_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1154 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1155 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1156
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1157 # By default on OSX we don't use SDL. The rest is auto-detect
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1158 if [ "$with_sdl" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1159 log 1 "checking SDL... OSX, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1160
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1161 sdl_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1162 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1163 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1164
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1165 if [ "$with_sdl" = "1" ] \|\| [ "$with_sdl" = "" ] \|\| [ "$with_sdl" = "2" ]; then
5537 6e2ee11f42f0 (svn r7878) Remove the long gone sdl11-config (again) tron <tron@openttd.org> parents: 5536 diff changeset	1166 sdl_config="sdl-config"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1167 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1168 sdl_config="$with_sdl"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1169 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1170
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1171 version=`$sdl_config --version 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1172 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1173 log 2 "executing $sdl_config --version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1174 log 2 " returned $version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1175 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1176
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1177 if [ -z "$version" ] \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1178 log 1 "checking SDL... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1179
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1180 # It was forced, so it should be found.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1181 if [ "$with_sdl" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1182 log 1 "configure: error: sdl-config couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1183 log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1184 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1185 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1186
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1187 sdl_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1188 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1189 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1190
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1191 log 1 "checking SDL... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1192 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1193
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1194 detect_cocoa() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1195 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1196 if [ "$with_cocoa" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1197 log 1 "checking COCOA... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1198
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1199 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1200 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1201
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1202 if [ "$with_cocoa" = "2" ] && [ "$enable_dedicated" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1203 log 1 "configure: error: it is impossible to compile a dedicated with COCOA"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1204 log 1 "configure: error: please deselect one of them and try again"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1205 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1206 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1207
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1208 if [ "$enable_dedicated" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1209 log 1 "checking COCOA... skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1210
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1211 with_cocoa="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1212 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1213 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1214
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1215 # By default on OSX we use COCOA. The rest doesn't support it
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1216 if [ "$with_cocoa" = "1" ] && [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1217 log 1 "checking COCOA... not OSX, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1218
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1219 with_cocoa="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1220 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1221 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1222
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1223 if [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1224 log 1 "checking COCOA... not OSX"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1225
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1226 log 1 "configure: error: COCOA video driver is only supported for OSX"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1227 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1228 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1229
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1230 log 1 "checking COCOA... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1231 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1232
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1233 detect_zlib() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1234 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1235 if [ "$with_zlib" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1236 log 1 "checking zlib... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1237
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1238 zlib=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1239 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1240 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1241
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1242 log 2 "detecting zlib"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1243
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1244 if [ "$with_zlib" = "1" ] \|\| [ "$with_zlib" = "" ] \|\| [ "$with_zlib" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1245 zlib=`ls -1 /usr/include/*.h 2>/dev/null \| grep "\/zlib.h$"`
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1246 if [ -z "$zlib" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1247 log 2 " trying /usr/include/zlib.h... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1248 zlib=`ls -1 /usr/local/include/*.h 2>/dev/null \| grep "\/zlib.h$"`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1249 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1250 if [ -z "$zlib" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1251 log 2 " trying /usr/local/include/zlib.h... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1252 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1253
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1254 if [ -n "$zlib" ] && [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1255 log 2 " trying $zlib... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1256 # Now find the static lib, if needed
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1257 zlib=`ls /lib/*.a 2>/dev/null \| grep "\/libz.a$"`
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1258 if [ -z "$zlib" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1259 log 2 " trying /lib/libz.a... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1260 zlib=`ls /usr/lib/*.a 2>/dev/null \| grep "\/libz.a$"`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1261 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1262 if [ -z "$zlib" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1263 log 2 " trying /usr/lib/libz.a... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1264 zlib=`ls /usr/local/lib/*.a 2>/dev/null \| grep "\/libz.a$"`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1265 fi
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1266 if [ -z "$zlib" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1267 log 2 " trying /usr/local/lib/libz.a... no"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1268 log 1 "configure: error: zlib couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1269 log 1 "configure: error: you requested a static link, but I can't find zlib.a"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1270
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1271 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1272 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1273 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1274 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1275 # Make sure it exists
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1276 if [ -f "$with_zlib" ]; then
5505 0208f8f3a1b7 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz. rubidium <rubidium@openttd.org> parents: 5503 diff changeset	1277 zlib=`ls $with_zlib 2>/dev/null`
0208f8f3a1b7 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz. rubidium <rubidium@openttd.org> parents: 5503 diff changeset	1278 else
0208f8f3a1b7 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz. rubidium <rubidium@openttd.org> parents: 5503 diff changeset	1279 zlib=`ls $with_zlib/libz.a 2>/dev/null`
0208f8f3a1b7 (svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz. rubidium <rubidium@openttd.org> parents: 5503 diff changeset	1280 fi
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1281 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1282
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1283 if [ -z "$zlib" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1284 log 1 "checking zlib... not found"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1285 if [ "$with_zlib" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1286 log 1 "configure: error: zlib couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1287
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1288 exit 1
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1289 elif [ "$with_zlib" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1290 log 1 "configure: error: zlib couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1291 log 1 "configure: error: you supplied '$with_zlib', but it seems invalid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1292
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1293 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1294 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1295
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1296 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1297 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1298
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1299 log 2 " trying $zlib... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1300
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1301 log 1 "checking zlib... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1302 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1303
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1304 detect_png() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1305 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1306 if [ "$with_png" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1307 log 1 "checking libpng... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1308
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1309 png_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1310 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1311 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1312
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1313 if [ "$with_zlib" = "0" ] \|\| [ "$zlib" = "" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1314 log 1 "configure: error: libpng depends on zlib, which couldn't be found / was disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1315 log 1 "configure: error: please supply --with-zlib, with a valid zlib location"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1316 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1317 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1318
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1319 if [ "$with_png" = "1" ] \|\| [ "$with_png" = "" ] \|\| [ "$with_png" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1320 png_config="libpng-config"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1321 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1322 png_config="$with_png"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1323 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1324
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1325 version=`$png_config --version 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1326 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1327 log 2 "executing $png_config --version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1328 log 2 " returned $version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1329 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1330
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1331 if [ -z "$version" ] \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1332 log 1 "checking libpng... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1333
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1334 # It was forced, so it should be found.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1335 if [ "$with_png" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1336 log 1 "configure: error: libpng-config couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1337 log 1 "configure: error: you supplied '$with_png', but it seems invalid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1338 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1339 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1340
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1341 png_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1342 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1343 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1344
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1345 log 1 "checking libpng... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1346 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1347
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1348 detect_freetype() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1349 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1350 if [ "$with_freetype" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1351 log 1 "checking libfreetype... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1352
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1353 freetype_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1354 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1355 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1356
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1357 if [ "$with_zlib" = "0" ] \|\| [ "$zlib" = "" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1358 log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1359 log 1 "configure: error: please supply --with-zlib, with a valid zlib location"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1360 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1361 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1362
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1363 if [ "$with_freetype" = "1" ] \|\| [ "$with_freetype" = "" ] \|\| [ "$with_freetype" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1364 freetype_config="freetype-config"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1365 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1366 freetype_config="$with_freetype"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1367 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1368
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1369 version=`$freetype_config --version 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1370 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1371 log 2 "executing freetype_config --version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1372 log 2 " returned $version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1373 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1374
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1375 if [ -z "$version" ] \|\| [ "$ret" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1376 log 1 "checking libfreetype... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1377
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1378 # It was forced, so it should be found.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1379 if [ "$with_freetype" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1380 log 1 "configure: error: freetype-config couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1381 log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1382 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1383 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1384
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1385 freetype_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1386 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1387 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1388
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1389 log 1 "checking libfreetype... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1390 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1391
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1392 detect_fontconfig() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1393 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1394 if [ "$with_fontconfig" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1395 log 1 "checking libfontconfig... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1396
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1397 fontconfig_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1398 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1399 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1400
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1401 if [ "$with_fontconfig" = "1" ] \|\| [ "$with_fontconfig" = "" ] \|\| [ "$with_fontconfig" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1402 fontconfig_config="pkg-config fontconfig"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1403 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1404 fontconfig_config="$with_fontconfig"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1405 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1406
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1407 version=`$fontconfig_config --modversion 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1408 ret=$?
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1409 shortversion=`echo $version \| cut -c 1,3`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1410 log 2 "executing $fontconfig_config --modversion"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1411 log 2 " returned $version"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1412 log 2 " exit code $ret"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1413
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1414 if [ -z "$version" ] \|\| [ "$ret" != "0" ] \|\| [ "$shortversion" -le "22" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1415 if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1416 log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1417 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1418 log 1 "checking libfontconfig... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1419 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1420
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1421 # It was forced, so it should be found.
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1422 if [ "$with_fontconfig" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1423 log 1 "configure: error: fontconfig-config couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1424 log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1425 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1426 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1427
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1428 fontconfig_config=""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1429 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1430 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1431
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1432 log 1 "checking libfontconfig... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1433 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1434
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1435 detect_iconv() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1436 # 0 means no, 1 is auto-detect, 2 is force
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1437 if [ "$with_iconv" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1438 log 1 "checking iconv... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1439
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1440 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1441 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1442
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1443 if [ "$with_iconv" = "1" ] && [ "$os" != "OSX" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1444 log 1 "checking iconv... not OSX, skipping"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1445 with_iconv="0"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1446
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1447 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1448 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1449
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1450 # Try to find iconv.h, seems to only thing to detect iconv with
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1451
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1452 if [ "$with_iconv" = "1" ] \|\| [ "$with_iconv" = "" ] \|\| [ "$with_iconv" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1453 iconv=`ls -1 /usr/include 2>/dev/null \| grep "iconv.h"`
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1454 if [ -z "$iconv" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1455 iconv=`ls -1 /usr/local/include 2>/dev/null \| grep "iconv.h"`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1456 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1457 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1458 # Make sure it exists
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1459 iconv=`ls $with_iconv/include/iconv.h 2>/dev/null`
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1460 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1461
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1462 if [ -z "$iconv" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1463 log 1 "checking iconv... not found"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1464 if [ "$with_iconv" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1465 log 1 "configure: error: iconv couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1466
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1467 exit 1
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1468 elif [ "$with_iconv" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1469 log 1 "configure: error: iconv couldn't be found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1470 log 1 "configure: error: you supplied '$with_iconv', but I couldn't detect iconv in it"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1471
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1472 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1473 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1474
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1475 return 0
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1476 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1477
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1478 if [ "$with_iconv" = "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1479 with_iconv="2"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1480 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1481
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1482 log 2 "found iconv in $iconv"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1483
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1484 log 1 "checking iconv... found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1485 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1486
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1487 _detect_sort() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1488 sort_test_in="d
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1489 a
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1490 c
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1491 b"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1492
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1493 sort_test_out="a
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1494 b
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1495 c
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1496 d"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1497
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1498 log 2 "running echo <array> \| $1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1499
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1500 if [ "`echo \"$sort_test_in\" \| $1 2>/dev/null`" = "$sort_test_out" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1501 sort="$1"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1502 log 2 " result was valid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1503 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1504 log 2 " result was invalid"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1505 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1506 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1507
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1508 detect_sort() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1509 if [ "$with_sort" = "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1510 log 1 "checking sort... disabled"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1511
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1512 return
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1513 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1514
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1515 if [ "$with_sort" = "1" ] \|\| [ "$with_sort" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1516 _detect_sort "sort"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1517 if [ -z "$sort" ]; then _detect_sort "/sbin/sort"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1518 if [ -z "$sort" ]; then _detect_sort "/usr/sbin/sort"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1519 if [ -z "$sort" ]; then _detect_sort "/usr/local/sbin/sort"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1520 if [ -z "$sort" ]; then _detect_sort "/bin/sort"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1521 if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1522 if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1523 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1524 _detect_sort "$with_sort"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1525 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1526
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1527 if [ -z "$sort" ]; then
7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1528 if [ "$with_sort" = "2" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1529 log 1 "checking sort... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1530
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1531 log 1 "configure: error: couldn't detect sort on your system"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1532 exit 1
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1533 elif [ "$with_sort" != "1" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1534 log 1 "checking sort... $with_sort not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1535
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1536 log 1 "configure: error: '$with_sort' doesn't look like a sort to me"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1537 log 1 "configure: error: please verify its location and function and try again"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1538
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1539 exit 1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1540 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1541 log 1 "checking sort... not found"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1542 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1543 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1544 log 1 "checking sort... $sort"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1545 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1546 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1547
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1548 make_sed() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1549 # We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1550 # We do this here, and not sooner, so universal builds also have this
5541 73a0352b8303 (svn r7883) It's spelled 'automatically' tron <tron@openttd.org> parents: 5539 diff changeset	1551 # automatically correct
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1552 # FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1553 # we use 1 byte per bool normally in C part. So convert that last one to 4
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1554 # bytes too, but only for PPC.
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1555 ppc=`$cc_host -dumpmachine \| grep "powerpc\\|ppc"`
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1556 if [ -n "$ppc" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1557 T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1558 osx_sysroot_version=10.3.9
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1559 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1560 T_CFLAGS="$CFLAGS"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1561 osx_sysroot_version=10.4u
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1562 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1563
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1564 T_LDFLAGS="$LDFLAGS"
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1565 if [ "$with_osx_sysroot" = "3" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1566 T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1567 T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1568 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1569
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1570 SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1571
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1572 # All the data needed to compile a single target
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1573 # Make sure if you compile multiple targets to
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1574 # use multiple OBJS_DIR, because all in-between
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1575 # binaries are stored in there, and nowhere else.
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1576 SRC_REPLACE="
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1577 s#!!CC_HOST!!#$cc_host#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1578 s#!!CXX_HOST!!#$cxx_host#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1579 s#!!CC_BUILD!!#$cc_build#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1580 s#!!WINDRES!!#$windres#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1581 s#!!STRIP!!#$strip $strip_arg#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1582 s#!!LIPO!!#$lipo#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1583 s#!!CC_CFLAGS!!#$CC_CFLAGS#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1584 s#!!CFLAGS!!#$T_CFLAGS#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1585 s#!!CFLAGS_BUILD!!#$CFLAGS_BUILD#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1586 s#!!STRGEN_FLAGS!!#$strgen_flags#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1587 s#!!LIBS!!#$LIBS#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1588 s#!!LDFLAGS!!#$T_LDFLAGS#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1589 s#!!BIN_DIR!!#$BIN_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1590 s#!!ROOT_DIR!!#$ROOT_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1591 s#!!MEDIA_DIR!!#$MEDIA_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1592 s#!!SOURCE_LIST!!#$SOURCE_LIST#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1593 s#!!SRC_OBJS_DIR!!#$SRC_OBJS_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1594 s#!!LANG_OBJS_DIR!!#$LANG_OBJS_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1595 s#!!SRC_DIR!!#$SRC_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1596 s#!!OSXAPP!!#$OSXAPP#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1597 s#!!LANG_DIR!!#$LANG_DIR#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1598 s#!!TTD!!#$TTD#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1599 s#!!BINARY_DIR!!#$prefix_dir/$binary_dir#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1600 s#!!DATA_DIR!!#$prefix_dir/$data_dir#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1601 s#!!ICON_DIR!!#$prefix_dir/$icon_dir#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1602 s#!!PERSONAL_DIR!!#$personal_dir#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1603 s#!!INSTALL_DIR!!#$install_dir#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1604 s#!!STRGEN!!#$STRGEN#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1605 s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1606 s#!!ENDIAN_FORCE!!#$endian#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1607 s#!!STAGE!!#$STAGE#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1608 s#!!MAKEDEPEND!!#$makedepend#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1609 s#!!CFLAGS_MAKEDEP!!#$cflags_makedep#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1610 s#!!SORT!!#$sort#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1611 s#!!CONFIG_CACHE_COMPILER!!#config.cache.compiler#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1612 s#!!CONFIG_CACHE_LINKER!!#config.cache.linker#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1613 s#!!CONFIG_CACHE_ENDIAN!!#config.cache.endian#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1614 s#!!CONFIG_CACHE_SOURCE!!#config.cache.source#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1615 s#!!CONFIG_CACHE_VERSION!!#config.cache.version#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1616 s#!!CONFIG_CACHE_SOURCE_LIST!!#config.cache.source.list#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1617 s#!!LANG_SUPPRESS!!#$lang_suppress#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1618 s#!!OBJS_C!!#$OBJS_C#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1619 s#!!OBJS_CPP!!#$OBJS_CPP#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1620 s#!!OBJS_M!!#$OBJS_M#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1621 s#!!OBJS_RC!!#$OBJS_RC#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1622 s#!!SRCS!!#$SRCS#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1623 s#!!OS!!#$os#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1624 s#!!CONFIGURE_FILES!!#$CONFIGURE_FILES#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1625 s#!!REVISION!!#$revision#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1626 s#!!ENABLE_INSTALL!!#$enable_install#g;
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1627 "
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1628 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1629
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1630 generate_main() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1631 STAGE="[MAIN]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1632
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1633 make_sed
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1634
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1635 # Create the main Makefile
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1636 echo "Generating Makefile..."
5555 d2263262f7d1 (svn r7939) Fix useless use of cat tron <tron@openttd.org> parents: 5551 diff changeset	1637 < $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1638 echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
5556 312bb9ac546d (svn r7940) Add an empty line instead of overwriting the just written file tron <tron@openttd.org> parents: 5555 diff changeset	1639 echo >> Makefile.am
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1640 # Make the copy of the source-list, so we don't trigger an unwanted recompile
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1641 cp $SOURCE_LIST config.cache.source.list
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1642 # Make sure config.cache is OLDER then config.cache.source.list
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1643 touch config.cache
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1644 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1645
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1646 generate_lang() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1647 STAGE="[LANG]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1648
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1649 make_sed
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1650
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1651 # Create the language file
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1652 mkdir -p $LANG_OBJS_DIR
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1653
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1654 echo "Generating lang/Makefile..."
5555 d2263262f7d1 (svn r7939) Fix useless use of cat tron <tron@openttd.org> parents: 5551 diff changeset	1655 < $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1656 echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1657 echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1658 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1659
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1660 generate_src_normal() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1661 STAGE=$1
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1662
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1663 make_sed
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1664
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1665 # Create the source file
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1666 mkdir -p $SRC_OBJS_DIR
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1667
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1668 echo "Generating $2/Makefile..."
5555 d2263262f7d1 (svn r7939) Fix useless use of cat tron <tron@openttd.org> parents: 5551 diff changeset	1669 < $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1670 echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1671 echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1672 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1673
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1674 generate_src_osx() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1675 cc_host_orig="$cc_host"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1676 cxx_host_orig="$cxx_host"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1677
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1678 BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1679 cc_host="$cc_host_orig -arch ppc"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1680 cxx_host="$cxx_host_orig -arch ppc"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1681 generate_src_normal "[PowerPC]" "objs/ppc"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1682
5493 37ee751e501b (svn r7777) [Configure] -Fix: call intel builds on OSX universal compiles intel, not i386 (that is just silly) truelight <truelight@openttd.org> parents: 5491 diff changeset	1683 BASE_SRC_OBJS_DIR="$OBJS_DIR/intel"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1684 cc_host="$cc_host_orig -arch i386"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1685 cxx_host="$cxx_host_orig -arch i386"
5494 e420b638e2f0 (svn r7778) -Fix (r7777): intel -> Intel truelight <truelight@openttd.org> parents: 5493 diff changeset	1686 generate_src_normal "[Intel]" "objs/intel"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1687
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1688 BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1689 cc_host="$cc_host_orig -arch ppc970"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1690 cxx_host="$cxx_host_orig -arch ppc970"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1691 CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1692 generate_src_normal "[PowerPC G5]" "objs/ppc970"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1693 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1694
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1695 generate_src() {
5558 7035f001461c (svn r7942) Trim another 192 lines from the configure monster tron <tron@openttd.org> parents: 5557 diff changeset	1696 if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1697 generate_src_osx
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1698 else
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1699 generate_src_normal "[SRC]" "objs"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1700 fi
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1701 }
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1702
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1703 showhelp() {
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1704 echo "'configure' configures OpenTTD."
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1705 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1706 echo "Usage: $0 [OPTION]... [VAR=VALUE]..."
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1707 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1708 echo "To assign environment variables (e.g., CC, CFLAGS...), specify them as"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1709 echo "VAR=VALUE. See below for descriptions of some of the useful variables."
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1710 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1711 echo "Defaults for the options are specified in brackets."
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1712 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1713 echo "Configuration:"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1714 echo " -h, --help display this help and exit"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1715 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1716 echo "System types:"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1717 echo " --build=BUILD configure for building on BUILD [guessed]"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1718 echo " --host=HOST cross-compile to build programs to run"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1719 echo " on HOST [BUILD]"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1720 echo " --windres=WINDRES the windres to use [HOST-windres]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1721 echo " --strip=STRIP the strip to use [HOST-strip]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1722 echo " --lipo=LIPO the lipo to use (OSX ONLY) [HOST-lipo]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1723 echo " --os=OS the OS we are compiling for [DETECT]"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1724 echo " DETECT/UNIX/OSX/FREEBSD/MORPHOS/BEOS/"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1725 echo " SUNOS/CYGWIN/MINGW"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1726 echo " --endian=ENDIAN set the endian of the HOST (AUTO/LE/BE)"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1727 echo " --revision=rXXXX overwrite the revision detection."
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1728 echo " Use with care!"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1729 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1730 echo "Paths:"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1731 echo " --prefix-dir=dir specifies the prefix for all installed"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1732 echo " files [/usr/local]"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1733 echo " --binary-dir=dir location of the binary. Will be prefixed"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1734 echo " with the prefix-dir [games]"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1735 echo " --data-dir=dir location of data files (lang, data, gm)."
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1736 echo " Will be prefixed with the prefix-dir"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1737 echo " [share/games/openttd]"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1738 echo " --icon-dir=dir location of icons. Will be prefixed"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1739 echo " with the prefix-dir [share/pixmaps]"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1740 echo " --personal-dir=dir location of the personal directory []"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1741 echo " --install-dir=dir specifies the root to install to."
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1742 echo " Useful to install into jails [/]"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1743 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1744 # TODO: The Following 3 tags will be removed when the 'search path patch' is applied
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1745 echo " --second-data-dir=dir specifies a second directory for the"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1746 echo " data files"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1747 echo " --custom-lang-dir=dir specifies a custom directory for the"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1748 echo " language files"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1749 echo " --enable-install make a binary that uses the specified"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1750 echo " data-dir and icon-dir"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1751 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1752 echo "Features and packages:"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1753 echo " --enable-debug[=LVL] enable debug-mode (LVL=[0123], 0 is release)"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1754 echo " --enable-profiling enables profiling"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1755 echo " --enable-dedicated compile a dedicated server (without video)"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1756 echo " --enable-static enable static compile (doesn't work for"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1757 echo " all HOSTs)"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1758 echo " --enable-translator enable extra output for translators"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1759 echo " --enable-universal enable universal builds (OSX ONLY)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1760 echo " --enable-osx-g5 enables optimalizations for G5 (OSX ONLY)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1761 echo " --disable-network disable network support"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1762 echo " --disable-assert disable asserts (continue on errors)"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1763 echo " --disable-strip disable any possible stripping"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1764 echo " --without-osx-sysroot disable the automatic adding of sysroot "
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1765 echo " (OSX ONLY)"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1766 echo " --without-application-bundle disable generation of application bundle"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1767 echo " (OSX ONLY)"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1768 echo " --with-direct-music enable direct music support (Win32 ONLY)"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1769 echo " --with-sort=sort define a non-default location for sort"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1770 echo " --with-midi=midi define which midi-player to use"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1771 echo " --with-midi-arg=arg define which args to use for the"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1772 echo " midi-player"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1773 echo " --with-cocoa enables COCOA video driver (OSX ONLY)"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1774 echo " --with-sdl[=sdl-config] enables SDL video driver support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1775 echo " --with-zlib[=zlib.a] enables zlib support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1776 echo " --with-png[=libpng-config] enables libpng support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1777 echo " --with-freetype[=freetype-config]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1778 echo " enables libfreetype support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1779 echo " --with-fontconfig[=pkg-config fontconfig]"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1780 echo " enables fontconfig support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1781 echo " --with-iconv[=iconv-path] enables iconv support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1782 echo " --with-makedepend[=makedepend] enables makedepend support"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1783 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1784 echo "Some influential environment variables:"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1785 echo " CC C compiler command"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1786 echo " CXX C++ compiler command"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1787 echo " CFLAGS C compiler flags"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1788 echo " WINDRES windres command"
5491 baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1789 echo " LDFLAGS linker flags, e.g. -L<lib dir> if you"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1790 echo " have libraries in a nonstandard"
baabb1dbc1dd (svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters rubidium <rubidium@openttd.org> parents: 5485 diff changeset	1791 echo " directory <lib dir>"
5475 eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1792 echo ""
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1793 echo "Use these variables to override the choices made by 'configure' or to help"
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1794 echo "it to find libraries and programs with nonstandard names/locations."
eabf4b86aed6 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium <rubidium@openttd.org> parents: diff changeset	1795 }

Mercurial > hg > openttd

annotate config.lib @ 5558:7035f001461c draft