openttd: config.lib annotate

annotate config.lib @ 5780:10c1b221d4bc draft

(svn r8332) -Codechange: moved DrawAircraftImage() and CcBuildAircraft() from build_vehicle_gui.cpp to aircraft_gui.cpp

author	bjarni <bjarni@openttd.org>
date	Sun, 21 Jan 2007 22:57:52 +0000
parents	102ded141250
children	6e3ace7b5646

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

Mercurial > hg > openttd

annotate config.lib @ 5780:10c1b221d4bc draft