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