author | belugas |
Sat, 08 Dec 2007 01:20:47 +0000 | |
changeset 8032 | f35fba9bacb0 |
parent 7839 | feb131e32620 |
child 8042 | 2cb7583f7346 |
permissions | -rw-r--r-- |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2 |
log() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
3 |
if [ $1 = "1" ]; then echo "$2"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
4 |
echo "$2" >> $config_log |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
5 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
6 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
7 |
set_default() { |
6811
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
8 |
released_version="" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
9 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
10 |
ignore_extra_parameters="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
11 |
# We set all kinds of defaults for params. Later on the user can override |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
12 |
# most of them; but if they don't, this default is used. |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
13 |
build="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
14 |
host="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
15 |
cc_build="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
16 |
cc_host="" |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
17 |
cxx_build="" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
18 |
cxx_host="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
19 |
windres="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
20 |
strip="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
21 |
lipo="" |
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
22 |
awk="awk" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
23 |
os="DETECT" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
24 |
endian="AUTO" |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
25 |
cpu_type="DETECT" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
26 |
revision="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
27 |
config_log="config.log" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
28 |
prefix_dir="/usr/local" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
29 |
binary_dir="games" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
30 |
data_dir="share/games/openttd" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
31 |
icon_dir="share/pixmaps" |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
32 |
personal_dir="1" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
33 |
install_dir="/" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
34 |
enable_debug="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
35 |
enable_profiling="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
36 |
enable_dedicated="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
37 |
enable_network="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
38 |
enable_static="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
39 |
enable_translator="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
40 |
enable_assert="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
41 |
enable_strip="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
42 |
enable_universal="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
43 |
enable_osx_g5="0" |
6228
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
44 |
enable_unicode="1" |
6850
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
45 |
with_distcc="1" |
6918
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
46 |
with_ccache="1" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
47 |
with_osx_sysroot="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
48 |
with_application_bundle="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
49 |
with_sdl="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
50 |
with_cocoa="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
51 |
with_zlib="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
52 |
with_png="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
53 |
with_makedepend="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
54 |
with_direct_music="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
55 |
with_sort="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
56 |
with_iconv="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
57 |
with_midi="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
58 |
with_midi_arg="" |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
59 |
with_libtimidity="1" |
5578
5f898d0bfebd
(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
parents:
5560
diff
changeset
|
60 |
with_freetype="1" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
61 |
with_fontconfig="1" |
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
62 |
with_psp_config="1" |
7294
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
63 |
with_threads="1" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
64 |
|
7330
eb4dbf4a89ff
(svn r10693) -Fix: --enable-install should have been removed from the configure parameters to save a long time ago. Now it is only causing warnings.
rubidium
parents:
7294
diff
changeset
|
65 |
save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_distcc with_osx_sysroot enable_universal enable_osx_g5 enable_unicode 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_libtimidity with_freetype with_fontconfig with_psp_config with_threads CC CXX CFLAGS LDFLAGS" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
66 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
67 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
68 |
detect_params() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
69 |
# Walk over all params from the user and override any default settings if |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
70 |
# needed. This also handles any invalid option. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
71 |
for p in "$@"; do |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
72 |
if [ -n "$prev_p" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
73 |
eval "$prev_p=\$p" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
74 |
prev_p= |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
75 |
continue |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
76 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
77 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
78 |
optarg=`expr "x$p" : 'x[^=]*=\(.*\)'` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
79 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
80 |
case "$p" in |
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
81 |
--help | -h) showhelp; exit 0;; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
82 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
83 |
--config-log) prev_p="config_log";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
84 |
--config-log=*) config_log="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
85 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
86 |
--build) prev_p="build";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
87 |
--build=*) build="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
88 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
89 |
--host) prev_p="host";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
90 |
--host=*) host="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
91 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
92 |
--os) prev_p="os";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
93 |
--os=*) os="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
94 |
|
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
95 |
--cpu-type) prev_p="cpu_type";; |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
96 |
--cpu-type=*) cpu_type="$optarg";; |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
97 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
98 |
--revision=*) revision="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
99 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
100 |
--cc-build) prevp_p="cc_build";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
101 |
--cc-build=*) cc_build="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
102 |
--cc-host) prevp_p="cc_host";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
103 |
--cc-host=*) cc_host="$optarg";; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
104 |
--cxx-build) prevp_p="cxx_build";; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
105 |
--cxx-build=*) cxx_build="$optarg";; |
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
106 |
--cxx-host) prevp_p="cxx_host";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
107 |
--cxx-host=*) cxx_host="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
108 |
--windres) prevp_p="windres";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
109 |
--windres=*) windres="$optarg";; |
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
110 |
--awk) prevp_p="awk";; |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
111 |
--awk=*) awk="$optarg";; |
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
112 |
--strip) prevp_p="strip";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
113 |
--strip=*) strip="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
114 |
--lipo) prevp_p="lipo";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
115 |
--lipo=*) lipo="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
116 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
117 |
--endian) prev_p="endian";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
118 |
--endian=*) endian="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
119 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
120 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
121 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
122 |
--prefix-dir) prevp_p="prefix-dir";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
123 |
--prefix-dir=*) prefix_dir="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
124 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
125 |
--binary-dir) prevp_p="binary-dir";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
126 |
--binary-dir=*) binary_dir="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
127 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
128 |
--data-dir) prevp_p="data-dir";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
129 |
--data-dir=*) data_dir="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
130 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
131 |
--icon-dir) prevp_p="icon-dir";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
132 |
--icon-dir=*) icon_dir="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
133 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
134 |
--personal-dir) prevp_p="personal-dir";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
135 |
--personal-dir=*) personal_dir="$optarg";; |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
136 |
--without-personal-dir) personal_dir="";; |
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
137 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
138 |
--install-dir) prevp_p="install-dir";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
139 |
--install-dir=*) install_dir="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
140 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
141 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
142 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
143 |
--enable-debug) enable_debug="1";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
144 |
--enable-debug=*) enable_debug="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
145 |
--enable-profiling) enable_profiling="1";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
146 |
--enable-profiling=*) enable_profiling="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
147 |
--enable-dedicated) enable_dedicated="1";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
148 |
--enable-dedicated=*) enable_dedicated="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
149 |
--enable-network=*) enable_network="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
150 |
--disable-network) enable_network="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
151 |
--disable-static) enable_static="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
152 |
--enable-static) enable_static="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
153 |
--enable-static=*) enable_static="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
154 |
--disable-translator) enable_translator="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
155 |
--enable-translator) enable_translator="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
156 |
--enable-translator=*) enable_translator="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
157 |
--disable-assert) enable_assert="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
158 |
--enable-assert) enable_assert="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
159 |
--enable-assert=*) enable_assert="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
160 |
--disable-strip) enable_strip="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
161 |
--enable-strip) enable_strip="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
162 |
--enable-strip=*) enable_strip="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
163 |
--disable-universal) enable_universal="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
164 |
--enable-universal) enable_universal="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
165 |
--enable-universal=*) enable_universal="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
166 |
--disable-osx-g5) enable_osx_g5="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
167 |
--enable-osx-g5) enable_osx_g5="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
168 |
--enable-osx-g5=*) enable_osx_g5="$optarg";; |
6228
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
169 |
--disable-unicode) enable_unicode="0";; |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
170 |
--enable-unicode) enable_unicode="2";; |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
171 |
--enable-unicode=*) enable_unicode="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
172 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
173 |
--with-sdl) with_sdl="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
174 |
--without-sdl) with_sdl="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
175 |
--with-sdl=*) with_sdl="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
176 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
177 |
--with-cocoa) with_cocoa="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
178 |
--without-cocoa) with_cocoa="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
179 |
--with-cocoa=*) with_cocoa="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
180 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
181 |
--with-zlib) with_zlib="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
182 |
--without-zlib) with_zlib="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
183 |
--with-zlib=*) with_zlib="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
184 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
185 |
--with-png) with_png="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
186 |
--without-png) with_png="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
187 |
--with-png=*) with_png="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
188 |
--with-libpng) with_png="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
189 |
--without-libpng) with_png="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
190 |
--with-libpng=*) with_png="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
191 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
192 |
--with-libtimidity) with_libtimidity="2";; |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
193 |
--without-libtimidity) with_libtimidity="0";; |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
194 |
--with-libtimidity=*) with_libtimidity="$optarg";; |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
195 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
196 |
--with-freetype) with_freetype="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
197 |
--without-freetype) with_freetype="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
198 |
--with-freetype=*) with_freetype="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
199 |
--with-libfreetype) with_freetype="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
200 |
--without-libfreetype) with_freetype="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
201 |
--with-libfreetype=*) with_freetype="$optarg";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
202 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
203 |
--with-fontconfig) with_fontconfig="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
204 |
--without-fontconfig) with_fontconfig="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
205 |
--with-fontconfig=*) with_fontconfig="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
206 |
--with-libfontconfig) with_fontconfig="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
207 |
--without-libfontconfig) with_fontconfig="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
208 |
--with-libfontconfig=*) with_fontconfig="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
209 |
|
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
210 |
--with-psp-config) with_psp_config="2";; |
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
211 |
--without-psp-config) with_psp_config="0";; |
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
212 |
--with-psp-config=*) with_psp_config="$optarg";; |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
213 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
214 |
--with-makedepend) with_makedepend="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
215 |
--without-makedepend) with_makedepend="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
216 |
--with-makedepend=*) with_makedepend="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
217 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
218 |
--with-direct-music) with_direct_music="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
219 |
--without-direct-music) with_direct_music="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
220 |
--with-direct-music=*) with_direct_music="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
221 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
222 |
--with-sort) with_sort="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
223 |
--without-sort) with_sort="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
224 |
--with-sort=*) with_sort="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
225 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
226 |
--with-iconv) with_iconv="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
227 |
--without-iconv) with_iconv="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
228 |
--with-iconv=*) with_iconv="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
229 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
230 |
--with-midi=*) with_midi="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
231 |
--with-midi-arg=*) with_midi_arg="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
232 |
|
6850
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
233 |
--without-distcc) with_distcc="0";; |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
234 |
--with-distcc) with_distcc="2";; |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
235 |
--with-distcc=*) with_distcc="$optarg";; |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
236 |
|
6918
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
237 |
--without-ccache) with_ccache="0";; |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
238 |
--with-ccache) with_ccache="2";; |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
239 |
--with-ccache=*) with_ccache="$optarg";; |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
240 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
241 |
--without-osx-sysroot) with_osx_sysroot="0";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
242 |
--with-osx-sysroot) with_osx_sysroot="2";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
243 |
--with-osx-sysroot=*) with_osx_sysroot="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
244 |
|
6512
2eec32f31a18
(svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents:
6312
diff
changeset
|
245 |
--without-application-bundle) with_application_bundle="0";; |
2eec32f31a18
(svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents:
6312
diff
changeset
|
246 |
--with-application-bundle) with_application_bundle="1";; |
2eec32f31a18
(svn r9696) -Fix: --without-application-bundle did not disable the custom language/second data directory stuff that is used for application bundles.
rubidium
parents:
6312
diff
changeset
|
247 |
--with-application-bundle=*) with_application_bundle="$optarg";; |
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
248 |
|
7294
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
249 |
--without-threads) with_threads="0";; |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
250 |
--with-threads) with_threads="1";; |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
251 |
--with-threads=*) with_threads="$optarg";; |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
252 |
|
5536
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
253 |
CC=* | --CC=*) CC="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
254 |
CXX=* | --CXX=*) CXX="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
255 |
CFLAGS=* | --CFLAGS=*) CFLAGS="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
256 |
LDFLAGS=* | --LDFLAGS=*) LDFLAGS="$optarg";; |
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
257 |
|
5177ac4aa23e
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5515
diff
changeset
|
258 |
--ignore-extra-parameters) ignore_extra_parameters="1";; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
259 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
260 |
--*) |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
261 |
if [ "$ignore_extra_parameters" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
262 |
echo "Unknown option $p" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
263 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
264 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
265 |
echo "Unknown option $p ignored" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
266 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
267 |
;; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
268 |
esac |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
269 |
done |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
270 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
271 |
if [ -n "$prev_p" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
272 |
echo "configure: error: missing argument to --$prev_p" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
273 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
274 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
275 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
276 |
# Clean the logfile |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
277 |
echo "" > $config_log |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
278 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
279 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
280 |
save_params() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
281 |
# Here we save all params, so we can later on do an exact redo of this |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
282 |
# configuration, without having the user to re-input stuff |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
283 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
284 |
echo "Running configure with following options:" >> $config_log |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
285 |
echo "" >> $config_log |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
286 |
|
6246
75451000349d
(svn r9049) -Fix [Config]: when running 'bash configure', make sure automated reconfigures run 'bash configure' too.
truelight
parents:
6244
diff
changeset
|
287 |
configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
288 |
for p in $save_params_array; do |
5560
94d98c7015ce
(svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
truelight
parents:
5559
diff
changeset
|
289 |
eval "v=\"\$$p\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
290 |
p=`echo "$p" | sed 's/_/-/g;s/\n//g;'` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
291 |
# Only save those params that aren't empty |
5560
94d98c7015ce
(svn r7961) [Configure] -Fix: "" in config params didn't survive --reconfig. They should now.
truelight
parents:
5559
diff
changeset
|
292 |
configure="$configure --$p=\"$v\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
293 |
done |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
294 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
295 |
echo "$configure" >> $config_log |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
296 |
echo "$configure" > config.cache |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
297 |
echo "" >> $config_log |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
298 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
299 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
300 |
check_params() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
301 |
# Some params want to be in full uppercase, else they might not work as |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
302 |
# expected.. fix that here |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
303 |
|
6078
36a7f0e75ac4
(svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents:
6077
diff
changeset
|
304 |
endian=`echo $endian | tr '[a-z]' '[A-Z]'` |
36a7f0e75ac4
(svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents:
6077
diff
changeset
|
305 |
os=`echo $os | tr '[a-z]' '[A-Z]'` |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
306 |
cpu_type=`echo $cpu_type | tr '[a-z]' '[A-Z]'` |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
307 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
308 |
# Check if all params have valid values |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
309 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
310 |
# Endian only allows AUTO, LE and, BE |
7424
40212c733e38
(svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents:
7406
diff
changeset
|
311 |
if [ -z "`echo $endian | egrep '^(AUTO|LE|BE|PREPROCESSOR)$'`" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
312 |
echo "configure: error: invalid option --endian=$endian" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
313 |
echo " Available options are: --endian=[AUTO|LE|BE]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
314 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
315 |
fi |
7424
40212c733e38
(svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents:
7406
diff
changeset
|
316 |
if [ "$endian" = "PREPROCESSOR" ] && [ "$os" != "OSX" ]; then |
40212c733e38
(svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents:
7406
diff
changeset
|
317 |
echo "configure: error: invalid option --endian=$endian" |
40212c733e38
(svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents:
7406
diff
changeset
|
318 |
echo " PREPROCESSOR is only available for OSX" |
40212c733e38
(svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents:
7406
diff
changeset
|
319 |
exit 1 |
40212c733e38
(svn r10822) -Fix: OSX makes --endian set to PREPROCESSOR, which wasn't an allowed value, making reconfigures to fail (special commit for Bjarni, now he should fix things too :p)
truelight
parents:
7406
diff
changeset
|
320 |
fi |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
321 |
# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP |
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
322 |
if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
323 |
echo "configure: error: invalid option --os=$os" |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
324 |
echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
325 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
326 |
fi |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
327 |
# cpu_type can be either 32 or 64 |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
328 |
if [ -z "`echo $cpu_type | egrep '^(32|64|DETECT)$'`" ]; then |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
329 |
echo "configure: error: invalid option --cpu-type=$cpu_type" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
330 |
echo " Available options are: --cpu-type[=DETECT|32|64]" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
331 |
exit 1 |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
332 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
333 |
# enable_debug should be between 0 and 4 |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
334 |
if [ -z "`echo $enable_debug | egrep '^[0123]$'`" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
335 |
echo "configure: error: invalid option --enable-debug=$enable_debug" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
336 |
echo " Available options are: --enable-debug[=0123]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
337 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
338 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
339 |
|
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
340 |
detect_awk |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
341 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
342 |
check_build |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
343 |
check_host |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
344 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
345 |
detect_os |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
346 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
347 |
# We might enable universal builds always on OSX targets.. but currently we don't |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
348 |
# if [ "$enable_universal" = "1" ] && [ "$os" != "OSX" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
349 |
if [ "$enable_universal" = "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
350 |
enable_universal="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
351 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
352 |
if [ "$enable_universal" = "2" ] && [ "$os" != "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
353 |
log 1 "configure: error: --enable-universal only works on OSX" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
354 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
355 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
356 |
if [ "$enable_universal" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
357 |
log 1 "checking universal build... no" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
358 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
359 |
log 1 "checking universal build... yes" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
360 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
361 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
362 |
# Already detected by check_build |
5980
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
363 |
log 1 "checking build cc... $cc_build" |
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
364 |
log 1 "checking host cc... $cc_host" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
365 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
366 |
check_cxx_build |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
367 |
check_cxx_host |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
368 |
check_windres |
6082
dc7b5c71799f
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6081
diff
changeset
|
369 |
if [ "$enable_strip" != "0" ]; then |
dc7b5c71799f
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6081
diff
changeset
|
370 |
check_strip |
dc7b5c71799f
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6081
diff
changeset
|
371 |
else |
dc7b5c71799f
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6081
diff
changeset
|
372 |
log 1 "checking strip... disabled" |
dc7b5c71799f
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6081
diff
changeset
|
373 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
374 |
check_lipo |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
375 |
check_makedepend |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
376 |
detect_cputype |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
377 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
378 |
if [ "$enable_static" = "1" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
379 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
380 |
enable_static="2" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
381 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
382 |
enable_static="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
383 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
384 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
385 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
386 |
if [ "$enable_static" != "0" ]; then |
5980
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
387 |
log 1 "checking static... yes" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
388 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
389 |
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
390 |
log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
391 |
log 1 "WARNING: use static at your own risk on this platform" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
392 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
393 |
sleep 5 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
394 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
395 |
else |
5980
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
396 |
log 1 "checking static... no" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
397 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
398 |
|
6228
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
399 |
if [ "$enable_unicode" = "1" ]; then |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
400 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
401 |
enable_unicode="2" |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
402 |
else |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
403 |
enable_unicode="0" |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
404 |
fi |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
405 |
fi |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
406 |
|
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
407 |
if [ "$enable_unicode" != "0" ]; then |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
408 |
log 1 "checking unicode... yes" |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
409 |
else |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
410 |
log 1 "checking unicode... no" |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
411 |
fi |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
412 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
413 |
# Show what we configured |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
414 |
if [ "$enable_debug" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
415 |
log 1 "using debug level... no" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
416 |
elif [ "$enable_profiling" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
417 |
log 1 "using debug level... profiling (debug level $enable_debug)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
418 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
419 |
log 1 "using debug level... level $enable_debug" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
420 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
421 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
422 |
detect_sdl |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
423 |
detect_cocoa |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
424 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
425 |
if [ "$enable_dedicated" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
426 |
log 1 "checking GDI video driver... skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
427 |
log 1 "checking dedicated... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
428 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
429 |
if [ "$enable_network" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
430 |
log 1 "WARNING: compiling a dedicated server without network is pointless" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
431 |
sleep 5 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
432 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
433 |
else |
5760
483b8c081776
(svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents:
5753
diff
changeset
|
434 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
435 |
log 1 "checking GDI video driver... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
436 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
437 |
log 1 "checking GDI video driver... not Windows, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
438 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
439 |
|
5760
483b8c081776
(svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents:
5753
diff
changeset
|
440 |
if [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
441 |
log 1 "WARNING: no video driver found, building dedicated only" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
442 |
enable_dedicated="1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
443 |
sleep 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
444 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
445 |
log 1 "checking dedicated... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
446 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
447 |
log 1 "checking dedicated... not selected" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
448 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
449 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
450 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
451 |
if [ "$enable_network" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
452 |
log 1 "checking network... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
453 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
454 |
log 1 "checking network... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
455 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
456 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
457 |
if [ "$enable_translator" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
458 |
log 1 "checking translator... debug" |
5485
fcd57778b940
(svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents:
5479
diff
changeset
|
459 |
# -t shows TODO items, normally they are muted |
fcd57778b940
(svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents:
5479
diff
changeset
|
460 |
strgen_flags="-t" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
461 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
462 |
log 1 "checking translator... no" |
5485
fcd57778b940
(svn r7769) -Fix (r7759): the strgen -t flag (todo) was set when it shouldn't be set and vice-versa.
rubidium
parents:
5479
diff
changeset
|
463 |
strgen_flags="" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
464 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
465 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
466 |
if [ "$enable_assert" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
467 |
log 1 "checking assert... enabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
468 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
469 |
log 1 "checking assert... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
470 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
471 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
472 |
detect_zlib |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
473 |
detect_png |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
474 |
detect_freetype |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
475 |
detect_fontconfig |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
476 |
detect_iconv |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
477 |
detect_pspconfig |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
478 |
detect_libtimidity |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
479 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
480 |
if [ "$with_direct_music" = "1" ] || [ "$with_direct_music" = "2" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
481 |
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
482 |
if [ "$with_direct_music" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
483 |
log 1 "configure: error: direct-music is only supported on Win32 targets" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
484 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
485 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
486 |
with_direct_music="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
487 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
488 |
log 1 "checking direct-music... not Windows, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
489 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
490 |
check_direct_music |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
491 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
492 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
493 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
494 |
detect_sort |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
495 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
496 |
if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
497 |
endian="PREPROCESSOR" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
498 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
499 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
500 |
log 1 "checking endianess... $endian" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
501 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
502 |
# Suppress language errors when there is a version defined, indicating a release |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
503 |
# It just isn't pretty if any release produces warnings in the languages. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
504 |
if [ -f "$ROOT_DIR/version" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
505 |
lang_suppress="yes" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
506 |
log 1 "suppress language errors... yes" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
507 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
508 |
lang_suppress="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
509 |
log 1 "suppress language errors... no" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
510 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
511 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
512 |
if [ "$enable_debug" = "0" ] && [ "$enable_profiling" = "0" ] && [ "$enable_strip" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
513 |
if [ "$os" = "MORPHOS" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
514 |
strip_arg="--strip-all --strip-unneeded --remove-section .comment" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
515 |
elif [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
516 |
strip_arg="" |
5559
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
517 |
elif [ "$os" = "OS2" ]; then |
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
518 |
strip_arg="" |
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
519 |
# OS2 uses strip via gcc, because it needs to be feed to emxbind |
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
520 |
LDFLAGS="$LDFLAGS -s" |
6230
12b970a7fed6
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6228
diff
changeset
|
521 |
elif [ "$os" = "SUNOS" ]; then |
12b970a7fed6
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6228
diff
changeset
|
522 |
# The GNU strip does know -s, the non-GNU doesn't |
12b970a7fed6
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6228
diff
changeset
|
523 |
# So try to detect it (in a bit of an ugly way) |
12b970a7fed6
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6228
diff
changeset
|
524 |
strip_arg="`$strip -s strip.test 2>/dev/null && echo \"-s\"`" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
525 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
526 |
strip_arg="-s" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
527 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
528 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
529 |
log 1 "checking stripping... $strip $strip_arg" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
530 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
531 |
strip="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
532 |
log 1 "checking stripping... skipped" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
533 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
534 |
|
6850
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
535 |
if [ "$with_distcc" = "0" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
536 |
log 1 "checking distcc... no" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
537 |
elif [ "$with_distcc" = "1" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
538 |
with_distcc="0" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
539 |
|
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
540 |
log 1 "checking distcc... no (only used when forced)" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
541 |
elif [ "$with_distcc" = "2" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
542 |
distcc="distcc" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
543 |
else |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
544 |
distcc="$with_distcc" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
545 |
fi |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
546 |
if [ "$with_distcc" != "0" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
547 |
res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 0-6`" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
548 |
if [ "$res" != "distcc" ]; then |
6851
0a0a094fb9f1
(svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
rubidium
parents:
6850
diff
changeset
|
549 |
distcc="" |
6850
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
550 |
log 1 "checking distcc... no" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
551 |
if [ "$with_distcc" = "2" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
552 |
log 1 "configure: error: no distcc detected, but was forced to be used" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
553 |
exit 1 |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
554 |
fi |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
555 |
if [ "$with_distcc" != "1" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
556 |
log 1 "configure: error: '$with_distcc' doesn't seem a distcc to me" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
557 |
exit 1 |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
558 |
fi |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
559 |
fi |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
560 |
|
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
561 |
log 1 "checking distcc... $distcc" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
562 |
fi |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
563 |
|
6918
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
564 |
if [ "$with_ccache" = "0" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
565 |
log 1 "checking ccache... no" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
566 |
elif [ "$with_ccache" = "1" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
567 |
with_ccache="0" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
568 |
|
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
569 |
log 1 "checking ccache... no (only used when forced)" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
570 |
elif [ "$with_ccache" = "2" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
571 |
ccache="ccache" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
572 |
else |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
573 |
ccache="$with_ccache" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
574 |
fi |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
575 |
if [ "$with_ccache" != "0" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
576 |
res="`$ccache --version 2>/dev/null | head -n 1 | cut -b 0-6`" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
577 |
if [ "$res" != "ccache" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
578 |
ccache="" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
579 |
log 1 "checking ccache... no" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
580 |
if [ "$with_ccache" = "2" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
581 |
log 1 "configure: error: no ccache detected, but was forced to be used" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
582 |
exit 1 |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
583 |
fi |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
584 |
if [ "$with_ccache" != "1" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
585 |
log 1 "configure: error: '$with_ccache' doesn't seem a ccache to me" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
586 |
exit 1 |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
587 |
fi |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
588 |
fi |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
589 |
|
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
590 |
log 1 "checking ccache... $ccache" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
591 |
fi |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
592 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
593 |
if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
594 |
if [ "$with_osx_sysroot" = "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
595 |
with_osx_sysroot="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
596 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
597 |
log 1 "checking OSX sysroot... not OSX, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
598 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
599 |
log 1 "configure: error: --with-osx-sysroot only works if OSX is the target" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
600 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
601 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
602 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
603 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
604 |
if [ "$with_osx_sysroot" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
605 |
if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
606 |
log 1 "checking OSX sysroot... $with_osx_sysroot" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
607 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
608 |
# If autodetect and no universal, use system default |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
609 |
if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
610 |
log 1 "checking OSX sysroot... no (use system default)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
611 |
with_osx_sysroot="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
612 |
else |
5541 | 613 |
log 1 "checking OSX sysroot... automatically" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
614 |
with_osx_sysroot="3" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
615 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
616 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
617 |
else |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
618 |
if [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
619 |
log 1 "checking OSX sysroot... no (use system default)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
620 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
621 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
622 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
623 |
if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
624 |
if [ "$with_application_bundle" = "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
625 |
with_application_bundle="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
626 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
627 |
log 1 "checking OSX application bundle... not OSX, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
628 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
629 |
log 1 "configure: error: --with-application-bundle only works if OSX is the target" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
630 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
631 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
632 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
633 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
634 |
if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
635 |
OSXAPP="OpenTTD.app" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
636 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
637 |
OSXAPP="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
638 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
639 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
640 |
if [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
641 |
# Test on G5 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
642 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
643 |
if [ "$enable_osx_g5" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
644 |
log 1 "detecting G5... yes (forced)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
645 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
646 |
# First, are we a real OSX system, else we can't detect it |
6078
36a7f0e75ac4
(svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents:
6077
diff
changeset
|
647 |
native=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | grep darwin` |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
648 |
# If $host doesn't match $build , we are cross-compiling |
6312
738abf8f57a4
(svn r9239) -Fix [FS#682]: PowerMac G5 CPU is not detected (oVRoM).
rubidium
parents:
6300
diff
changeset
|
649 |
if [ -n "$native" ] && [ "$build" == "$host" ]; then |
738abf8f57a4
(svn r9239) -Fix [FS#682]: PowerMac G5 CPU is not detected (oVRoM).
rubidium
parents:
6300
diff
changeset
|
650 |
$cxx_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
651 |
res=`./G5_detector` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
652 |
rm -f G5_detector |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
653 |
if [ -n "$res" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
654 |
# This is G5, add flags for it |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
655 |
enable_osx_g5="2" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
656 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
657 |
log 1 "detecting G5... yes" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
658 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
659 |
enable_osx_g5="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
660 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
661 |
log 1 "detecting G5... no" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
662 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
663 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
664 |
enable_osx_g5="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
665 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
666 |
log 1 "detecting G5... no (cross-compiling)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
667 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
668 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
669 |
else |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
670 |
if [ "$enable_osx_g5" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
671 |
log 1 "configure: error: OSX G5 selected, but not compiling for OSX" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
672 |
log 1 "configure: error: either select OSX as OS, or deselect OSX G5" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
673 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
674 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
675 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
676 |
fi |
6811
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
677 |
|
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
678 |
if [ -n "$released_version" ]; then |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
679 |
log 1 "checking revision... release ($released_version)" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
680 |
if [ -n "$revision" ] && [ "$revision" != "$released_version" ]; then |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
681 |
log 1 "WARNING: overriding of the revision is NOT possible for releases" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
682 |
log 1 "WARNING: the given revision is IGNORED" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
683 |
|
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
684 |
sleep 5 |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
685 |
fi |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
686 |
revision=$released_version |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
687 |
else |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
688 |
if [ -n "$revision" ]; then |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
689 |
log 1 "checking revision... $revision" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
690 |
log 1 "WARNING: we do not advise you to use this setting" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
691 |
log 1 "WARNING: in most cases it is not safe for network use" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
692 |
log 1 "WARNING: USE WITH CAUTION!" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
693 |
|
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
694 |
sleep 5 |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
695 |
elif [ -f "$ROOT_DIR/version" ]; then |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
696 |
revision="`cat $ROOT_DIR/version`" |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
697 |
|
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
698 |
log 1 "checking revision... $revision" |
6812
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
699 |
elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help`" ]; then |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
700 |
revision="" |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
701 |
log 1 "checking revision... svn detection" |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
702 |
elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help`" ]; then |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
703 |
revision="" |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
704 |
log 1 "checking revision... git detection" |
7618
21fddd467b0f
(svn r11148) -Codechange: add support for getting version numbers from Mercurial/HG instead of norev000 (when using a Mercurial/HG clone that is).
rubidium
parents:
7564
diff
changeset
|
705 |
elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help`" ]; then |
21fddd467b0f
(svn r11148) -Codechange: add support for getting version numbers from Mercurial/HG instead of norev000 (when using a Mercurial/HG clone that is).
rubidium
parents:
7564
diff
changeset
|
706 |
revision="" |
21fddd467b0f
(svn r11148) -Codechange: add support for getting version numbers from Mercurial/HG instead of norev000 (when using a Mercurial/HG clone that is).
rubidium
parents:
7564
diff
changeset
|
707 |
log 1 "checking revision... hg detection" |
6811
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
708 |
else |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
709 |
revision="" |
6812
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
710 |
log 1 "checking revision... no detection" |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
711 |
log 1 "WARNING: there is no means to determine the version." |
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
712 |
log 1 "WARNING: please use a subversion or git checkout of OpenTTD." |
7220
f44697e71145
(svn r10498) -Fix [FS#1008]: remove inconsistency between a warning and the actual behaviour.
rubidium
parents:
7204
diff
changeset
|
713 |
log 1 "WARNING: this version is only allowed by game servers that" |
f44697e71145
(svn r10498) -Fix [FS#1008]: remove inconsistency between a warning and the actual behaviour.
rubidium
parents:
7204
diff
changeset
|
714 |
log 1 "WARNING: have been compiled without version detection." |
f44697e71145
(svn r10498) -Fix [FS#1008]: remove inconsistency between a warning and the actual behaviour.
rubidium
parents:
7204
diff
changeset
|
715 |
log 1 "WARNING: there is a great chance you desync." |
6812
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
716 |
log 1 "WARNING: USE WITH CAUTION!" |
6811
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
717 |
|
6812
a7000b1ba9d9
(svn r10051) -Add: git "version" detection so we've got at least some indication what version we're playing when using git ;)
rubidium
parents:
6811
diff
changeset
|
718 |
sleep 5 |
6811
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
719 |
fi |
b8a89042096a
(svn r10050) -Codechange: make it a little easier to force a version number (for releases).
rubidium
parents:
6673
diff
changeset
|
720 |
fi |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
721 |
|
6930
19dca58600d2
(svn r10183) -Fix (r10182): some bashism sneaked in.
rubidium
parents:
6929
diff
changeset
|
722 |
if [ "$personal_dir" = "1" ]; then |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
723 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
724 |
personal_dir="OpenTTD" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
725 |
elif [ "$os" = "OSX" ]; then |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
726 |
personal_dir="Documents/OpenTTD" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
727 |
else |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
728 |
personal_dir=".openttd" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
729 |
fi |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
730 |
fi |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
731 |
|
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
732 |
if [ -n "$personal_dir" ] |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
733 |
then |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
734 |
log 1 "personal home directory... $personal_dir" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
735 |
else |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
736 |
log 1 "personal home directory... none" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
737 |
fi |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
738 |
|
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
739 |
if [ -n "$install_dir" ] |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
740 |
then |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
741 |
log 1 "installation directory... $install_dir" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
742 |
else |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
743 |
log 1 "installation directory... none" |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
744 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
745 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
746 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
747 |
make_cflags_and_ldflags() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
748 |
# General CFlags for BUILD |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
749 |
CFLAGS_BUILD="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
750 |
# General CFlags for HOST |
7564
fa54ab680589
(svn r11089) -Codechange: add revision detection to MSVC.
rubidium
parents:
7424
diff
changeset
|
751 |
CFLAGS="$CFLAGS -D$os" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
752 |
# CFlags for HOST and C-Compiler |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
753 |
CC_FLAGS="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
754 |
# Libs to compile. In fact this is just LDFLAGS |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
755 |
LIBS="-lstdc++" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
756 |
# LDFLAGS used for HOST |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
757 |
LDFLAGS="$LDFLAGS" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
758 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
759 |
if [ $enable_debug = 0 ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
760 |
# No debug, add default stuff |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
761 |
OBJS_SUBDIR="release" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
762 |
if [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
763 |
# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer |
7204
ef8181ff2c1e
(svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
rubidium
parents:
7045
diff
changeset
|
764 |
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 $CFLAGS" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
765 |
else |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
766 |
if [ "$os" = "MORPHOS" ]; then |
7204
ef8181ff2c1e
(svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
rubidium
parents:
7045
diff
changeset
|
767 |
CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" |
6046
67e9b9e2ef98
(svn r8776) [MorhpOS] -Fix: LDFLAGS needs -noixemul too
truelight
parents:
6035
diff
changeset
|
768 |
LDFLAGS="$LDFLAGS -noixemul" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
769 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
770 |
|
7204
ef8181ff2c1e
(svn r10482) -Fix [FS#990]: Do not override the CFLAGS environment variable when configuring a non-debug makefile. Based on a patch by saggson.
rubidium
parents:
7045
diff
changeset
|
771 |
CFLAGS="-O2 -fomit-frame-pointer $CFLAGS" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
772 |
fi |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
773 |
else |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
774 |
OBJS_SUBDIR="debug" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
775 |
|
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
776 |
# Each debug level reduces the optimalization by a bit |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
777 |
if [ $enable_debug -ge 1 ]; then |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
778 |
CFLAGS="$CFLAGS -g -D_DEBUG" |
5979
8209c942efd5
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
5961
diff
changeset
|
779 |
if [ "$os" = "PSP" ]; then |
8209c942efd5
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
5961
diff
changeset
|
780 |
CFLAGS="$CFLAGS -G0" |
8209c942efd5
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
5961
diff
changeset
|
781 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
782 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
783 |
if [ $enable_debug -ge 2 ]; then |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
784 |
CFLAGS="$CFLAGS -fno-inline" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
785 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
786 |
if [ $enable_debug -ge 3 ]; then |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
787 |
CFLAGS="$CFLAGS -O0" |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
788 |
else |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
789 |
CFLAGS="$CFLAGS -O2" |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
790 |
fi |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
791 |
fi |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
792 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
793 |
if [ "$enable_profiling" != "0" ]; then |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
794 |
CFLAGS="$CFLAGS -p" |
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
795 |
LDFLAGS="$LDFLAGS -pg" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
796 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
797 |
|
7294
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
798 |
if [ "$with_threads" = "0" ]; then |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
799 |
CFLAGS="$CFLAGS -DNO_THREADS" |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
800 |
fi |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
801 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
802 |
# Enable some things only for certain GCC versions |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
803 |
cc_version=`$cc_host -dumpversion | cut -c 1,3` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
804 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
805 |
if [ $cc_version -ge 29 ]; then |
5551
bfd85f0c196d
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5549
diff
changeset
|
806 |
CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
807 |
CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith" |
7774
2534b52bbc52
(svn r11323) -Fix: GCC2.95 gave a lot of bogus 'might be uninitialized', so never show them for this compiler
truelight
parents:
7719
diff
changeset
|
808 |
CFLAGS="$CFLAGS -Wno-uninitialized" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
809 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
810 |
CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
811 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
812 |
|
6523
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
813 |
gcc295="" |
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
814 |
if [ "$cc_version" = 29 ]; then |
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
815 |
# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we |
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
816 |
# need a lovely hack there to make it compile correctly. |
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
817 |
gcc295="1" |
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
818 |
fi |
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
819 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
820 |
if [ $cc_version -ge 30 ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
821 |
CFLAGS="$CFLAGS -W -Wno-unused-parameter" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
822 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
823 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
824 |
if [ $cc_version -ge 34 ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
825 |
CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
826 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
827 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
828 |
if [ "$os" = "CYGWIN" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
829 |
CFLAGS="$CFLAGS -mwin32" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
830 |
LDFLAGS="$LDFLAGS -mwin32" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
831 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
832 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
833 |
CFLAGS="$CFLAGS -mno-cygwin" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
834 |
LDFLAGS="$LDFLAGS -mno-cygwin" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
835 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
836 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
837 |
if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
838 |
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
839 |
LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" |
7294
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
840 |
fi |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
841 |
|
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
842 |
# GCC 4.0+ complains about that we break strict-aliasing. |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
843 |
# On most places we don't see how to fix it, and it doesn't |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
844 |
# break anything. So disable strict-aliasing to make the |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
845 |
# compiler all happy. |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
846 |
if [ $cc_version -ge 40 ]; then |
b53e8aae866c
(svn r10642) -Merge (from NoAI): ./configure flag for disabling threading.
rubidium
parents:
7220
diff
changeset
|
847 |
CFLAGS="$CFLAGS -fno-strict-aliasing" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
848 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
849 |
|
7406
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
850 |
# GCC 4.2+ automatically assumes that signed overflows do |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
851 |
# not occur in signed arithmetics, whereas we are not |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
852 |
# sure that they will not happen. It furthermore complains |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
853 |
# about it's own optimized code in some places. |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
854 |
if [ $cc_version -ge 42 ]; then |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
855 |
CFLAGS="$CFLAGS -fno-strict-overflow" |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
856 |
fi |
69bfb4b909e8
(svn r10779) -Fix: GCC 4.2 makes (by default for -O2, -O3 and -Os) an assumption that signed integers do not overflow, whereas it is very likely that some of the legacy code does so. It furthermore breaks with the assumed standard (the behaviour is not actually defined in the standard) about the behaviour when signed integers wrap.
rubidium
parents:
7330
diff
changeset
|
857 |
|
7045
5d5306f074db
(svn r10310) -Fix: Trunk can now be built on OS/2 :)
orudge
parents:
6980
diff
changeset
|
858 |
if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
859 |
LIBS="$LIBS -lpthread" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
860 |
LIBS="$LIBS -lrt" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
861 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
862 |
|
5753
553170b2ff57
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5587
diff
changeset
|
863 |
if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "WINCE" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
864 |
LIBS="$LIBS -lc" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
865 |
fi |
5753
553170b2ff57
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5587
diff
changeset
|
866 |
if [ "$os" = "WINCE" ]; then |
5762
f7f13553f881
(svn r8313) [WinCE] -Fix: -lws2 wasn't included in libraries, so network couldn't be linked
truelight
parents:
5760
diff
changeset
|
867 |
LIBS="$LIBS -lcoredll -lcorelibc -laygshell -lws2 -e WinMainCRTStartup" |
5753
553170b2ff57
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5587
diff
changeset
|
868 |
fi |
5960
38628fa068a0
(svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents:
5958
diff
changeset
|
869 |
if [ "$os" = "PSP" ]; then |
38628fa068a0
(svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents:
5958
diff
changeset
|
870 |
CFLAGS="$CFLAGS -I`$psp_config -p`/include" |
38628fa068a0
(svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents:
5958
diff
changeset
|
871 |
LDFLAGS="$LDFLAGS -L`$psp_config -p`/lib" |
5979
8209c942efd5
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
5961
diff
changeset
|
872 |
|
8209c942efd5
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
5961
diff
changeset
|
873 |
CFLAGS="$CFLAGS -fno-exceptions -fno-rtti -D_PSP_FW_VERSION=150" |
8209c942efd5
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
5961
diff
changeset
|
874 |
LIBS="$LIBS -D_PSP_FW_VERSION=150 -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser -lpspkernel -lm" |
5960
38628fa068a0
(svn r8632) [PSP] -Add: added include and lib to CFLAGS / LDFLAGS based on the SDK dir from psp-config
truelight
parents:
5958
diff
changeset
|
875 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
876 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
877 |
if [ "$os" = "MORPHOS" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
878 |
# -Wstrict-prototypes generates much noise because of system headers |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
879 |
CFLAGS="$CFLAGS -Wno-strict-prototypes" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
880 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
881 |
|
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
882 |
if [ "$os" = "OPENBSD" ]; then |
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
883 |
LIBS="$LIBS -pthread" |
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
884 |
fi |
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
885 |
|
7719
4be4d9bca5de
(svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents:
7687
diff
changeset
|
886 |
if [ "$os" = "FREEBSD" ]; then |
4be4d9bca5de
(svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents:
7687
diff
changeset
|
887 |
LIBS="$LIBS -lpthread" |
4be4d9bca5de
(svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents:
7687
diff
changeset
|
888 |
fi |
4be4d9bca5de
(svn r11254) -Fix: Link with -lpthread on FreeBSD.
maedhros
parents:
7687
diff
changeset
|
889 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
890 |
if [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
891 |
LDFLAGS="$LDFLAGS -framework Cocoa" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
892 |
if [ "$enable_dedicated" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
893 |
LIBS="$LIBS -framework QuickTime" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
894 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
895 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
896 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
897 |
if [ "$os" = "BEOS" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
898 |
LIBS="$LIBS -lmidi -lbe" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
899 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
900 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
901 |
# Most targets act like UNIX, just with some additions |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
902 |
if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
903 |
CFLAGS="$CFLAGS -DUNIX" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
904 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
905 |
# And others like Windows |
5753
553170b2ff57
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5587
diff
changeset
|
906 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
907 |
CFLAGS="$CFLAGS -DWIN" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
908 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
909 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
910 |
if [ -n "$sdl_config" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
911 |
CFLAGS="$CFLAGS -DWITH_SDL" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
912 |
CFLAGS="$CFLAGS `$sdl_config --cflags`" |
6249
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
913 |
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
914 |
if [ "$enable_static" != "0" ]; then |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
915 |
LIBS="$LIBS `$sdl_config --static-libs`" |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
916 |
else |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
917 |
LIBS="$LIBS `$sdl_config --libs`" |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
918 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
919 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
920 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
921 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
922 |
if [ "$with_cocoa" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
923 |
CFLAGS="$CFLAGS -DWITH_COCOA" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
924 |
LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
925 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
926 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
927 |
if [ "$with_zlib" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
928 |
if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
929 |
LIBS="$LIBS $zlib" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
930 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
931 |
LIBS="$LIBS -lz" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
932 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
933 |
CFLAGS="$CFLAGS -DWITH_ZLIB" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
934 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
935 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
936 |
if [ -n "$png_config" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
937 |
CFLAGS="$CFLAGS -DWITH_PNG" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
938 |
CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' ' '`" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
939 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
940 |
# The extra flags are unneeded for latest libpng-config, but some versions are so broken... |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
941 |
if [ "$enable_static" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
942 |
if [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
943 |
LIBS="$LIBS `$png_config --prefix`/lib/libpng.a" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
944 |
else |
6242
cd6bbee8f290
(svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents:
6241
diff
changeset
|
945 |
LIBS="$LIBS `$png_config --static --ldflags | tr '\n\r' ' '`" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
946 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
947 |
else |
6242
cd6bbee8f290
(svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents:
6241
diff
changeset
|
948 |
LIBS="$LIBS `$png_config --ldflags | tr '\n\r' ' '`" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
949 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
950 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
951 |
|
6241
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
952 |
if [ -n "$fontconfig_config" ]; then |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
953 |
CFLAGS="$CFLAGS -DWITH_FONTCONFIG" |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
954 |
CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' ' '`" |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
955 |
|
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
956 |
if [ "$enable_static" != "0" ]; then |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
957 |
if [ "$os" = "OSX" ]; then |
6243
80b367ea1679
(svn r9046) -Fix r9041: added a comment to make clear why we don't use --prefix here
truelight
parents:
6242
diff
changeset
|
958 |
# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix |
6244
14efce228eae
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents:
6243
diff
changeset
|
959 |
# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps |
14efce228eae
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents:
6243
diff
changeset
|
960 |
LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`" |
6241
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
961 |
else |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
962 |
LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`" |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
963 |
fi |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
964 |
else |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
965 |
LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`" |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
966 |
fi |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
967 |
fi |
98660bcb4cbe
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6238
diff
changeset
|
968 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
969 |
if [ -n "$freetype_config" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
970 |
CFLAGS="$CFLAGS -DWITH_FREETYPE" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
971 |
CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
972 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
973 |
if [ "$enable_static" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
974 |
if [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
975 |
LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
976 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
977 |
# Is it possible to do static with freetype, if so: how? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
978 |
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
979 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
980 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
981 |
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
982 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
983 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
984 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
985 |
if [ "$with_direct_music" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
986 |
CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT" |
6191
98bbe5ce8100
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6189
diff
changeset
|
987 |
# GCC 4.0+ doesn't like the DirectX includes (gives tons of |
98bbe5ce8100
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6189
diff
changeset
|
988 |
# warnings on it we won't be able to fix). For now just |
98bbe5ce8100
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6189
diff
changeset
|
989 |
# suppress those warnings. |
98bbe5ce8100
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6189
diff
changeset
|
990 |
if [ $cc_version -ge 40 ]; then |
98bbe5ce8100
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6189
diff
changeset
|
991 |
CFLAGS="$CFLAGS -Wno-non-virtual-dtor" |
98bbe5ce8100
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6189
diff
changeset
|
992 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
993 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
994 |
|
6035
9009f472b356
(svn r8758) -Fix r8757: wrong variable to check libtimidity on if it is found or not
truelight
parents:
6034
diff
changeset
|
995 |
if [ -n "$libtimidity" ]; then |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
996 |
if [ "$enable_static" != "0" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
997 |
LIBS="$LIBS $libtimidity" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
998 |
else |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
999 |
LIBS="$LIBS -ltimidity" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1000 |
fi |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1001 |
CFLAGS="$CFLAGS -DLIBTIMIDITY" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1002 |
fi |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1003 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1004 |
if [ "$with_iconv" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1005 |
CFLAGS="$CFLAGS -DWITH_ICONV" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1006 |
LIBS="$LIBS -liconv" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1007 |
if [ "$with_iconv" != "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1008 |
CFLAGS="$CFLAGS -I$with_iconv/include" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1009 |
LIBS="$LIBS -L$with_iconv/lib" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1010 |
fi |
7839
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1011 |
|
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1012 |
if [ "$have_broken_iconv" != "no" ]; then |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1013 |
CFLAGS="$CFLAGS -DHAVE_BROKEN_ICONV" |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1014 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1015 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1016 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1017 |
if [ -n "$with_midi" ]; then |
5549 | 1018 |
CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\\\\\"$with_midi\\\\\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1019 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1020 |
if [ -n "$with_midi_arg" ]; then |
5549 | 1021 |
CFLAGS="$CFLAGS -DMIDI_ARG=\\\\\"$with_midi_arg\\\\\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1022 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1023 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1024 |
if [ "$enable_dedicated" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1025 |
CFLAGS="$CFLAGS -DDEDICATED" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1026 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1027 |
|
6228
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
1028 |
if [ "$enable_unicode" != "0" ]; then |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
1029 |
CFLAGS="$CFLAGS -DUNICODE -D_UNICODE" |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
1030 |
fi |
a7b26082b00d
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6220
diff
changeset
|
1031 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1032 |
if [ "$enable_network" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1033 |
CFLAGS="$CFLAGS -DENABLE_NETWORK" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1034 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1035 |
if [ "$os" = "BEOS" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1036 |
LDFLAGS="$LDFLAGS -lbind -lsocket" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1037 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1038 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1039 |
if [ "$os" = "SUNOS" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1040 |
LDFLAGS="$LDFLAGS -lnsl -lsocket" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1041 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1042 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1043 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1044 |
if [ "$enable_static" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1045 |
# OSX can't handle -static in LDFLAGS |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1046 |
if [ "$os" != "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1047 |
LDFLAGS="$LDFLAGS -static" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1048 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1049 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1050 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1051 |
if [ "$enable_assert" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1052 |
CFLAGS="$CFLAGS -DNDEBUG" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1053 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1054 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1055 |
if [ "$enable_osx_g5" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1056 |
CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1057 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1058 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1059 |
if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1060 |
CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1061 |
LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1062 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1063 |
|
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
1064 |
if [ -n "$personal_dir" ]; then |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
1065 |
CFLAGS="$CFLAGS -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\\\\\"$personal_dir\\\\\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1066 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1067 |
|
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
1068 |
CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1069 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1070 |
log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1071 |
log 1 "using LDFLAGS... $LIBS $LDFLAGS" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1072 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1073 |
# Makedepend doesn't like something like: -isysroot /OSX/blabla |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1074 |
# so convert it to: -isysroot -OSX/blabla. makedepend just ignores |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1075 |
# any - command it doesn't know, so we are pretty save. |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1076 |
# Lovely hackish, not? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1077 |
# Btw, this almost always comes from outside the configure, so it is |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1078 |
# not something we can control. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1079 |
if [ "$with_makedepend" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1080 |
cflags_makedep="` echo "$CFLAGS" | sed 's# /# -#g'`" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1081 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1082 |
makedepend="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1083 |
fi |
6850
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1084 |
|
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1085 |
if [ "$with_distcc" != "0" ]; then |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1086 |
cc_host="$distcc $cc_host" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1087 |
cxx_host="$distcc $cxx_host" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1088 |
log 1 "" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1089 |
log 1 " NOTICE: remind yourself to use 'make -jN' to make use of distcc" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1090 |
log 1 "" |
aa03bfde6692
(svn r10090) -Add: add --with-distcc to configure, to enable distcc compiles. Not used by default
truelight
parents:
6812
diff
changeset
|
1091 |
fi |
6918
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
1092 |
|
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
1093 |
if [ "$with_ccache" != "0" ]; then |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
1094 |
cc_host="$ccache $cc_host" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
1095 |
cxx_host="$ccache $cxx_host" |
43b7ded86b20
(svn r10171) -Add: simple support for ccache (--with-ccache).
rubidium
parents:
6851
diff
changeset
|
1096 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1097 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1098 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1099 |
check_compiler() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1100 |
# Params: |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1101 |
# $1 - Type for message (build / host) |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1102 |
# $2 - What to fill with the found compiler |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1103 |
# $3 - System to try |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1104 |
# $4 - Compiler to try |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1105 |
# $5 - Env-setting to try |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1106 |
# $6 - GCC alike to try |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1107 |
# $7 - CC alike to try |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1108 |
# $8 - "0" gcc, "1" g++, "2" windres, "3" strip, "4" lipo |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1109 |
# $9 - What the command is to check for |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1110 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1111 |
if [ -n "$3" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1112 |
# Check for system |
5981
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1113 |
if [ -z "$6" ]; then |
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1114 |
compiler="$3" |
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1115 |
else |
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1116 |
compiler="$3-$6" |
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1117 |
fi |
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1118 |
machine=`eval $compiler $9 2>/dev/null` |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1119 |
ret=$? |
5981
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1120 |
eval "$2=$compiler" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1121 |
|
5981
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1122 |
log 2 "executing $compiler $9" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1123 |
log 2 " returned $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1124 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1125 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1126 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5981
1baa6e381f5a
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
5980
diff
changeset
|
1127 |
log 1 "checking $1... $compiler not found" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1128 |
log 1 "I couldn't detect any $6 binary for $3" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1129 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1130 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1131 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1132 |
if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1133 |
log 1 "checking $1... expected $3, found $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1134 |
log 1 "the compiler suggests it doesn't build code for the machine you specified" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1135 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1136 |
fi |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1137 |
elif [ -n "$4" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1138 |
# Check for manual compiler |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1139 |
machine=`$4 $9 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1140 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1141 |
eval "$2=$4" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1142 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1143 |
log 2 "executing $4 $9" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1144 |
log 2 " returned $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1145 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1146 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1147 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1148 |
log 1 "checking $1... $4 not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1149 |
log 1 "the selected binary doesn't seem to be a $6 binary" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1150 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1151 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1152 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1153 |
# Nothing given, autodetect |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1154 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1155 |
if [ -n "$5" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1156 |
machine=`$5 $9 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1157 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1158 |
eval "$2=$5" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1159 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1160 |
log 2 "executing $5 $9" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1161 |
log 2 " returned $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1162 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1163 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1164 |
# The user defined a GCC that doesn't reply to $9.. abort |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1165 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1166 |
log 1 "checking $1... $5 unusable" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1167 |
log 1 "the CC environment variable is set, but it doesn't seem to be a $6 binary" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1168 |
log 1 "please redefine the CC/CXX environment to a $6 binary" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1169 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1170 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1171 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1172 |
log 2 "checking $1... CC/CXX not set (skipping)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1173 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1174 |
# No $5, so try '$6' |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1175 |
machine=`$6 $9 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1176 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1177 |
eval "$2=$6" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1178 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1179 |
log 2 "executing $6 $9" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1180 |
log 2 " returned $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1181 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1182 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1183 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1184 |
# Maybe '$7'? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1185 |
machine=`$7 $9 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1186 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1187 |
eval "$2=$7" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1188 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1189 |
log 2 "executing $7 $9" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1190 |
log 2 " returned $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1191 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1192 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1193 |
# All failed, abort |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1194 |
if [ -z "$machine" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1195 |
log 1 "checking $1... $6 not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1196 |
log 1 "I couldn't detect any $6 binary on your system" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1197 |
log 1 "please define the CC/CXX environment to where it is located" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1198 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1199 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1200 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1201 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1202 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1203 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1204 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1205 |
if [ "$8" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1206 |
eval "res=\$$2" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1207 |
log 1 "checking $1... $res" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1208 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1209 |
log 1 "checking $1... $machine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1210 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1211 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1212 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1213 |
check_build() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1214 |
check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1215 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1216 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1217 |
check_host() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1218 |
# By default the host is the build |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1219 |
if [ -z "$host" ]; then host="$build"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1220 |
check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1221 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1222 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
1223 |
check_cxx_build() { |
5980
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
1224 |
check_compiler "build c++" "cxx_build" "$build" "$cxx_build" "$CXX" "g++" "c++" 1 "-dumpmachine" |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
1225 |
} |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
1226 |
|
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
1227 |
check_cxx_host() { |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
1228 |
# By default the host is the build |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
1229 |
if [ -z "$host" ]; then host="$build"; fi |
5980
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
1230 |
check_compiler "host c++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1231 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1232 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1233 |
check_windres() { |
5753
553170b2ff57
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5587
diff
changeset
|
1234 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1235 |
check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1236 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1237 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1238 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1239 |
check_strip() { |
5559
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
1240 |
if [ "$os" = "OS2" ]; then |
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
1241 |
# OS2 via gcc is a bit weird.. stripping HAS to be done via emxbind, which is via gcc directly |
5980
68b34b5ee4f2
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
5979
diff
changeset
|
1242 |
echo "checking host strip... using gcc -s option" |
5559
dac540e2dbd1
(svn r7959) [Configure] -Fix: OS2-gcc needs to get stripping via gcc, because it needs to be feed to emxbind at link-time.
truelight
parents:
5558
diff
changeset
|
1243 |
elif [ "$os" = "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1244 |
# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1245 |
echo "int main(int argc, char *argv[]) { }" > strip.test.c |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1246 |
$cc_host strip.test.c -o strip.test |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1247 |
check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1248 |
rm -f strip.test.c strip.test |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1249 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1250 |
check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "-V" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1251 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1252 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1253 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1254 |
check_lipo() { |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1255 |
if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1256 |
echo "int main(int argc, char *argv[]) { }" > lipo.test.c |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1257 |
$cc_host lipo.test.c -o lipo.test |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1258 |
check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1259 |
rm -f lipo.test.c lipo.test |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1260 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1261 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1262 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1263 |
check_direct_music() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1264 |
echo " |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1265 |
#include <windows.h> |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1266 |
#include <dmksctrl.h> |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1267 |
#include <dmusici.h> |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1268 |
#include <dmusicc.h> |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1269 |
#include <dmusicf.h> |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1270 |
int main(int argc, char *argv[]) { }" > direct_music.test.c |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1271 |
$cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1272 |
res=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1273 |
rm -f direct_music.test.c direct_music.test |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1274 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1275 |
if [ "$res" != "0" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1276 |
if [ "$with_direct_music" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1277 |
log 1 "configure: error: direct-music is not available on this system" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1278 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1279 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1280 |
with_direct_music="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1281 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1282 |
log 1 "checking direct-music... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1283 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1284 |
log 1 "checking direct-music... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1285 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1286 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1287 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1288 |
check_makedepend() { |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1289 |
if [ "$with_makedepend" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1290 |
log 1 "checking makedepend... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1291 |
return |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1292 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1293 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1294 |
if [ "$with_makedepend" = "1" ] || [ "$with_makedepend" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1295 |
makedepend="makedepend" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1296 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1297 |
makedepend="$with_makedepend" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1298 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1299 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1300 |
rm -f makedepend.tmp |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1301 |
touch makedepend.tmp |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1302 |
res=`$makedepend -fmakedepend.tmp 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1303 |
res=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1304 |
log 2 "executing $makedepend -f makedepend.tmp" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1305 |
log 2 " returned `cat makedepend.tmp`" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1306 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1307 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1308 |
if [ ! -s makedepend.tmp ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1309 |
rm -f makedepend.tmp makedepend.tmp.bak |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1310 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1311 |
if [ "$with_makedepend" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1312 |
log 1 "checking makedepend... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1313 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1314 |
log 1 "I couldn't detect any makedepend on your system" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1315 |
log 1 "please locate it via --makedepend=[binary]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1316 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1317 |
exit 1 |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1318 |
elif [ "$with_makedepend" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1319 |
log 1 "checking makedepend... $makedepend not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1320 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1321 |
log 1 "the selected file doesn't seem to be a valid makedepend binary" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1322 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1323 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1324 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1325 |
log 1 "checking makedepend... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1326 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1327 |
with_makedepend="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1328 |
return |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1329 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1330 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1331 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1332 |
rm -f makedepend.tmp makedepend.tmp.bak |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1333 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1334 |
log 1 "checking makedepend... $makedepend" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1335 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1336 |
|
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1337 |
detect_awk() { |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1338 |
# Not all awks allow gsub(), so we test for that here! It is in fact all we need... |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1339 |
|
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1340 |
# These awks are known to work. Test for them explicit |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1341 |
awks="gawk mawk nawk" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1342 |
|
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1343 |
awk_prefix="echo \"a.c b.c c.c\" | tr ' ' \\\\n | " |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1344 |
awk_param="' { ORS = \" \" } /\.c$/ { gsub(\".c$\", \".o\", \$0); print \$0; }' 2>/dev/null" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1345 |
awk_result="a.o b.o c.o " |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1346 |
log 2 "Detecing awk..." |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1347 |
|
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1348 |
log 2 "Trying: $awk_prefix $awk $awk_param" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1349 |
res=`eval $awk_prefix $awk $awk_param` |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1350 |
log 2 "Result: '$res'" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1351 |
if [ "$res" != "$awk_result" ] && [ "$awk" = "awk" ]; then |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1352 |
# User didn't supply his own awk, so try to detect some other known working names for an awk |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1353 |
for awk in $awks; do |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1354 |
log 2 "Trying: $awk_prefix $awk $awk_param" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1355 |
res=`eval $awk_prefix $awk $awk_param` |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1356 |
log 2 "Result: '$res'" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1357 |
if [ "$res" = "$awk_result" ]; then break; fi |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1358 |
done |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1359 |
|
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1360 |
if [ "$res" != "$awk_result" ]; then |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1361 |
log 1 "checking awk... not found" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1362 |
log 1 "configure: error: no awk found" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1363 |
log 1 "configure: error: please install one of the following: $awks" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1364 |
exit 1 |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1365 |
fi |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1366 |
fi |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1367 |
if [ "$res" != "$awk_result" ]; then |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1368 |
log 1 "checking awk... not found" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1369 |
log 1 "configure: error: you supplied '$awk' but it doesn't seem a valid gawk or mawk" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1370 |
exit 1 |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1371 |
fi |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1372 |
|
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1373 |
log 1 "checking awk... $awk" |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1374 |
} |
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1375 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1376 |
detect_os() { |
6077
ec7199271f52
(svn r8810) [Configure] -Fix: "" variables if you test them, else if they are empty they return lovely errors (tnx to Celester for finding thisone ;))
truelight
parents:
6046
diff
changeset
|
1377 |
if [ "$os" = "DETECT" ]; then |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
1378 |
# Detect UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1379 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1380 |
# Try first via dumpmachine, then via uname |
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1381 |
os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk ' |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1382 |
/linux/ { print "UNIX"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1383 |
/darwin/ { print "OSX"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1384 |
/freebsd/ { print "FREEBSD"; exit} |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
1385 |
/openbsd/ { print "OPENBSD"; exit} |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1386 |
/morphos/ { print "MORPHOS"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1387 |
/beos/ { print "BEOS"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1388 |
/sunos/ { print "SUNOS"; exit} |
6220
7694e640e7a2
(svn r9017) [Config] -Fix: if 'solaris' is in gcc dumpmachine, we have SunOS
truelight
parents:
6191
diff
changeset
|
1389 |
/solaris/ { print "SUNOS"; exit} |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1390 |
/cygwin/ { print "CYGWIN"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1391 |
/mingw/ { print "MINGW"; exit} |
5539
a77ac9a34e98
(svn r7881) [Configure] -Fix: OS2 GCC indentifies itself with os2, not os/2
truelight
parents:
5538
diff
changeset
|
1392 |
/os2/ { print "OS2"; exit} |
5753
553170b2ff57
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5587
diff
changeset
|
1393 |
/wince/ { print "WINCE"; exit} |
5957
89ca54f5da71
(svn r8628) [PSP] -Add: added configure support for the PlayStation Portable target
truelight
parents:
5941
diff
changeset
|
1394 |
/psp/ { print "PSP"; exit} |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1395 |
'` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1396 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1397 |
if [ -z "$os" ]; then |
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
1398 |
os=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | $awk ' |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1399 |
/linux/ { print "UNIX"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1400 |
/darwin/ { print "OSX"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1401 |
/freebsd/ { print "FREEBSD"; exit} |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
1402 |
/openbsd/ { print "OPENBSD"; exit} |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1403 |
/morphos/ { print "MORPHOS"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1404 |
/beos/ { print "BEOS"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1405 |
/sunos/ { print "SUNOS"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1406 |
/cygwin/ { print "CYGWIN"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1407 |
/mingw/ { print "MINGW"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1408 |
/os\/2/ { print "OS2"; exit} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1409 |
'` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1410 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1411 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1412 |
if [ -z "$os" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1413 |
log 1 "detecting OS... none detected" |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
1414 |
log 1 "I couldn't detect your OS. Please use --os=OS to force one" |
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
1415 |
log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1416 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1417 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1418 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1419 |
log 1 "detecting OS... $os" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1420 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1421 |
log 1 "forcing OS... $os" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1422 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1423 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1424 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1425 |
detect_sdl() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1426 |
# 0 means no, 1 is auto-detect, 2 is force |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1427 |
if [ "$with_sdl" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1428 |
log 1 "checking SDL... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1429 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1430 |
sdl_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1431 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1432 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1433 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1434 |
if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1435 |
log 1 "configure: error: it is impossible to compile both SDL and COCOA" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1436 |
log 1 "configure: error: please deselect one of them and try again" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1437 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1438 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1439 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1440 |
if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1441 |
log 1 "configure: error: it is impossible to compile a dedicated with SDL" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1442 |
log 1 "configure: error: please deselect one of them and try again" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1443 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1444 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1445 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1446 |
if [ "$enable_dedicated" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1447 |
log 1 "checking SDL... skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1448 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1449 |
sdl_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1450 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1451 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1452 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1453 |
# By default on OSX we don't use SDL. The rest is auto-detect |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1454 |
if [ "$with_sdl" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1455 |
log 1 "checking SDL... OSX, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1456 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1457 |
sdl_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1458 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1459 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1460 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1461 |
if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]; then |
5537
e1b80c739061
(svn r7878) Remove the long gone sdl11-config (again)
tron
parents:
5536
diff
changeset
|
1462 |
sdl_config="sdl-config" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1463 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1464 |
sdl_config="$with_sdl" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1465 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1466 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1467 |
version=`$sdl_config --version 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1468 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1469 |
log 2 "executing $sdl_config --version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1470 |
log 2 " returned $version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1471 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1472 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1473 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1474 |
log 1 "checking SDL... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1475 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1476 |
# It was forced, so it should be found. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1477 |
if [ "$with_sdl" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1478 |
log 1 "configure: error: sdl-config couldn't be found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1479 |
log 1 "configure: error: you supplied '$with_sdl', but it seems invalid" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1480 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1481 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1482 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1483 |
sdl_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1484 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1485 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1486 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1487 |
log 1 "checking SDL... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1488 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1489 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1490 |
detect_cocoa() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1491 |
# 0 means no, 1 is auto-detect, 2 is force |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1492 |
if [ "$with_cocoa" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1493 |
log 1 "checking COCOA... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1494 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1495 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1496 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1497 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1498 |
if [ "$with_cocoa" = "2" ] && [ "$enable_dedicated" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1499 |
log 1 "configure: error: it is impossible to compile a dedicated with COCOA" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1500 |
log 1 "configure: error: please deselect one of them and try again" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1501 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1502 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1503 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1504 |
if [ "$enable_dedicated" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1505 |
log 1 "checking COCOA... skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1506 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1507 |
with_cocoa="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1508 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1509 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1510 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1511 |
# By default on OSX we use COCOA. The rest doesn't support it |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1512 |
if [ "$with_cocoa" = "1" ] && [ "$os" != "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1513 |
log 1 "checking COCOA... not OSX, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1514 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1515 |
with_cocoa="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1516 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1517 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1518 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1519 |
if [ "$os" != "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1520 |
log 1 "checking COCOA... not OSX" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1521 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1522 |
log 1 "configure: error: COCOA video driver is only supported for OSX" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1523 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1524 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1525 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1526 |
log 1 "checking COCOA... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1527 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1528 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1529 |
detect_library() { |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1530 |
# $1 - config-param ($with_zlib value) |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1531 |
# $2 - library name ('zlib', sets $zlib) |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1532 |
# $3 - static library name (libz.a) |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1533 |
# $4 - header name (zlib.h) |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1534 |
# $5 - force static (if non-empty) |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1535 |
|
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1536 |
if [ -n "$5" ]; then force_static="1"; fi |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1537 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1538 |
# 0 means no, 1 is auto-detect, 2 is force |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1539 |
if [ "$1" = "0" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1540 |
log 1 "checking $2... disabled" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1541 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1542 |
eval "$2=\"\"" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1543 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1544 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1545 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1546 |
log 2 "detecting $2" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1547 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1548 |
if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
1549 |
eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | egrep \"\/$4\$\"`" |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1550 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1551 |
if [ -z "$res" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1552 |
log 2 " trying /usr/include/$4... no" |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
1553 |
eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1554 |
fi |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1555 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1556 |
if [ -z "$res" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1557 |
log 2 " trying /usr/local/include/$4... no" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1558 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1559 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1560 |
eval "res=\$$2" |
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1561 |
if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1562 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1563 |
log 2 " trying $res... found" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1564 |
# Now find the static lib, if needed |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
1565 |
eval "$2=`ls /lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1566 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1567 |
if [ -z "$res" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1568 |
log 2 " trying /lib/$3... no" |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
1569 |
eval "$2=`ls /usr/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1570 |
fi |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1571 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1572 |
if [ -z "$res" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1573 |
log 2 " trying /usr/lib/$3... no" |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
1574 |
eval "$2=`ls /usr/local/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1575 |
fi |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1576 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1577 |
if [ -z "$res" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1578 |
log 2 " trying /usr/local/lib/$3... no" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1579 |
log 1 "configure: error: $2 couldn't be found" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1580 |
log 1 "configure: error: you requested a static link, but I can't find $3" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1581 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1582 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1583 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1584 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1585 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1586 |
# Make sure it exists |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1587 |
if [ -f "$1" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1588 |
eval "$2=`ls $1 2>/dev/null`" |
5505
fa01ea67ac75
(svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz.
rubidium
parents:
5503
diff
changeset
|
1589 |
else |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1590 |
eval "$2=`ls $1/$3 2>/dev/null`" |
5505
fa01ea67ac75
(svn r7799) -Fix (r7759): gracefully handle cases where the directory libz.a is in is given via --with-libz.
rubidium
parents:
5503
diff
changeset
|
1591 |
fi |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1592 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1593 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1594 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1595 |
if [ -z "$res" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1596 |
log 1 "checking $2... not found" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1597 |
if [ "$1" = "2" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1598 |
log 1 "configure: error: $2 couldn't be found" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1599 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1600 |
exit 1 |
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1601 |
elif [ "$1" != "1" ]; then |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1602 |
log 1 "configure: error: $2 couldn't be found" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1603 |
log 1 "configure: error: you supplied '$1', but it seems invalid" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1604 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1605 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1606 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1607 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1608 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1609 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1610 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1611 |
eval "res=\$$2" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1612 |
log 2 " trying $res... found" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1613 |
|
6034
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1614 |
log 1 "checking $2... found" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1615 |
} |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1616 |
|
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1617 |
detect_zlib() { |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1618 |
detect_library "$with_zlib" "zlib" "libz.a" "zlib.h" |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1619 |
} |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1620 |
|
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1621 |
detect_libtimidity() { |
7a125490f55c
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
5981
diff
changeset
|
1622 |
detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1623 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1624 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1625 |
detect_png() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1626 |
# 0 means no, 1 is auto-detect, 2 is force |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1627 |
if [ "$with_png" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1628 |
log 1 "checking libpng... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1629 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1630 |
png_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1631 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1632 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1633 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1634 |
if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1635 |
log 1 "configure: error: libpng depends on zlib, which couldn't be found / was disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1636 |
log 1 "configure: error: please supply --with-zlib, with a valid zlib location" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1637 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1638 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1639 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1640 |
if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1641 |
png_config="libpng-config" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1642 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1643 |
png_config="$with_png" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1644 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1645 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1646 |
version=`$png_config --version 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1647 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1648 |
log 2 "executing $png_config --version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1649 |
log 2 " returned $version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1650 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1651 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1652 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1653 |
log 1 "checking libpng... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1654 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1655 |
# It was forced, so it should be found. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1656 |
if [ "$with_png" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1657 |
log 1 "configure: error: libpng-config couldn't be found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1658 |
log 1 "configure: error: you supplied '$with_png', but it seems invalid" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1659 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1660 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1661 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1662 |
png_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1663 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1664 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1665 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1666 |
log 1 "checking libpng... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1667 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1668 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1669 |
detect_freetype() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1670 |
# 0 means no, 1 is auto-detect, 2 is force |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1671 |
if [ "$with_freetype" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1672 |
log 1 "checking libfreetype... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1673 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1674 |
freetype_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1675 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1676 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1677 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1678 |
if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1679 |
log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1680 |
log 1 "configure: error: please supply --with-zlib, with a valid zlib location" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1681 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1682 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1683 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1684 |
if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1685 |
freetype_config="freetype-config" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1686 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1687 |
freetype_config="$with_freetype" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1688 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1689 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1690 |
version=`$freetype_config --version 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1691 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1692 |
log 2 "executing freetype_config --version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1693 |
log 2 " returned $version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1694 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1695 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1696 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1697 |
log 1 "checking libfreetype... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1698 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1699 |
# It was forced, so it should be found. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1700 |
if [ "$with_freetype" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1701 |
log 1 "configure: error: freetype-config couldn't be found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1702 |
log 1 "configure: error: you supplied '$with_freetype', but it seems invalid" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1703 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1704 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1705 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1706 |
freetype_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1707 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1708 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1709 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1710 |
log 1 "checking libfreetype... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1711 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1712 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1713 |
detect_fontconfig() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1714 |
# 0 means no, 1 is auto-detect, 2 is force |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1715 |
if [ "$with_fontconfig" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1716 |
log 1 "checking libfontconfig... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1717 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1718 |
fontconfig_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1719 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1720 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1721 |
|
6249
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
1722 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
1723 |
log 1 "checking libfontconfig... WIN32, skipping" |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
1724 |
fontconfig_config="" |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
1725 |
return 0 |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
1726 |
fi |
e3e0d224edf9
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6246
diff
changeset
|
1727 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1728 |
if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1729 |
fontconfig_config="pkg-config fontconfig" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1730 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1731 |
fontconfig_config="$with_fontconfig" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1732 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1733 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1734 |
version=`$fontconfig_config --modversion 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1735 |
ret=$? |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1736 |
shortversion=`echo $version | cut -c 1,3` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1737 |
log 2 "executing $fontconfig_config --modversion" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1738 |
log 2 " returned $version" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1739 |
log 2 " exit code $ret" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1740 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1741 |
if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1742 |
if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1743 |
log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1744 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1745 |
log 1 "checking libfontconfig... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1746 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1747 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1748 |
# It was forced, so it should be found. |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1749 |
if [ "$with_fontconfig" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1750 |
log 1 "configure: error: fontconfig-config couldn't be found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1751 |
log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1752 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1753 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1754 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1755 |
fontconfig_config="" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1756 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1757 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1758 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1759 |
log 1 "checking libfontconfig... found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1760 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1761 |
|
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1762 |
detect_pspconfig() { |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1763 |
# 0 means no, 1 is auto-detect, 2 is force |
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
1764 |
if [ "$with_psp_config" = "0" ]; then |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1765 |
log 1 "checking psp-config... disabled" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1766 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1767 |
psp_config="" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1768 |
return 0 |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1769 |
fi |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1770 |
|
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
1771 |
if [ "$with_psp_config" = "1" ] && [ "$os" != "PSP" ]; then |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1772 |
log 1 "checking psp-config... not PSP, skipping" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1773 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1774 |
psp_config=""; |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1775 |
return 0 |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1776 |
fi |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1777 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1778 |
if [ "$os" != "PSP" ]; then |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1779 |
log 1 "checking psp-config... not PSP" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1780 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1781 |
log 1 "configure: error: psp-config is only supported for PSP" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1782 |
exit 1 |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1783 |
fi |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1784 |
|
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
1785 |
if [ "$with_psp_config" = "1" ] || [ "$with_psp_config" = "" ] || [ "$with_psp_config" = "2" ]; then |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1786 |
psp_config="psp-config" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1787 |
else |
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
1788 |
psp_config="$with_psp_config" |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1789 |
fi |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1790 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1791 |
version=`$psp_config -p 2>/dev/null` |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1792 |
ret=$? |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1793 |
log 2 "executing $psp_config -p" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1794 |
log 2 " returned $version" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1795 |
log 2 " exit code $ret" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1796 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1797 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1798 |
log 1 "checking psp-config... not found" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1799 |
log 1 "configure: error: psp-config couldn't be found" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1800 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1801 |
# It was forced, so it should be found. |
5961
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
1802 |
if [ "$with_psp_config" != "1" ]; then |
5c300d5b3aa9
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
5960
diff
changeset
|
1803 |
log 1 "configure: error: you supplied '$with_psp_config', but it seems invalid" |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1804 |
fi |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1805 |
exit 1 |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1806 |
fi |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1807 |
|
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1808 |
log 1 "checking psp-config... found" |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1809 |
} |
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
1810 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1811 |
detect_iconv() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1812 |
# 0 means no, 1 is auto-detect, 2 is force |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1813 |
if [ "$with_iconv" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1814 |
log 1 "checking iconv... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1815 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1816 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1817 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1818 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1819 |
if [ "$with_iconv" = "1" ] && [ "$os" != "OSX" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1820 |
log 1 "checking iconv... not OSX, skipping" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1821 |
with_iconv="0" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1822 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1823 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1824 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1825 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1826 |
# Try to find iconv.h, seems to only thing to detect iconv with |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1827 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1828 |
if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1829 |
iconv=`ls -1 /usr/include 2>/dev/null | grep "iconv.h"` |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1830 |
if [ -z "$iconv" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1831 |
iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1832 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1833 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1834 |
# Make sure it exists |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1835 |
iconv=`ls $with_iconv/include/iconv.h 2>/dev/null` |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1836 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1837 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1838 |
if [ -z "$iconv" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1839 |
log 1 "checking iconv... not found" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1840 |
if [ "$with_iconv" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1841 |
log 1 "configure: error: iconv couldn't be found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1842 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1843 |
exit 1 |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1844 |
elif [ "$with_iconv" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1845 |
log 1 "configure: error: iconv couldn't be found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1846 |
log 1 "configure: error: you supplied '$with_iconv', but I couldn't detect iconv in it" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1847 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1848 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1849 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1850 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1851 |
return 0 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1852 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1853 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1854 |
if [ "$with_iconv" = "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1855 |
with_iconv="2" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1856 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1857 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1858 |
log 2 "found iconv in $iconv" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1859 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1860 |
log 1 "checking iconv... found" |
7839
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1861 |
|
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1862 |
# Check if we need to work around buggy iconv implementation where inbuf |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1863 |
# is wrongly typed as non-const. Correct implementation is at |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1864 |
# http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1865 |
|
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1866 |
cat > tmp.iconv.cpp << EOF |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1867 |
#include "src/stdafx.h" |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1868 |
#include <iconv.h> |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1869 |
int main() { |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1870 |
static char buf[1024]; |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1871 |
iconv_t convd = 0; |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1872 |
const char *inbuf = ""; |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1873 |
char *outbuf = buf; |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1874 |
size_t outlen = 1023; |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1875 |
size_t inlen = 0; |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1876 |
return iconv(convd, &inbuf, &inlen, &outbuf, &outlen); |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1877 |
} |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1878 |
EOF |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1879 |
execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1" |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1880 |
eval $execute >&/dev/null |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1881 |
ret=$? |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1882 |
log 2 "executing $execute" |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1883 |
log 2 " exit code $ret" |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1884 |
if [ "$ret" = "0" ]; then have_broken_iconv="no"; else have_broken_iconv="yes"; fi |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1885 |
log 1 "checking if iconv has non-const inbuf... $have_broken_iconv" |
feb131e32620
(svn r11389) -Fix [FS#1386]: Replace calls to deprecated API with newer ones and handle broken iconv declaration in OSX 10.5.
egladil
parents:
7774
diff
changeset
|
1886 |
rm -f tmp.iconv tmp.iconv.cpp |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1887 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1888 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1889 |
_detect_sort() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1890 |
sort_test_in="d |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1891 |
a |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1892 |
c |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1893 |
b" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1894 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1895 |
sort_test_out="a |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1896 |
b |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1897 |
c |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1898 |
d" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1899 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1900 |
log 2 "running echo <array> | $1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1901 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1902 |
if [ "`echo \"$sort_test_in\" | $1 2>/dev/null`" = "$sort_test_out" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1903 |
sort="$1" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1904 |
log 2 " result was valid" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1905 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1906 |
log 2 " result was invalid" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1907 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1908 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1909 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1910 |
detect_sort() { |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1911 |
if [ "$with_sort" = "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1912 |
log 1 "checking sort... disabled" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1913 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1914 |
return |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1915 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1916 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1917 |
if [ "$with_sort" = "1" ] || [ "$with_sort" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1918 |
_detect_sort "sort" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1919 |
if [ -z "$sort" ]; then _detect_sort "/sbin/sort"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1920 |
if [ -z "$sort" ]; then _detect_sort "/usr/sbin/sort"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1921 |
if [ -z "$sort" ]; then _detect_sort "/usr/local/sbin/sort"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1922 |
if [ -z "$sort" ]; then _detect_sort "/bin/sort"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1923 |
if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1924 |
if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1925 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1926 |
_detect_sort "$with_sort" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1927 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1928 |
|
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1929 |
if [ -z "$sort" ]; then |
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1930 |
if [ "$with_sort" = "2" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1931 |
log 1 "checking sort... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1932 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1933 |
log 1 "configure: error: couldn't detect sort on your system" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1934 |
exit 1 |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1935 |
elif [ "$with_sort" != "1" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1936 |
log 1 "checking sort... $with_sort not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1937 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1938 |
log 1 "configure: error: '$with_sort' doesn't look like a sort to me" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1939 |
log 1 "configure: error: please verify its location and function and try again" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1940 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1941 |
exit 1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1942 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1943 |
log 1 "checking sort... not found" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1944 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1945 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1946 |
log 1 "checking sort... $sort" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1947 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1948 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1949 |
|
6938
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1950 |
detect_cputype() { |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1951 |
if [ -n "$cpu_type" ] && [ "$cpu_type" != "DETECT" ]; then |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1952 |
log 1 "forcing cpu-type... $cpu_type bits" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1953 |
return; |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1954 |
fi |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1955 |
echo "#include \"src/stdafx.h\"" > tmp.64bit.cpp |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1956 |
echo "assert_compile(sizeof(size_t) == 8);" >> tmp.64bit.cpp |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1957 |
echo "int main() { return 0; }" >> tmp.64bit.cpp |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1958 |
execute="$cxx_host $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1959 |
cpu_type="`eval $execute 2>/dev/null`" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1960 |
ret=$? |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1961 |
log 2 "executing $execute" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1962 |
log 2 " returned $cpu_type" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1963 |
log 2 " exit code $ret" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1964 |
if [ "$ret" = "0" ]; then cpu_type="64"; else cpu_type="32"; fi |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1965 |
log 1 "detecting cpu-type... $cpu_type bits" |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1966 |
rm -f tmp.64bit tmp.64bit.cpp |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1967 |
} |
ee22ce416ed1
(svn r10191) -Backport (r9148 from NoAI): detecting of CPU type (32 vs 64 bits).
rubidium
parents:
6930
diff
changeset
|
1968 |
|
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1969 |
make_sed() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1970 |
# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1971 |
# We do this here, and not sooner, so universal builds also have this |
5541 | 1972 |
# automatically correct |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1973 |
# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1974 |
# we use 1 byte per bool normally in C part. So convert that last one to 4 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1975 |
# bytes too, but only for PPC. |
6980
c7c4f3bf5901
(svn r10236) -Feature: Introduce a form of timetabling for vehicles.
maedhros
parents:
6938
diff
changeset
|
1976 |
ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"` |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1977 |
if [ -n "$ppc" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1978 |
T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1979 |
osx_sysroot_version=10.3.9 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1980 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1981 |
T_CFLAGS="$CFLAGS" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1982 |
osx_sysroot_version=10.4u |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1983 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1984 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1985 |
T_LDFLAGS="$LDFLAGS" |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
1986 |
if [ "$with_osx_sysroot" = "3" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1987 |
T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1988 |
T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1989 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1990 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1991 |
SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1992 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1993 |
# All the data needed to compile a single target |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1994 |
# Make sure if you compile multiple targets to |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1995 |
# use multiple OBJS_DIR, because all in-between |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1996 |
# binaries are stored in there, and nowhere else. |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1997 |
SRC_REPLACE=" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1998 |
s#!!CC_HOST!!#$cc_host#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1999 |
s#!!CXX_HOST!!#$cxx_host#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2000 |
s#!!CC_BUILD!!#$cc_build#g; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5578
diff
changeset
|
2001 |
s#!!CXX_BUILD!!#$cxx_build#g; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2002 |
s#!!WINDRES!!#$windres#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2003 |
s#!!STRIP!!#$strip $strip_arg#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2004 |
s#!!LIPO!!#$lipo#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2005 |
s#!!CC_CFLAGS!!#$CC_CFLAGS#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2006 |
s#!!CFLAGS!!#$T_CFLAGS#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2007 |
s#!!CFLAGS_BUILD!!#$CFLAGS_BUILD#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2008 |
s#!!STRGEN_FLAGS!!#$strgen_flags#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2009 |
s#!!LIBS!!#$LIBS#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2010 |
s#!!LDFLAGS!!#$T_LDFLAGS#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2011 |
s#!!BIN_DIR!!#$BIN_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2012 |
s#!!ROOT_DIR!!#$ROOT_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2013 |
s#!!MEDIA_DIR!!#$MEDIA_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2014 |
s#!!SOURCE_LIST!!#$SOURCE_LIST#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2015 |
s#!!SRC_OBJS_DIR!!#$SRC_OBJS_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2016 |
s#!!LANG_OBJS_DIR!!#$LANG_OBJS_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2017 |
s#!!SRC_DIR!!#$SRC_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2018 |
s#!!OSXAPP!!#$OSXAPP#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2019 |
s#!!LANG_DIR!!#$LANG_DIR#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2020 |
s#!!TTD!!#$TTD#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2021 |
s#!!BINARY_DIR!!#$prefix_dir/$binary_dir#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2022 |
s#!!DATA_DIR!!#$prefix_dir/$data_dir#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2023 |
s#!!ICON_DIR!!#$prefix_dir/$icon_dir#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2024 |
s#!!PERSONAL_DIR!!#$personal_dir#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2025 |
s#!!INSTALL_DIR!!#$install_dir#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2026 |
s#!!STRGEN!!#$STRGEN#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2027 |
s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2028 |
s#!!ENDIAN_FORCE!!#$endian#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2029 |
s#!!STAGE!!#$STAGE#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2030 |
s#!!MAKEDEPEND!!#$makedepend#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2031 |
s#!!CFLAGS_MAKEDEP!!#$cflags_makedep#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2032 |
s#!!SORT!!#$sort#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2033 |
s#!!CONFIG_CACHE_COMPILER!!#config.cache.compiler#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2034 |
s#!!CONFIG_CACHE_LINKER!!#config.cache.linker#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2035 |
s#!!CONFIG_CACHE_ENDIAN!!#config.cache.endian#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2036 |
s#!!CONFIG_CACHE_SOURCE!!#config.cache.source#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2037 |
s#!!CONFIG_CACHE_VERSION!!#config.cache.version#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2038 |
s#!!CONFIG_CACHE_SOURCE_LIST!!#config.cache.source.list#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2039 |
s#!!LANG_SUPPRESS!!#$lang_suppress#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2040 |
s#!!OBJS_C!!#$OBJS_C#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2041 |
s#!!OBJS_CPP!!#$OBJS_CPP#g; |
5941
adaea39e84ab
(svn r8605) -Codechange: [OSX] changed all objective C to objective C++
bjarni
parents:
5923
diff
changeset
|
2042 |
s#!!OBJS_MM!!#$OBJS_MM#g; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2043 |
s#!!OBJS_RC!!#$OBJS_RC#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2044 |
s#!!SRCS!!#$SRCS#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2045 |
s#!!OS!!#$os#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2046 |
s#!!CONFIGURE_FILES!!#$CONFIGURE_FILES#g; |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2047 |
s#!!REVISION!!#$revision#g; |
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
2048 |
s#!!AWK!!#$awk#g; |
6523
bbc566ffb999
(svn r9710) -Add: added support for GCC 2.95. This makes MorphOS target alive again. With a big thanks to tokai and Rubidium!!
truelight
parents:
6512
diff
changeset
|
2049 |
s#!!GCC295!!#$gcc295#g; |
6851
0a0a094fb9f1
(svn r10091) -Add: make time detection whether you are using -jN when having distcc enabled.
rubidium
parents:
6850
diff
changeset
|
2050 |
s#!!DISTCC!!#$distcc#g; |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2051 |
" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2052 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2053 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2054 |
generate_main() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2055 |
STAGE="[MAIN]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2056 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2057 |
make_sed |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2058 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2059 |
# Create the main Makefile |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2060 |
echo "Generating Makefile..." |
5555 | 2061 |
< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2062 |
echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am |
5556
2c1fdf0bc6a4
(svn r7940) Add an empty line instead of overwriting the just written file
tron
parents:
5555
diff
changeset
|
2063 |
echo >> Makefile.am |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2064 |
# Make the copy of the source-list, so we don't trigger an unwanted recompile |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2065 |
cp $SOURCE_LIST config.cache.source.list |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2066 |
# Make sure config.cache is OLDER then config.cache.source.list |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2067 |
touch config.cache |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2068 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2069 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2070 |
generate_lang() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2071 |
STAGE="[LANG]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2072 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2073 |
make_sed |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2074 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2075 |
# Create the language file |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2076 |
mkdir -p $LANG_OBJS_DIR |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2077 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2078 |
echo "Generating lang/Makefile..." |
5555 | 2079 |
< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2080 |
echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2081 |
echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2082 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2083 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2084 |
generate_src_normal() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2085 |
STAGE=$1 |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2086 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2087 |
make_sed |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2088 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2089 |
# Create the source file |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2090 |
mkdir -p $SRC_OBJS_DIR |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2091 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2092 |
echo "Generating $2/Makefile..." |
5555 | 2093 |
< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2094 |
echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2095 |
echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2096 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2097 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2098 |
generate_src_osx() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2099 |
cc_host_orig="$cc_host" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2100 |
cxx_host_orig="$cxx_host" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2101 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2102 |
BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2103 |
cc_host="$cc_host_orig -arch ppc" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2104 |
cxx_host="$cxx_host_orig -arch ppc" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2105 |
generate_src_normal "[PowerPC]" "objs/ppc" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2106 |
|
5493
3796771bb24b
(svn r7777) [Configure] -Fix: call intel builds on OSX universal compiles intel, not i386 (that is just silly)
truelight
parents:
5491
diff
changeset
|
2107 |
BASE_SRC_OBJS_DIR="$OBJS_DIR/intel" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2108 |
cc_host="$cc_host_orig -arch i386" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2109 |
cxx_host="$cxx_host_orig -arch i386" |
5494 | 2110 |
generate_src_normal "[Intel]" "objs/intel" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2111 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2112 |
BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2113 |
cc_host="$cc_host_orig -arch ppc970" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2114 |
cxx_host="$cxx_host_orig -arch ppc970" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2115 |
CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2116 |
generate_src_normal "[PowerPC G5]" "objs/ppc970" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2117 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2118 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2119 |
generate_src() { |
5558
4bceae3ff866
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5557
diff
changeset
|
2120 |
if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2121 |
generate_src_osx |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2122 |
else |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2123 |
generate_src_normal "[SRC]" "objs" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2124 |
fi |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2125 |
} |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2126 |
|
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2127 |
showhelp() { |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2128 |
echo "'configure' configures OpenTTD." |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2129 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2130 |
echo "Usage: $0 [OPTION]... [VAR=VALUE]..." |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2131 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2132 |
echo "To assign environment variables (e.g., CC, CFLAGS...), specify them as" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2133 |
echo "VAR=VALUE. See below for descriptions of some of the useful variables." |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2134 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2135 |
echo "Defaults for the options are specified in brackets." |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2136 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2137 |
echo "Configuration:" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2138 |
echo " -h, --help display this help and exit" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2139 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2140 |
echo "System types:" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2141 |
echo " --build=BUILD configure for building on BUILD [guessed]" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2142 |
echo " --host=HOST cross-compile to build programs to run" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2143 |
echo " on HOST [BUILD]" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2144 |
echo " --windres=WINDRES the windres to use [HOST-windres]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2145 |
echo " --strip=STRIP the strip to use [HOST-strip]" |
6081
57d2fa5e3073
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6080
diff
changeset
|
2146 |
echo " --awk=AWK the awk to use in configure [awk]" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2147 |
echo " --lipo=LIPO the lipo to use (OSX ONLY) [HOST-lipo]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2148 |
echo " --os=OS the OS we are compiling for [DETECT]" |
6673
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
2149 |
echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/MORPHOS/" |
edf10cfdee17
(svn r9904) -Codechange [FS#798]: Add OpenBSD support to configure (matthias)
peter1138
parents:
6523
diff
changeset
|
2150 |
echo " BEOS/SUNOS/CYGWIN/MINGW/OS2/WINCE/PSP" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2151 |
echo " --endian=ENDIAN set the endian of the HOST (AUTO/LE/BE)" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2152 |
echo " --revision=rXXXX overwrite the revision detection." |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2153 |
echo " Use with care!" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2154 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2155 |
echo "Paths:" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2156 |
echo " --prefix-dir=dir specifies the prefix for all installed" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2157 |
echo " files [/usr/local]" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2158 |
echo " --binary-dir=dir location of the binary. Will be prefixed" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2159 |
echo " with the prefix-dir [games]" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2160 |
echo " --data-dir=dir location of data files (lang, data, gm)." |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2161 |
echo " Will be prefixed with the prefix-dir" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2162 |
echo " [share/games/openttd]" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2163 |
echo " --icon-dir=dir location of icons. Will be prefixed" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2164 |
echo " with the prefix-dir [share/pixmaps]" |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6918
diff
changeset
|
2165 |
echo " --personal-dir=dir location of the personal directory [.openttd]" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2166 |
echo " --install-dir=dir specifies the root to install to." |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2167 |
echo " Useful to install into jails [/]" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2168 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2169 |
echo "Features and packages:" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2170 |
echo " --enable-debug[=LVL] enable debug-mode (LVL=[0123], 0 is release)" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2171 |
echo " --enable-profiling enables profiling" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2172 |
echo " --enable-dedicated compile a dedicated server (without video)" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2173 |
echo " --enable-static enable static compile (doesn't work for" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2174 |
echo " all HOSTs)" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2175 |
echo " --enable-translator enable extra output for translators" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2176 |
echo " --enable-universal enable universal builds (OSX ONLY)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2177 |
echo " --enable-osx-g5 enables optimalizations for G5 (OSX ONLY)" |
7687
18f5be95ad53
(svn r11218) -Codechange: remove unused ENABLE_INSTALL in Makefile.in, and add --disable-unicode in configure help
glx
parents:
7618
diff
changeset
|
2178 |
echo " --disable-unicode disable unicode support to build win9x" |
18f5be95ad53
(svn r11218) -Codechange: remove unused ENABLE_INSTALL in Makefile.in, and add --disable-unicode in configure help
glx
parents:
7618
diff
changeset
|
2179 |
echo " version (Win32 ONLY)" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2180 |
echo " --disable-network disable network support" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2181 |
echo " --disable-assert disable asserts (continue on errors)" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2182 |
echo " --disable-strip disable any possible stripping" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2183 |
echo " --without-osx-sysroot disable the automatic adding of sysroot " |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2184 |
echo " (OSX ONLY)" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2185 |
echo " --without-application-bundle disable generation of application bundle" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2186 |
echo " (OSX ONLY)" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2187 |
echo " --with-direct-music enable direct music support (Win32 ONLY)" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2188 |
echo " --with-sort=sort define a non-default location for sort" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2189 |
echo " --with-midi=midi define which midi-player to use" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2190 |
echo " --with-midi-arg=arg define which args to use for the" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2191 |
echo " midi-player" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2192 |
echo " --with-cocoa enables COCOA video driver (OSX ONLY)" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2193 |
echo " --with-sdl[=sdl-config] enables SDL video driver support" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2194 |
echo " --with-zlib[=zlib.a] enables zlib support" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2195 |
echo " --with-png[=libpng-config] enables libpng support" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2196 |
echo " --with-freetype[=freetype-config]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2197 |
echo " enables libfreetype support" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2198 |
echo " --with-fontconfig[=pkg-config fontconfig]" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2199 |
echo " enables fontconfig support" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2200 |
echo " --with-iconv[=iconv-path] enables iconv support" |
5958
b8c4b6a82941
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
5957
diff
changeset
|
2201 |
echo " --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2202 |
echo " --with-makedepend[=makedepend] enables makedepend support" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2203 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2204 |
echo "Some influential environment variables:" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2205 |
echo " CC C compiler command" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2206 |
echo " CXX C++ compiler command" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2207 |
echo " CFLAGS C compiler flags" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2208 |
echo " WINDRES windres command" |
5491
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2209 |
echo " LDFLAGS linker flags, e.g. -L<lib dir> if you" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2210 |
echo " have libraries in a nonstandard" |
87f8b5a8cfb5
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5485
diff
changeset
|
2211 |
echo " directory <lib dir>" |
5475
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2212 |
echo "" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2213 |
echo "Use these variables to override the choices made by 'configure' or to help" |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2214 |
echo "it to find libraries and programs with nonstandard names/locations." |
2e6990a8c7c4
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2215 |
} |