author | truebrain |
Sun, 15 Jun 2008 22:37:35 +0000 | |
branch | noai |
changeset 10972 | 986675d19245 |
parent 10829 | 8a0ec0f0f928 |
child 11126 | 72d4c9314c72 |
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() { |
9626 | 8 |
released_version="" |
9 |
||
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
10 |
ignore_extra_parameters="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
11 |
# We set all kinds of defaults for params. Later on the user can override |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
12 |
# most of them; but if they don't, this default is used. |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
13 |
build="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
14 |
host="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
15 |
cc_build="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
16 |
cc_host="" |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
17 |
cxx_build="" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
18 |
cxx_host="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
19 |
windres="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
20 |
strip="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
21 |
lipo="" |
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
22 |
awk="awk" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
23 |
os="DETECT" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
24 |
endian="AUTO" |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
25 |
cpu_type="DETECT" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
26 |
revision="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
27 |
config_log="config.log" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
28 |
prefix_dir="/usr/local" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
29 |
binary_dir="games" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
30 |
data_dir="share/games/openttd" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
31 |
icon_dir="share/pixmaps" |
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
32 |
personal_dir="1" |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
33 |
shared_dir="1" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
34 |
install_dir="/" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
35 |
enable_debug="0" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
36 |
enable_desync_debug="0" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
37 |
enable_profiling="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
38 |
enable_dedicated="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
39 |
enable_network="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
40 |
enable_static="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
41 |
enable_translator="0" |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
42 |
enable_unicode="1" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
43 |
enable_assert="1" |
9837
c9ec4f82e0d0
(svn r12503) [NoAI] -Sync: with trunk r12461:12501.
rubidium
parents:
9826
diff
changeset
|
44 |
enable_strip="0" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
45 |
enable_universal="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
46 |
enable_osx_g5="0" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
47 |
enable_cocoa_quartz="1" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
48 |
enable_cocoa_quickdraw="1" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
49 |
with_osx_sysroot="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
50 |
with_application_bundle="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
51 |
with_sdl="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
52 |
with_cocoa="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
53 |
with_zlib="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
54 |
with_png="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
55 |
with_makedepend="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
56 |
with_direct_music="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
57 |
with_sort="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
58 |
with_iconv="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
59 |
with_midi="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
60 |
with_midi_arg="" |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
61 |
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
|
62 |
with_freetype="1" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
63 |
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
|
64 |
with_psp_config="1" |
9621
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
65 |
with_threads="1" |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
66 |
with_distcc="1" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
67 |
with_ccache="1" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
68 |
|
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
69 |
save_params_array=" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
70 |
build |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
71 |
host |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
72 |
cc_build |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
73 |
cc_host |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
74 |
cxx_build |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
75 |
cxx_host |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
76 |
windres |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
77 |
strip |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
78 |
lipo |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
79 |
awk |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
80 |
os |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
81 |
endian |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
82 |
cpu_type |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
83 |
revision |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
84 |
config_log |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
85 |
prefix_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
86 |
binary_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
87 |
data_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
88 |
icon_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
89 |
personal_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
90 |
shared_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
91 |
install_dir |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
92 |
enable_debug |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
93 |
enable_desync_debug |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
94 |
enable_profiling |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
95 |
enable_dedicated |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
96 |
enable_network |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
97 |
enable_static |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
98 |
enable_translator |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
99 |
enable_unicode |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
100 |
enable_assert |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
101 |
enable_strip |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
102 |
enable_universal |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
103 |
enable_osx_g5 |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
104 |
enable_cocoa_quartz |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
105 |
enable_cocoa_quickdraw |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
106 |
with_osx_sysroot |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
107 |
with_application_bundle |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
108 |
with_sdl |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
109 |
with_cocoa |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
110 |
with_zlib |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
111 |
with_png |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
112 |
with_makedepend |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
113 |
with_direct_music |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
114 |
with_sort |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
115 |
with_iconv |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
116 |
with_midi |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
117 |
with_midi_arg |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
118 |
with_libtimidity |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
119 |
with_freetype |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
120 |
with_fontconfig |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
121 |
with_psp_config |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
122 |
with_threads |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
123 |
with_distcc |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
124 |
with_ccache |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
125 |
CC CXX CFLAGS LDFLAGS" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
126 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
127 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
128 |
detect_params() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
129 |
# 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
|
130 |
# needed. This also handles any invalid option. |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
131 |
for p in "$@"; do |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
132 |
if [ -n "$prev_p" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
133 |
eval "$prev_p=\$p" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
134 |
prev_p= |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
135 |
continue |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
136 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
137 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
138 |
optarg=`expr "x$p" : 'x[^=]*=\(.*\)'` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
139 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
140 |
case "$p" in |
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
141 |
--help | -h) showhelp; exit 0;; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
142 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
143 |
--config-log) prev_p="config_log";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
144 |
--config-log=*) config_log="$optarg";; |
5726
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 |
--build) prev_p="build";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
147 |
--build=*) build="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
148 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
149 |
--host) prev_p="host";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
150 |
--host=*) host="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
151 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
152 |
--os) prev_p="os";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
153 |
--os=*) os="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
154 |
|
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
155 |
--cpu-type) prev_p="cpu_type";; |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
156 |
--cpu-type=*) cpu_type="$optarg";; |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
157 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
158 |
--revision=*) revision="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
159 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
160 |
--cc-build) prevp_p="cc_build";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
161 |
--cc-build=*) cc_build="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
162 |
--cc-host) prevp_p="cc_host";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
163 |
--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
|
164 |
--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
|
165 |
--cxx-build=*) cxx_build="$optarg";; |
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
166 |
--cxx-host) prevp_p="cxx_host";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
167 |
--cxx-host=*) cxx_host="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
168 |
--windres) prevp_p="windres";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
169 |
--windres=*) windres="$optarg";; |
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
170 |
--awk) prevp_p="awk";; |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
171 |
--awk=*) awk="$optarg";; |
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
172 |
--strip) prevp_p="strip";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
173 |
--strip=*) strip="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
174 |
--lipo) prevp_p="lipo";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
175 |
--lipo=*) lipo="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
176 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
177 |
--endian) prev_p="endian";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
178 |
--endian=*) endian="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
179 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
180 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
181 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
182 |
--prefix-dir) prevp_p="prefix-dir";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
183 |
--prefix-dir=*) prefix_dir="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
184 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
185 |
--binary-dir) prevp_p="binary-dir";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
186 |
--binary-dir=*) binary_dir="$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 |
--data-dir) prevp_p="data-dir";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
189 |
--data-dir=*) data_dir="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
190 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
191 |
--icon-dir) prevp_p="icon-dir";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
192 |
--icon-dir=*) icon_dir="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
193 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
194 |
--personal-dir) prevp_p="personal-dir";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
195 |
--personal-dir=*) personal_dir="$optarg";; |
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
196 |
--without-personal-dir) personal_dir="";; |
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
197 |
|
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
198 |
--shared-dir) prevp_p="shared-dir";; |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
199 |
--shared-dir=*) shared_dir="$optarg";; |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
200 |
--without-shared-dir) shared_dir="";; |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
201 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
202 |
--install-dir) prevp_p="install-dir";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
203 |
--install-dir=*) install_dir="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
204 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
205 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
206 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
207 |
--enable-debug) enable_debug="1";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
208 |
--enable-debug=*) enable_debug="$optarg";; |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
209 |
--enable-desync-debug) enable_desync_debug="1";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
210 |
--enable-desync-debug=*) enable_desync_debug="$optarg";; |
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
211 |
--enable-profiling) enable_profiling="1";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
212 |
--enable-profiling=*) enable_profiling="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
213 |
--enable-dedicated) enable_dedicated="1";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
214 |
--enable-dedicated=*) enable_dedicated="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
215 |
--enable-network=*) enable_network="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
216 |
--disable-network) enable_network="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
217 |
--disable-static) enable_static="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
218 |
--enable-static) enable_static="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
219 |
--enable-static=*) enable_static="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
220 |
--disable-translator) enable_translator="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
221 |
--enable-translator) enable_translator="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
222 |
--enable-translator=*) enable_translator="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
223 |
--disable-assert) enable_assert="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
224 |
--enable-assert) enable_assert="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
225 |
--enable-assert=*) enable_assert="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
226 |
--disable-strip) enable_strip="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
227 |
--enable-strip) enable_strip="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
228 |
--enable-strip=*) enable_strip="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
229 |
--disable-universal) enable_universal="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
230 |
--enable-universal) enable_universal="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
231 |
--enable-universal=*) enable_universal="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
232 |
--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
|
233 |
--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
|
234 |
--enable-osx-g5=*) enable_osx_g5="$optarg";; |
6554
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
235 |
--disable-unicode) enable_unicode="0";; |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
236 |
--enable-unicode) enable_unicode="2";; |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
237 |
--enable-unicode=*) enable_unicode="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
238 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
239 |
--disable-cocoa-quartz) enable_cocoa_quartz="0";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
240 |
--enable-cocoa-quartz) enable_cocoa_quartz="2";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
241 |
--enable-cocoa-quartz=*) enable_cocoa_quartz="$optarg";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
242 |
--disable-cocoa-quickdraw) enable_cocoa_quickdraw="0";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
243 |
--enable-cocoa-quickdraw) enable_cocoa_quickdraw="2";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
244 |
--enable-cocoa-quickdraw=*) enable_cocoa_quickdraw="$optarg";; |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
245 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
246 |
--with-sdl) with_sdl="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
247 |
--without-sdl) with_sdl="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
248 |
--with-sdl=*) with_sdl="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
249 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
250 |
--with-cocoa) with_cocoa="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
251 |
--without-cocoa) with_cocoa="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
252 |
--with-cocoa=*) with_cocoa="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
253 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
254 |
--with-zlib) with_zlib="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
255 |
--without-zlib) with_zlib="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
256 |
--with-zlib=*) with_zlib="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
257 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
258 |
--with-png) with_png="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
259 |
--without-png) with_png="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
260 |
--with-png=*) with_png="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
261 |
--with-libpng) with_png="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
262 |
--without-libpng) with_png="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
263 |
--with-libpng=*) with_png="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
264 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
265 |
--with-libtimidity) with_libtimidity="2";; |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
266 |
--without-libtimidity) with_libtimidity="0";; |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
267 |
--with-libtimidity=*) with_libtimidity="$optarg";; |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
268 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
269 |
--with-freetype) with_freetype="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
270 |
--without-freetype) with_freetype="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
271 |
--with-freetype=*) with_freetype="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
272 |
--with-libfreetype) with_freetype="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
273 |
--without-libfreetype) with_freetype="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
274 |
--with-libfreetype=*) with_freetype="$optarg";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
275 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
276 |
--with-fontconfig) with_fontconfig="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
277 |
--without-fontconfig) with_fontconfig="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
278 |
--with-fontconfig=*) with_fontconfig="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
279 |
--with-libfontconfig) with_fontconfig="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
280 |
--without-libfontconfig) with_fontconfig="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
281 |
--with-libfontconfig=*) with_fontconfig="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
282 |
|
6212
39deaa03d180
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
6211
diff
changeset
|
283 |
--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
|
284 |
--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
|
285 |
--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
|
286 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
287 |
--with-makedepend) with_makedepend="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
288 |
--without-makedepend) with_makedepend="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
289 |
--with-makedepend=*) with_makedepend="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
290 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
291 |
--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
|
292 |
--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
|
293 |
--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
|
294 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
295 |
--with-sort) with_sort="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
296 |
--without-sort) with_sort="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
297 |
--with-sort=*) with_sort="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
298 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
299 |
--with-iconv) with_iconv="2";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
300 |
--without-iconv) with_iconv="0";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
301 |
--with-iconv=*) with_iconv="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
302 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
303 |
--with-midi=*) with_midi="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
304 |
--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
|
305 |
|
9626 | 306 |
--without-distcc) with_distcc="0";; |
307 |
--with-distcc) with_distcc="2";; |
|
308 |
--with-distcc=*) with_distcc="$optarg";; |
|
309 |
||
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
310 |
--without-ccache) with_ccache="0";; |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
311 |
--with-ccache) with_ccache="2";; |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
312 |
--with-ccache=*) with_ccache="$optarg";; |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
313 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
314 |
--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
|
315 |
--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
|
316 |
--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
|
317 |
|
9601
b499fdd106d5
(svn r9713) [NoAI] -Sync with trunk (r9631:9712).
rubidium
parents:
9569
diff
changeset
|
318 |
--without-application-bundle) with_application_bundle="0";; |
b499fdd106d5
(svn r9713) [NoAI] -Sync with trunk (r9631:9712).
rubidium
parents:
9569
diff
changeset
|
319 |
--with-application-bundle) with_application_bundle="1";; |
b499fdd106d5
(svn r9713) [NoAI] -Sync with trunk (r9631:9712).
rubidium
parents:
9569
diff
changeset
|
320 |
--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
|
321 |
|
9621
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
322 |
--without-threads) with_threads="0";; |
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
323 |
--with-threads) with_threads="1";; |
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
324 |
--with-threads=*) with_threads="$optarg";; |
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
325 |
|
5787
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
326 |
CC=* | --CC=*) CC="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
327 |
CXX=* | --CXX=*) CXX="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
328 |
CFLAGS=* | --CFLAGS=*) CFLAGS="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
329 |
LDFLAGS=* | --LDFLAGS=*) LDFLAGS="$optarg";; |
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
330 |
|
ed1903876f7d
(svn r7877) Improve readability and shorten the configure script by 241 lines
tron
parents:
5766
diff
changeset
|
331 |
--ignore-extra-parameters) ignore_extra_parameters="1";; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
332 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
333 |
--*) |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
334 |
if [ "$ignore_extra_parameters" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
335 |
echo "Unknown option $p" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
336 |
exit 1 |
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 |
echo "Unknown option $p ignored" |
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 |
esac |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
342 |
done |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
343 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
344 |
if [ -n "$prev_p" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
345 |
echo "configure: error: missing argument to --$prev_p" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
346 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
347 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
348 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
349 |
# Clean the logfile |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
350 |
echo "" > $config_log |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
351 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
352 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
353 |
save_params() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
354 |
# 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
|
355 |
# configuration, without having the user to re-input stuff |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
356 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
357 |
echo "Running configure with following options:" >> $config_log |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
358 |
echo "" >> $config_log |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
359 |
|
6572
e35266003390
(svn r9049) -Fix [Config]: when running 'bash configure', make sure automated reconfigures run 'bash configure' too.
truelight
parents:
6570
diff
changeset
|
360 |
configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
361 |
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
|
362 |
eval "v=\"\$$p\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
363 |
p=`echo "$p" | sed 's/_/-/g;s/\n//g;'` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
364 |
# 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
|
365 |
configure="$configure --$p=\"$v\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
366 |
done |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
367 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
368 |
echo "$configure" >> $config_log |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
369 |
echo "$configure" > config.cache |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
370 |
echo "" >> $config_log |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
371 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
372 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
373 |
check_params() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
374 |
# 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
|
375 |
# expected.. fix that here |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
376 |
|
6404
1a632e5d77d0
(svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents:
6403
diff
changeset
|
377 |
endian=`echo $endian | tr '[a-z]' '[A-Z]'` |
1a632e5d77d0
(svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents:
6403
diff
changeset
|
378 |
os=`echo $os | tr '[a-z]' '[A-Z]'` |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
379 |
cpu_type=`echo $cpu_type | tr '[a-z]' '[A-Z]'` |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
380 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
381 |
# Check if all params have valid values |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
382 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
383 |
# Endian only allows AUTO, LE and, BE |
9701
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
384 |
if [ -z "`echo $endian | egrep '^(AUTO|LE|BE|PREPROCESSOR)$'`" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
385 |
echo "configure: error: invalid option --endian=$endian" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
386 |
echo " Available options are: --endian=[AUTO|LE|BE]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
387 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
388 |
fi |
9701
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
389 |
if [ "$endian" = "PREPROCESSOR" ] && [ "$os" != "OSX" ]; then |
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
390 |
echo "configure: error: invalid option --endian=$endian" |
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
391 |
echo " PREPROCESSOR is only available for OSX" |
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
392 |
exit 1 |
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
393 |
fi |
9624 | 394 |
# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
395 |
if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
396 |
echo "configure: error: invalid option --os=$os" |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
397 |
echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
398 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
399 |
fi |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
400 |
# cpu_type can be either 32 or 64 |
9629 | 401 |
if [ -z "`echo $cpu_type | egrep '^(32|64|DETECT)$'`" ]; then |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
402 |
echo "configure: error: invalid option --cpu-type=$cpu_type" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
403 |
echo " Available options are: --cpu-type[=DETECT|32|64]" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
404 |
exit 1 |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
405 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
406 |
# enable_debug should be between 0 and 4 |
9629 | 407 |
if [ -z "`echo $enable_debug | egrep '^[0123]$'`" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
408 |
echo "configure: error: invalid option --enable-debug=$enable_debug" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
409 |
echo " Available options are: --enable-debug[=0123]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
410 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
411 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
412 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
413 |
# enable_desync_debug should be between 0 and 3 |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
414 |
if [ -z "`echo $enable_desync_debug | egrep '^[012]$'`" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
415 |
echo "configure: error: invalid option --enable-desync-debug=$enable_desync_debug" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
416 |
echo " Available options are: --enable-desync-debug[=012]" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
417 |
exit 1 |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
418 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
419 |
|
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
420 |
detect_awk |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
421 |
|
10355
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
422 |
detect_os |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
423 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
424 |
check_build |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
425 |
check_host |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
426 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
427 |
# 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
|
428 |
# if [ "$enable_universal" = "1" ] && [ "$os" != "OSX" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
429 |
if [ "$enable_universal" = "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
430 |
enable_universal="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
431 |
fi |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
432 |
if [ "$enable_universal" = "2" ] && [ "$os" != "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
433 |
log 1 "configure: error: --enable-universal only works on OSX" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
434 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
435 |
fi |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
436 |
if [ "$enable_universal" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
437 |
log 1 "checking universal build... no" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
438 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
439 |
log 1 "checking universal build... yes" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
440 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
441 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
442 |
# 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
|
443 |
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
|
444 |
log 1 "checking host cc... $cc_host" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
445 |
|
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
446 |
check_cxx_build |
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
447 |
check_cxx_host |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
448 |
check_windres |
6408
a4fbf6e66c53
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6407
diff
changeset
|
449 |
if [ "$enable_strip" != "0" ]; then |
a4fbf6e66c53
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6407
diff
changeset
|
450 |
check_strip |
a4fbf6e66c53
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6407
diff
changeset
|
451 |
else |
a4fbf6e66c53
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6407
diff
changeset
|
452 |
log 1 "checking strip... disabled" |
a4fbf6e66c53
(svn r8816) [Config] -Fix: if you disable stripping, don't detect strip at all
truelight
parents:
6407
diff
changeset
|
453 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
454 |
check_lipo |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
455 |
check_makedepend |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
456 |
detect_cputype |
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 [ "$enable_static" = "1" ]; then |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
459 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
460 |
enable_static="2" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
461 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
462 |
enable_static="0" |
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 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
465 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
466 |
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
|
467 |
log 1 "checking static... yes" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
468 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
469 |
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
470 |
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
|
471 |
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
|
472 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
473 |
sleep 5 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
474 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
475 |
else |
6231
b81890a2b692
(svn r8679) [Configure] -Fix: 'checking for' and 'checking' was used mixed, now only 'checking' is used
truelight
parents:
6230
diff
changeset
|
476 |
log 1 "checking static... no" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
477 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
478 |
|
6554
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
479 |
if [ "$enable_unicode" = "1" ]; then |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
480 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
481 |
enable_unicode="2" |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
482 |
else |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
483 |
enable_unicode="0" |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
484 |
fi |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
485 |
fi |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
486 |
|
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
487 |
if [ "$enable_unicode" != "0" ]; then |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
488 |
log 1 "checking unicode... yes" |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
489 |
else |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
490 |
log 1 "checking unicode... no" |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
491 |
fi |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
492 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
493 |
# Show what we configured |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
494 |
if [ "$enable_debug" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
495 |
log 1 "using debug level... no" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
496 |
elif [ "$enable_profiling" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
497 |
log 1 "using debug level... profiling (debug level $enable_debug)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
498 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
499 |
log 1 "using debug level... level $enable_debug" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
500 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
501 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
502 |
if [ "$enable_desync_debug" = "0" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
503 |
log 1 "using desync debug level... no" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
504 |
else |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
505 |
log 1 "using desync debug level... level $enable_desync_debug" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
506 |
log 1 "WARNING: desync debug functions slow down the game considerably." |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
507 |
log 1 "WARNING: use only when you are instructed to do so" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
508 |
log 1 " or when you know what you are doing." |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
509 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
510 |
sleep 5 |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
511 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
512 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
513 |
detect_sdl |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
514 |
detect_cocoa |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
515 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
516 |
if [ "$enable_dedicated" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
517 |
log 1 "checking GDI video driver... skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
518 |
log 1 "checking dedicated... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
519 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
520 |
if [ "$enable_network" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
521 |
log 1 "WARNING: compiling a dedicated server without network is pointless" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
522 |
sleep 5 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
523 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
524 |
else |
6011
799eacb62d8e
(svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents:
6004
diff
changeset
|
525 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
526 |
log 1 "checking GDI video driver... found" |
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 |
log 1 "checking GDI video driver... not Windows, skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
529 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
530 |
|
6011
799eacb62d8e
(svn r8311) [WinCE] -Fix r8304: GDI wasn't enabled by default on WinCE
truelight
parents:
6004
diff
changeset
|
531 |
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
|
532 |
log 1 "WARNING: no video driver found, building dedicated only" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
533 |
enable_dedicated="1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
534 |
sleep 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
535 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
536 |
log 1 "checking dedicated... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
537 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
538 |
log 1 "checking dedicated... not selected" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
539 |
fi |
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 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
542 |
if [ "$enable_network" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
543 |
log 1 "checking network... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
544 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
545 |
log 1 "checking network... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
546 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
547 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
548 |
if [ "$enable_translator" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
549 |
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
|
550 |
# -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
|
551 |
strgen_flags="-t" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
552 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
553 |
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
|
554 |
strgen_flags="" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
555 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
556 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
557 |
if [ "$enable_assert" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
558 |
log 1 "checking assert... enabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
559 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
560 |
log 1 "checking assert... disabled" |
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 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
563 |
detect_zlib |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
564 |
detect_png |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
565 |
detect_freetype |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
566 |
detect_fontconfig |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
567 |
detect_iconv |
6209
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
568 |
detect_pspconfig |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
569 |
detect_libtimidity |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
570 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
571 |
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
|
572 |
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
573 |
if [ "$with_direct_music" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
574 |
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
|
575 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
576 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
577 |
with_direct_music="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
578 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
579 |
log 1 "checking direct-music... not Windows, skipping" |
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 |
check_direct_music |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
582 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
583 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
584 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
585 |
detect_sort |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
586 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
587 |
if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
588 |
endian="PREPROCESSOR" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
589 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
590 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
591 |
log 1 "checking endianess... $endian" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
592 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
593 |
# 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
|
594 |
# 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
|
595 |
if [ -f "$ROOT_DIR/version" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
596 |
lang_suppress="yes" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
597 |
log 1 "suppress language errors... yes" |
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 |
lang_suppress="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
600 |
log 1 "suppress language errors... no" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
601 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
602 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
603 |
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
|
604 |
if [ "$os" = "MORPHOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
605 |
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
|
606 |
elif [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
607 |
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
|
608 |
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
|
609 |
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
|
610 |
# 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
|
611 |
LDFLAGS="$LDFLAGS -s" |
6556
195bb9b3c565
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6554
diff
changeset
|
612 |
elif [ "$os" = "SUNOS" ]; then |
195bb9b3c565
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6554
diff
changeset
|
613 |
# The GNU strip does know -s, the non-GNU doesn't |
195bb9b3c565
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6554
diff
changeset
|
614 |
# So try to detect it (in a bit of an ugly way) |
195bb9b3c565
(svn r9033) [Config] -Fix: GNU strip has -s, but Solaris strip doesn't. Detect this when system is SUNOS.
truelight
parents:
6554
diff
changeset
|
615 |
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
|
616 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
617 |
strip_arg="-s" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
618 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
619 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
620 |
log 1 "checking stripping... $strip $strip_arg" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
621 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
622 |
strip="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
623 |
log 1 "checking stripping... skipped" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
624 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
625 |
|
9626 | 626 |
if [ "$with_distcc" = "0" ]; then |
627 |
log 1 "checking distcc... no" |
|
628 |
elif [ "$with_distcc" = "1" ]; then |
|
629 |
with_distcc="0" |
|
630 |
||
631 |
log 1 "checking distcc... no (only used when forced)" |
|
632 |
elif [ "$with_distcc" = "2" ]; then |
|
633 |
distcc="distcc" |
|
634 |
else |
|
635 |
distcc="$with_distcc" |
|
636 |
fi |
|
637 |
if [ "$with_distcc" != "0" ]; then |
|
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
638 |
res="`$distcc --version 2>/dev/null | head -n 1 | cut -b 1-6`" |
9626 | 639 |
if [ "$res" != "distcc" ]; then |
640 |
distcc="" |
|
641 |
log 1 "checking distcc... no" |
|
642 |
if [ "$with_distcc" = "2" ]; then |
|
643 |
log 1 "configure: error: no distcc detected, but was forced to be used" |
|
644 |
exit 1 |
|
645 |
fi |
|
646 |
if [ "$with_distcc" != "1" ]; then |
|
647 |
log 1 "configure: error: '$with_distcc' doesn't seem a distcc to me" |
|
648 |
exit 1 |
|
649 |
fi |
|
650 |
fi |
|
651 |
||
652 |
log 1 "checking distcc... $distcc" |
|
653 |
fi |
|
654 |
||
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
655 |
if [ "$with_ccache" = "0" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
656 |
log 1 "checking ccache... no" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
657 |
elif [ "$with_ccache" = "1" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
658 |
with_ccache="0" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
659 |
|
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
660 |
log 1 "checking ccache... no (only used when forced)" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
661 |
elif [ "$with_ccache" = "2" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
662 |
ccache="ccache" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
663 |
else |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
664 |
ccache="$with_ccache" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
665 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
666 |
if [ "$with_ccache" != "0" ]; then |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
667 |
res="`$ccache --version 2>/dev/null | head -n 1 | cut -b 1-6`" |
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
668 |
if [ "$res" != "ccache" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
669 |
ccache="" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
670 |
log 1 "checking ccache... no" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
671 |
if [ "$with_ccache" = "2" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
672 |
log 1 "configure: error: no ccache detected, but was forced to be used" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
673 |
exit 1 |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
674 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
675 |
if [ "$with_ccache" != "1" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
676 |
log 1 "configure: error: '$with_ccache' doesn't seem a ccache to me" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
677 |
exit 1 |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
678 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
679 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
680 |
|
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
681 |
log 1 "checking ccache... $ccache" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
682 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
683 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
684 |
if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
685 |
if [ "$with_osx_sysroot" = "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
686 |
with_osx_sysroot="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
687 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
688 |
log 1 "checking OSX sysroot... not OSX, skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
689 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
690 |
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
|
691 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
692 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
693 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
694 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
695 |
if [ "$with_osx_sysroot" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
696 |
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
|
697 |
log 1 "checking OSX sysroot... $with_osx_sysroot" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
698 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
699 |
# 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
|
700 |
if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
701 |
log 1 "checking OSX sysroot... no (use system default)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
702 |
with_osx_sysroot="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
703 |
else |
5792 | 704 |
log 1 "checking OSX sysroot... automatically" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
705 |
with_osx_sysroot="3" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
706 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
707 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
708 |
else |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
709 |
if [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
710 |
log 1 "checking OSX sysroot... no (use system default)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
711 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
712 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
713 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
714 |
if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
715 |
if [ "$with_application_bundle" = "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
716 |
with_application_bundle="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
717 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
718 |
log 1 "checking OSX application bundle... not OSX, skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
719 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
720 |
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
|
721 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
722 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
723 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
724 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
725 |
if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
726 |
OSXAPP="OpenTTD.app" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
727 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
728 |
OSXAPP="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
729 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
730 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
731 |
if [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
732 |
# Test on G5 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
733 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
734 |
if [ "$enable_osx_g5" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
735 |
log 1 "detecting G5... yes (forced)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
736 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
737 |
# First, are we a real OSX system, else we can't detect it |
6404
1a632e5d77d0
(svn r8811) [Configure] -Fix: [:lower:] for tr is GNU specific. Use [a-z] instead. (Celestar)
truelight
parents:
6403
diff
changeset
|
738 |
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
|
739 |
# If $host doesn't match $build , we are cross-compiling |
9476 | 740 |
if [ -n "$native" ] && [ "$build" == "$host" ]; then |
741 |
$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
|
742 |
res=`./G5_detector` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
743 |
rm -f G5_detector |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
744 |
if [ -n "$res" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
745 |
# This is G5, add flags for it |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
746 |
enable_osx_g5="2" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
747 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
748 |
log 1 "detecting G5... yes" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
749 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
750 |
enable_osx_g5="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
751 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
752 |
log 1 "detecting G5... no" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
753 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
754 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
755 |
enable_osx_g5="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
756 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
757 |
log 1 "detecting G5... no (cross-compiling)" |
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 |
else |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
761 |
if [ "$enable_osx_g5" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
762 |
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
|
763 |
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
|
764 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
765 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
766 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
767 |
fi |
9626 | 768 |
|
769 |
if [ -n "$released_version" ]; then |
|
770 |
log 1 "checking revision... release ($released_version)" |
|
771 |
if [ -n "$revision" ] && [ "$revision" != "$released_version" ]; then |
|
772 |
log 1 "WARNING: overriding of the revision is NOT possible for releases" |
|
773 |
log 1 "WARNING: the given revision is IGNORED" |
|
774 |
||
775 |
sleep 5 |
|
776 |
fi |
|
777 |
revision=$released_version |
|
778 |
else |
|
779 |
if [ -n "$revision" ]; then |
|
780 |
log 1 "checking revision... $revision" |
|
781 |
log 1 "WARNING: we do not advise you to use this setting" |
|
782 |
log 1 "WARNING: in most cases it is not safe for network use" |
|
783 |
log 1 "WARNING: USE WITH CAUTION!" |
|
784 |
||
785 |
sleep 5 |
|
786 |
elif [ -f "$ROOT_DIR/version" ]; then |
|
787 |
revision="`cat $ROOT_DIR/version`" |
|
788 |
||
789 |
log 1 "checking revision... $revision" |
|
790 |
elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help`" ]; then |
|
791 |
revision="" |
|
792 |
log 1 "checking revision... svn detection" |
|
793 |
elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help`" ]; then |
|
794 |
revision="" |
|
795 |
log 1 "checking revision... git detection" |
|
9704 | 796 |
elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help`" ]; then |
797 |
revision="" |
|
798 |
log 1 "checking revision... hg detection" |
|
9626 | 799 |
else |
800 |
revision="" |
|
801 |
log 1 "checking revision... no detection" |
|
802 |
log 1 "WARNING: there is no means to determine the version." |
|
803 |
log 1 "WARNING: please use a subversion or git checkout of OpenTTD." |
|
9641
855e32c08c9b
(svn r10533) [NoAI] -Sync with trunk r10460:r10532.
truelight
parents:
9629
diff
changeset
|
804 |
log 1 "WARNING: this version is only allowed by game servers that" |
855e32c08c9b
(svn r10533) [NoAI] -Sync with trunk r10460:r10532.
truelight
parents:
9629
diff
changeset
|
805 |
log 1 "WARNING: have been compiled without version detection." |
855e32c08c9b
(svn r10533) [NoAI] -Sync with trunk r10460:r10532.
truelight
parents:
9629
diff
changeset
|
806 |
log 1 "WARNING: there is a great chance you desync." |
9626 | 807 |
log 1 "WARNING: USE WITH CAUTION!" |
808 |
||
809 |
sleep 5 |
|
810 |
fi |
|
811 |
fi |
|
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
812 |
|
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
813 |
if [ "$personal_dir" = "1" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
814 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
815 |
personal_dir="OpenTTD" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
816 |
elif [ "$os" = "OSX" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
817 |
personal_dir="Documents/OpenTTD" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
818 |
else |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
819 |
personal_dir=".openttd" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
820 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
821 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
822 |
|
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
823 |
if [ "$shared_dir" = "1" ]; then |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
824 |
# we are using default values |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
825 |
if [ "$os" = "OSX" ]; then |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
826 |
shared_dir="/Library/Application\\\\ Support/OpenTTD" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
827 |
else |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
828 |
shared_dir="" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
829 |
fi |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
830 |
fi |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
831 |
|
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
832 |
if [ -n "$personal_dir" ] |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
833 |
then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
834 |
log 1 "personal home directory... $personal_dir" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
835 |
else |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
836 |
log 1 "personal home directory... none" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
837 |
fi |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
838 |
|
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
839 |
if [ -n "$shared_dir" ] |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
840 |
then |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
841 |
log 1 "shared data directory... $shared_dir" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
842 |
else |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
843 |
log 1 "shared data directory... none" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
844 |
fi |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
845 |
|
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
846 |
if [ -n "$install_dir" ] |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
847 |
then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
848 |
log 1 "installation directory... $install_dir" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
849 |
else |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
850 |
log 1 "installation directory... none" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
851 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
852 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
853 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
854 |
make_cflags_and_ldflags() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
855 |
# General CFlags for BUILD |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
856 |
CFLAGS_BUILD="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
857 |
# General CFlags for HOST |
9703
d2a6acdbd665
(svn r11146) [NoAI] -Sync: with trunk r11035:11045.
rubidium
parents:
9701
diff
changeset
|
858 |
CFLAGS="$CFLAGS -D$os" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
859 |
# CFlags for HOST and C-Compiler |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
860 |
CC_FLAGS="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
861 |
# Libs to compile. In fact this is just LDFLAGS |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
862 |
LIBS="-lstdc++" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
863 |
# LDFLAGS used for HOST |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
864 |
LDFLAGS="$LDFLAGS" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
865 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
866 |
if [ $enable_debug = 0 ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
867 |
# 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
|
868 |
OBJS_SUBDIR="release" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
869 |
if [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
870 |
# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer |
9641
855e32c08c9b
(svn r10533) [NoAI] -Sync with trunk r10460:r10532.
truelight
parents:
9629
diff
changeset
|
871 |
CFLAGS="-O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic $CFLAGS" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
872 |
else |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
873 |
if [ "$os" = "MORPHOS" ]; then |
9641
855e32c08c9b
(svn r10533) [NoAI] -Sync with trunk r10460:r10532.
truelight
parents:
9629
diff
changeset
|
874 |
CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" |
6372
6721af3ce810
(svn r8776) [MorhpOS] -Fix: LDFLAGS needs -noixemul too
truelight
parents:
6361
diff
changeset
|
875 |
LDFLAGS="$LDFLAGS -noixemul" |
5726
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 |
|
9641
855e32c08c9b
(svn r10533) [NoAI] -Sync with trunk r10460:r10532.
truelight
parents:
9629
diff
changeset
|
878 |
CFLAGS="-O2 -fomit-frame-pointer $CFLAGS" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
879 |
fi |
5802
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
880 |
else |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
881 |
OBJS_SUBDIR="debug" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
882 |
|
5802
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
883 |
# 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
|
884 |
if [ $enable_debug -ge 1 ]; then |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
885 |
CFLAGS="$CFLAGS -g -D_DEBUG -D_FORTIFY_SOURCE=2" |
6230
06c91ff0af27
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
6212
diff
changeset
|
886 |
if [ "$os" = "PSP" ]; then |
06c91ff0af27
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
6212
diff
changeset
|
887 |
CFLAGS="$CFLAGS -G0" |
06c91ff0af27
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
6212
diff
changeset
|
888 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
889 |
fi |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
890 |
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
|
891 |
CFLAGS="$CFLAGS -fno-inline" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
892 |
fi |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
893 |
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
|
894 |
CFLAGS="$CFLAGS -O0" |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
895 |
else |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
896 |
CFLAGS="$CFLAGS -O2" |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
897 |
fi |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
898 |
fi |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
899 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
900 |
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
|
901 |
CFLAGS="$CFLAGS -p" |
6f6dee32edd1
(svn r7931) -Fix (r7759): multiple (different) -O flags made compilations with the wrong optimisations.
rubidium
parents:
5800
diff
changeset
|
902 |
LDFLAGS="$LDFLAGS -pg" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
903 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
904 |
|
9623
ee0173281563
(svn r9826) [NoAI] -Fix r9821: in bash '==' is disliked, use '='
truelight
parents:
9621
diff
changeset
|
905 |
if [ "$with_threads" = "0" ]; then |
9621
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
906 |
CFLAGS="$CFLAGS -DNO_THREADS" |
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
907 |
fi |
7654501cf02d
(svn r9821) [NoAI] -Fix: support compilation without threads.
rubidium
parents:
9601
diff
changeset
|
908 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
909 |
if [ `echo $cc_host | cut -c 1-3` = "icc" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
910 |
# Enable some things only for certain ICC versions |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
911 |
cc_version=`$cc_host -dumpversion | cut -c 1-4` |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
912 |
|
9569
761e7675f6f2
(svn r9513) [NoAI] -Fix: disable strict-aliasing to make GCC 4 stop bitching about it
truelight
parents:
9506
diff
changeset
|
913 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
914 |
if [ "$cc_version" = "10.1" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
915 |
CFLAGS="$CFLAGS -Wno-multichar" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
916 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
917 |
else |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
918 |
# Enable some things only for certain GCC versions |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
919 |
cc_version=`$cc_host -dumpversion | cut -c 1,3` |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
920 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
921 |
if [ $cc_version -ge 29 ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
922 |
CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
923 |
CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith" |
10513
33cb70ff2f5d
(svn r13056) [NoAI] -Sync: with trunk r12996:13055.
rubidium
parents:
10455
diff
changeset
|
924 |
CFLAGS="$CFLAGS -Wno-uninitialized" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
925 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
926 |
CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
927 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
928 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
929 |
gcc295="" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
930 |
if [ "$cc_version" = 29 ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
931 |
# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
932 |
# need a lovely hack there to make it compile correctly. |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
933 |
gcc295="1" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
934 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
935 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
936 |
if [ $cc_version -ge 30 ]; then |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
937 |
CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2" |
10513
33cb70ff2f5d
(svn r13056) [NoAI] -Sync: with trunk r12996:13055.
rubidium
parents:
10455
diff
changeset
|
938 |
CFLAGS="$CFLAGS -Wredundant-decls" |
10829 | 939 |
# Do not warn about unused variables when building without asserts |
940 |
if [ $enable_assert -eq 0 ]; then |
|
941 |
CFLAGS="$CFLAGS -Wno-unused-variable" |
|
942 |
fi |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
943 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
944 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
945 |
if [ $cc_version -ge 34 ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
946 |
CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
947 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
948 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
949 |
if [ "$os" = "CYGWIN" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
950 |
CFLAGS="$CFLAGS -mwin32" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
951 |
LDFLAGS="$LDFLAGS -mwin32" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
952 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
953 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
954 |
CFLAGS="$CFLAGS -mno-cygwin" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
955 |
LDFLAGS="$LDFLAGS -mno-cygwin" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
956 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
957 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
958 |
if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
959 |
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
960 |
LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
961 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
962 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
963 |
# GCC 4.0+ complains about that we break strict-aliasing. |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
964 |
# On most places we don't see how to fix it, and it doesn't |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
965 |
# break anything. So disable strict-aliasing to make the |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
966 |
# compiler all happy. |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
967 |
if [ $cc_version -ge 40 ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
968 |
CFLAGS="$CFLAGS -fno-strict-aliasing" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
969 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
970 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
971 |
# GCC 4.2+ automatically assumes that signed overflows do |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
972 |
# not occur in signed arithmetics, whereas we are not |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
973 |
# sure that they will not happen. It furthermore complains |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
974 |
# about it's own optimized code in some places. |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
975 |
if [ $cc_version -ge 42 ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
976 |
CFLAGS="$CFLAGS -fno-strict-overflow" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
977 |
fi |
9701
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
978 |
fi |
d1ac22c62f64
(svn r11036) [NoAI] -Sync: with trunk r10774:11035.
rubidium
parents:
9694
diff
changeset
|
979 |
|
9629 | 980 |
if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
981 |
LIBS="$LIBS -lpthread" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
982 |
LIBS="$LIBS -lrt" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
983 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
984 |
|
6004
03795fd01cb8
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5838
diff
changeset
|
985 |
if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "WINCE" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
986 |
LIBS="$LIBS -lc" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
987 |
fi |
6004
03795fd01cb8
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5838
diff
changeset
|
988 |
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
|
989 |
LIBS="$LIBS -lcoredll -lcorelibc -laygshell -lws2 -e WinMainCRTStartup" |
6004
03795fd01cb8
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5838
diff
changeset
|
990 |
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
|
991 |
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
|
992 |
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
|
993 |
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
|
994 |
|
06c91ff0af27
(svn r8678) [PSP] -Add: added LIBS and CFLAGS needed to compile PSP
truelight
parents:
6212
diff
changeset
|
995 |
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
|
996 |
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
|
997 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
998 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
999 |
if [ "$os" = "MORPHOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1000 |
# -Wstrict-prototypes generates much noise because of system headers |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1001 |
CFLAGS="$CFLAGS -Wno-strict-prototypes" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1002 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1003 |
|
9624 | 1004 |
if [ "$os" = "OPENBSD" ]; then |
1005 |
LIBS="$LIBS -pthread" |
|
1006 |
fi |
|
1007 |
||
9718
f82a4facea8b
(svn r11309) [NoAI] -Sync: with trunk r11145:11308.
truelight
parents:
9704
diff
changeset
|
1008 |
if [ "$os" = "FREEBSD" ]; then |
f82a4facea8b
(svn r11309) [NoAI] -Sync: with trunk r11145:11308.
truelight
parents:
9704
diff
changeset
|
1009 |
LIBS="$LIBS -lpthread" |
f82a4facea8b
(svn r11309) [NoAI] -Sync: with trunk r11145:11308.
truelight
parents:
9704
diff
changeset
|
1010 |
fi |
f82a4facea8b
(svn r11309) [NoAI] -Sync: with trunk r11145:11308.
truelight
parents:
9704
diff
changeset
|
1011 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1012 |
if [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1013 |
LDFLAGS="$LDFLAGS -framework Cocoa" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1014 |
if [ "$enable_dedicated" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1015 |
LIBS="$LIBS -framework QuickTime" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1016 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1017 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1018 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1019 |
if [ "$os" = "BEOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1020 |
LIBS="$LIBS -lmidi -lbe" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1021 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1022 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1023 |
# Most targets act like UNIX, just with some additions |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1024 |
if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1025 |
CFLAGS="$CFLAGS -DUNIX" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1026 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1027 |
# And others like Windows |
6004
03795fd01cb8
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5838
diff
changeset
|
1028 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1029 |
CFLAGS="$CFLAGS -DWIN" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1030 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1031 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1032 |
if [ -n "$sdl_config" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1033 |
CFLAGS="$CFLAGS -DWITH_SDL" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1034 |
CFLAGS="$CFLAGS `$sdl_config --cflags`" |
6575
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1035 |
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1036 |
if [ "$enable_static" != "0" ]; then |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1037 |
LIBS="$LIBS `$sdl_config --static-libs`" |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1038 |
else |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1039 |
LIBS="$LIBS `$sdl_config --libs`" |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1040 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1041 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1042 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1043 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1044 |
if [ "$with_cocoa" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1045 |
CFLAGS="$CFLAGS -DWITH_COCOA" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1046 |
LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1047 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1048 |
if [ "$enable_cocoa_quartz" != "0" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1049 |
CFLAGS="$CFLAGS -DENABLE_COCOA_QUARTZ" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1050 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1051 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1052 |
if [ "$enable_cocoa_quickdraw" != "0" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1053 |
CFLAGS="$CFLAGS -DENABLE_COCOA_QUICKDRAW" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1054 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1055 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1056 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1057 |
if [ "$with_zlib" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1058 |
if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1059 |
LIBS="$LIBS $zlib" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1060 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1061 |
LIBS="$LIBS -lz" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1062 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1063 |
CFLAGS="$CFLAGS -DWITH_ZLIB" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1064 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1065 |
|
9419
0736fa1c5d26
(svn r9219) [NoAI] -Fix: fix up the configure to use the 3rdparty squirrel (and not the system-one)
truelight
parents:
9363
diff
changeset
|
1066 |
# 64bit machines need -D_SQ64 |
0736fa1c5d26
(svn r9219) [NoAI] -Fix: fix up the configure to use the 3rdparty squirrel (and not the system-one)
truelight
parents:
9363
diff
changeset
|
1067 |
if [ "$cpu_type" = "64" ]; then |
0736fa1c5d26
(svn r9219) [NoAI] -Fix: fix up the configure to use the 3rdparty squirrel (and not the system-one)
truelight
parents:
9363
diff
changeset
|
1068 |
CFLAGS="$CFLAGS -D_SQ64" |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
1069 |
fi |
9423
6303307e17f1
(svn r9224) [NoAI] -Change: move squirrel source to our src/ tree
truelight
parents:
9419
diff
changeset
|
1070 |
CFLAGS="$CFLAGS -I$ROOT_DIR/src/3rdparty/squirrel/include" |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
1071 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1072 |
if [ -n "$png_config" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1073 |
CFLAGS="$CFLAGS -DWITH_PNG" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1074 |
CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' ' '`" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1075 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1076 |
# 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
|
1077 |
if [ "$enable_static" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1078 |
if [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1079 |
LIBS="$LIBS `$png_config --prefix`/lib/libpng.a" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1080 |
else |
6568
ab03b75e7b00
(svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents:
6567
diff
changeset
|
1081 |
LIBS="$LIBS `$png_config --static --ldflags | tr '\n\r' ' '`" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1082 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1083 |
else |
6568
ab03b75e7b00
(svn r9045) -Fix [Config]: libpng-config --ldflags returns --libs and -L_opts too, no need to call it an extra time (double -lpng12 in LDFLAGS)
truelight
parents:
6567
diff
changeset
|
1084 |
LIBS="$LIBS `$png_config --ldflags | tr '\n\r' ' '`" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1085 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1086 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1087 |
|
6567
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1088 |
if [ -n "$fontconfig_config" ]; then |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1089 |
CFLAGS="$CFLAGS -DWITH_FONTCONFIG" |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1090 |
CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' ' '`" |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1091 |
|
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1092 |
if [ "$enable_static" != "0" ]; then |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1093 |
if [ "$os" = "OSX" ]; then |
6569
bc3911eeccea
(svn r9046) -Fix r9041: added a comment to make clear why we don't use --prefix here
truelight
parents:
6568
diff
changeset
|
1094 |
# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix |
6570
df82d4634996
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents:
6569
diff
changeset
|
1095 |
# 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 |
df82d4634996
(svn r9047) -Fix [FS#651]: request static deps from fontconfig in OSX
truelight
parents:
6569
diff
changeset
|
1096 |
LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`" |
6567
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1097 |
else |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1098 |
LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`" |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1099 |
fi |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1100 |
else |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1101 |
LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`" |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1102 |
fi |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1103 |
fi |
aa762c70a663
(svn r9044) -Fix [Config]: add fontconfig before freetype, as in static order is important
truelight
parents:
6564
diff
changeset
|
1104 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1105 |
if [ -n "$freetype_config" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1106 |
CFLAGS="$CFLAGS -DWITH_FREETYPE" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1107 |
CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' ' '`" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1108 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1109 |
if [ "$enable_static" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1110 |
if [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1111 |
LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1112 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1113 |
# Is it possible to do static with freetype, if so: how? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1114 |
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1115 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1116 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1117 |
LIBS="$LIBS `$freetype_config --libs | tr '\n\r' ' '`" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1118 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1119 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1120 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1121 |
if [ "$with_direct_music" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1122 |
CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT" |
6517
0bb604919089
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6515
diff
changeset
|
1123 |
# GCC 4.0+ doesn't like the DirectX includes (gives tons of |
0bb604919089
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6515
diff
changeset
|
1124 |
# warnings on it we won't be able to fix). For now just |
0bb604919089
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6515
diff
changeset
|
1125 |
# suppress those warnings. |
0bb604919089
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6515
diff
changeset
|
1126 |
if [ $cc_version -ge 40 ]; then |
0bb604919089
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6515
diff
changeset
|
1127 |
CFLAGS="$CFLAGS -Wno-non-virtual-dtor" |
0bb604919089
(svn r8970) -Fix (win32): suppress the warnings coming from the DirectX includes for GCC 4.0+. Also clearify commit r8968 in-code
truelight
parents:
6515
diff
changeset
|
1128 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1129 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1130 |
|
6361
8fc35d15114f
(svn r8758) -Fix r8757: wrong variable to check libtimidity on if it is found or not
truelight
parents:
6360
diff
changeset
|
1131 |
if [ -n "$libtimidity" ]; then |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1132 |
if [ "$enable_static" != "0" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1133 |
LIBS="$LIBS $libtimidity" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1134 |
else |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1135 |
LIBS="$LIBS -ltimidity" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1136 |
fi |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1137 |
CFLAGS="$CFLAGS -DLIBTIMIDITY" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1138 |
fi |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1139 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1140 |
if [ "$with_iconv" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1141 |
CFLAGS="$CFLAGS -DWITH_ICONV" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1142 |
LIBS="$LIBS -liconv" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1143 |
if [ "$with_iconv" != "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1144 |
CFLAGS="$CFLAGS -I$with_iconv/include" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1145 |
LIBS="$LIBS -L$with_iconv/lib" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1146 |
fi |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
1147 |
|
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
1148 |
if [ "$have_broken_iconv" != "no" ]; then |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
1149 |
CFLAGS="$CFLAGS -DHAVE_BROKEN_ICONV" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
1150 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1151 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1152 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1153 |
if [ -n "$with_midi" ]; then |
5800 | 1154 |
CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\\\\\"$with_midi\\\\\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1155 |
fi |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1156 |
if [ -n "$with_midi_arg" ]; then |
5800 | 1157 |
CFLAGS="$CFLAGS -DMIDI_ARG=\\\\\"$with_midi_arg\\\\\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1158 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1159 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1160 |
if [ "$enable_dedicated" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1161 |
CFLAGS="$CFLAGS -DDEDICATED" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1162 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1163 |
|
6554
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
1164 |
if [ "$enable_unicode" != "0" ]; then |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
1165 |
CFLAGS="$CFLAGS -DUNICODE -D_UNICODE" |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
1166 |
fi |
28f436faed81
(svn r9030) [Config] -Add: added --enable-unicode, which enables unicode (mostly for windows). Enabled by default on WIN32 (makes win9x fail, so use --disable-unicode if you produce binaries for win9x)
truelight
parents:
6546
diff
changeset
|
1167 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1168 |
if [ "$enable_network" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1169 |
CFLAGS="$CFLAGS -DENABLE_NETWORK" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1170 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1171 |
if [ "$os" = "BEOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1172 |
LDFLAGS="$LDFLAGS -lbind -lsocket" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1173 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1174 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1175 |
if [ "$os" = "SUNOS" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1176 |
LDFLAGS="$LDFLAGS -lnsl -lsocket" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1177 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1178 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1179 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1180 |
if [ "$enable_static" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1181 |
# OSX can't handle -static in LDFLAGS |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1182 |
if [ "$os" != "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1183 |
LDFLAGS="$LDFLAGS -static" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1184 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1185 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1186 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1187 |
if [ "$enable_assert" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1188 |
CFLAGS="$CFLAGS -DNDEBUG" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1189 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1190 |
|
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1191 |
if [ "$enable_desync_debug" = "1" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1192 |
CFLAGS="$CFLAGS -DDEBUG_DUMP_COMMANDS" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1193 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1194 |
if [ "$enable_desync_debug" = "2" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1195 |
CFLAGS="$CFLAGS -DRANDOM_DEBUG" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1196 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1197 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1198 |
if [ "$enable_osx_g5" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1199 |
CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1200 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1201 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1202 |
if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1203 |
CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1204 |
LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1205 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1206 |
|
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1207 |
if [ -n "$personal_dir" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1208 |
CFLAGS="$CFLAGS -DWITH_PERSONAL_DIR -DPERSONAL_DIR=\\\\\"$personal_dir\\\\\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1209 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1210 |
|
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
1211 |
if [ -n "$shared_dir" ]; then |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
1212 |
CFLAGS="$CFLAGS -DWITH_SHARED_DIR -DSHARED_DIR=\\\\\"$shared_dir\\\\\"" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
1213 |
fi |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
1214 |
|
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1215 |
CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1216 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1217 |
log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1218 |
log 1 "using LDFLAGS... $LIBS $LDFLAGS" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1219 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1220 |
# Makedepend doesn't like something like: -isysroot /OSX/blabla |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1221 |
# so convert it to: -isysroot -OSX/blabla. makedepend just ignores |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1222 |
# any - command it doesn't know, so we are pretty save. |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1223 |
# Lovely hackish, not? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1224 |
# 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
|
1225 |
# not something we can control. |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1226 |
if [ "$with_makedepend" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1227 |
cflags_makedep="` echo "$CFLAGS" | sed 's# /# -#g'`" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1228 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1229 |
makedepend="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1230 |
fi |
9626 | 1231 |
|
1232 |
if [ "$with_distcc" != "0" ]; then |
|
1233 |
cc_host="$distcc $cc_host" |
|
1234 |
cxx_host="$distcc $cxx_host" |
|
1235 |
log 1 "" |
|
1236 |
log 1 " NOTICE: remind yourself to use 'make -jN' to make use of distcc" |
|
1237 |
log 1 "" |
|
1238 |
fi |
|
9628
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1239 |
|
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1240 |
if [ "$with_ccache" != "0" ]; then |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1241 |
cc_host="$ccache $cc_host" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1242 |
cxx_host="$ccache $cxx_host" |
b5c2449616b5
(svn r10195) [NoAI] -Sync: with trunk r10119:10194.
rubidium
parents:
9626
diff
changeset
|
1243 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1244 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1245 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1246 |
check_compiler() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1247 |
# Params: |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1248 |
# $1 - Type for message (build / host) |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1249 |
# $2 - What to fill with the found compiler |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1250 |
# $3 - System to try |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1251 |
# $4 - Compiler to try |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1252 |
# $5 - Env-setting to try |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1253 |
# $6 - GCC alike to try |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1254 |
# $7 - CC alike to try |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1255 |
# $8 - "0" gcc, "1" g++, "2" windres, "3" strip, "4" lipo |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1256 |
# $9 - What the command is to check for |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1257 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1258 |
if [ -n "$3" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1259 |
# Check for system |
6232
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1260 |
if [ -z "$6" ]; then |
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1261 |
compiler="$3" |
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1262 |
else |
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1263 |
compiler="$3-$6" |
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1264 |
fi |
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1265 |
machine=`eval $compiler $9 2>/dev/null` |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1266 |
ret=$? |
6232
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1267 |
eval "$2=$compiler" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1268 |
|
6232
09125a3ceba4
(svn r8680) [Configure] -Codechange: allow a bit more flexible code in check_compiler
truelight
parents:
6231
diff
changeset
|
1269 |
log 2 "executing $compiler $9" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1270 |
log 2 " returned $machine" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1271 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1272 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1273 |
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
|
1274 |
log 1 "checking $1... $compiler not found" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1275 |
log 1 "I couldn't detect any $6 binary for $3" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1276 |
exit 1 |
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 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1279 |
if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1280 |
log 1 "checking $1... expected $3, found $machine" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1281 |
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
|
1282 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1283 |
fi |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1284 |
elif [ -n "$4" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1285 |
# Check for manual compiler |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1286 |
machine=`$4 $9 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1287 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1288 |
eval "$2=$4" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1289 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1290 |
log 2 "executing $4 $9" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1291 |
log 2 " returned $machine" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1292 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1293 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1294 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1295 |
log 1 "checking $1... $4 not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1296 |
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
|
1297 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1298 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1299 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1300 |
# Nothing given, autodetect |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1301 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1302 |
if [ -n "$5" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1303 |
machine=`$5 $9 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1304 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1305 |
eval "$2=$5" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1306 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1307 |
log 2 "executing $5 $9" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1308 |
log 2 " returned $machine" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1309 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1310 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1311 |
# 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
|
1312 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1313 |
log 1 "checking $1... $5 unusable" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1314 |
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
|
1315 |
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
|
1316 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1317 |
fi |
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 |
log 2 "checking $1... CC/CXX not set (skipping)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1320 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1321 |
# No $5, so try '$6' |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1322 |
machine=`$6 $9 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 |
eval "$2=$6" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1325 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1326 |
log 2 "executing $6 $9" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1327 |
log 2 " returned $machine" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1328 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1329 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1330 |
if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1331 |
# Maybe '$7'? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1332 |
machine=`$7 $9 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1333 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1334 |
eval "$2=$7" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1335 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1336 |
log 2 "executing $7 $9" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1337 |
log 2 " returned $machine" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1338 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1339 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1340 |
# All failed, abort |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1341 |
if [ -z "$machine" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1342 |
log 1 "checking $1... $6 not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1343 |
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
|
1344 |
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
|
1345 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1346 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1347 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1348 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1349 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1350 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1351 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1352 |
if [ "$8" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1353 |
eval "res=\$$2" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1354 |
log 1 "checking $1... $res" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1355 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1356 |
log 1 "checking $1... $machine" |
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 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1359 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1360 |
check_build() { |
10355
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1361 |
if [ "$os" = "FREEBSD" ]; then |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1362 |
# FreeBSD's C compiler does not support dump machine. |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1363 |
# However, removing C support is not possible because PSP must be linked with the C compiler. |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1364 |
check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CXX" "g++" "c++" "0" "-dumpmachine" |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1365 |
else |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1366 |
check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine" |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1367 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1368 |
} |
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 |
check_host() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1371 |
# By default the host is the build |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1372 |
if [ -z "$host" ]; then host="$build"; fi |
10355
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1373 |
|
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1374 |
if [ "$os" = "FREEBSD" ]; then |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1375 |
# FreeBSD's C compiler does not support dump machine. |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1376 |
# However, removing C support is not possible because PSP must be linked with the C compiler. |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1377 |
check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CXX" "g++" "c++" "0" "-dumpmachine" |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1378 |
else |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1379 |
check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine" |
ee4b5f7a5bf2
(svn r12896) [NoAI] -Sync: with trunk r12824:r12895.
rubidium
parents:
9837
diff
changeset
|
1380 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1381 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1382 |
|
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
1383 |
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
|
1384 |
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
|
1385 |
} |
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
1386 |
|
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
1387 |
check_cxx_host() { |
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5829
diff
changeset
|
1388 |
# 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
|
1389 |
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
|
1390 |
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
|
1391 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1392 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1393 |
check_windres() { |
6004
03795fd01cb8
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5838
diff
changeset
|
1394 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1395 |
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
|
1396 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1397 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1398 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1399 |
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
|
1400 |
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
|
1401 |
# 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
|
1402 |
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
|
1403 |
elif [ "$os" = "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1404 |
# 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
|
1405 |
echo "int main(int argc, char *argv[]) { }" > strip.test.c |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1406 |
$cc_host strip.test.c -o strip.test |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1407 |
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
|
1408 |
rm -f strip.test.c strip.test |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1409 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1410 |
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
|
1411 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1412 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1413 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1414 |
check_lipo() { |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1415 |
if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1416 |
echo "int main(int argc, char *argv[]) { }" > lipo.test.c |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1417 |
$cc_host lipo.test.c -o lipo.test |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1418 |
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
|
1419 |
rm -f lipo.test.c lipo.test |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1420 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1421 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1422 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1423 |
check_direct_music() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1424 |
echo " |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1425 |
#include <windows.h> |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1426 |
#include <dmksctrl.h> |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1427 |
#include <dmusici.h> |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1428 |
#include <dmusicc.h> |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1429 |
#include <dmusicf.h> |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1430 |
int main(int argc, char *argv[]) { }" > direct_music.test.c |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1431 |
$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
|
1432 |
res=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1433 |
rm -f direct_music.test.c direct_music.test |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1434 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1435 |
if [ "$res" != "0" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1436 |
if [ "$with_direct_music" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1437 |
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
|
1438 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1439 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1440 |
with_direct_music="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1441 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1442 |
log 1 "checking direct-music... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1443 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1444 |
log 1 "checking direct-music... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1445 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1446 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1447 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1448 |
check_makedepend() { |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1449 |
if [ "$with_makedepend" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1450 |
log 1 "checking makedepend... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1451 |
return |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1452 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1453 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1454 |
if [ "$with_makedepend" = "1" ] || [ "$with_makedepend" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1455 |
makedepend="makedepend" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1456 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1457 |
makedepend="$with_makedepend" |
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 |
rm -f makedepend.tmp |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1461 |
touch makedepend.tmp |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1462 |
res=`$makedepend -fmakedepend.tmp 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1463 |
res=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1464 |
log 2 "executing $makedepend -f makedepend.tmp" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1465 |
log 2 " returned `cat makedepend.tmp`" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1466 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1467 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1468 |
if [ ! -s makedepend.tmp ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1469 |
rm -f makedepend.tmp makedepend.tmp.bak |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1470 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1471 |
if [ "$with_makedepend" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1472 |
log 1 "checking makedepend... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1473 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1474 |
log 1 "I couldn't detect any makedepend on your system" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1475 |
log 1 "please locate it via --makedepend=[binary]" |
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 |
exit 1 |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1478 |
elif [ "$with_makedepend" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1479 |
log 1 "checking makedepend... $makedepend not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1480 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1481 |
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
|
1482 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1483 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1484 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1485 |
log 1 "checking makedepend... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1486 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1487 |
with_makedepend="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1488 |
return |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1489 |
fi |
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 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1492 |
rm -f makedepend.tmp makedepend.tmp.bak |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1493 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1494 |
log 1 "checking makedepend... $makedepend" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1495 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1496 |
|
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1497 |
detect_awk() { |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1498 |
# Not all awks allow gsub(), so we test for that here! It is in fact all we need... |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1499 |
|
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1500 |
# These awks are known to work. Test for them explicit |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1501 |
awks="gawk mawk nawk" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1502 |
|
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1503 |
awk_prefix="echo \"a.c b.c c.c\" | tr ' ' \\\\n | " |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1504 |
awk_param="' { ORS = \" \" } /\.c$/ { gsub(\".c$\", \".o\", \$0); print \$0; }' 2>/dev/null" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1505 |
awk_result="a.o b.o c.o " |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1506 |
log 2 "Detecing awk..." |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1507 |
|
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1508 |
log 2 "Trying: $awk_prefix $awk $awk_param" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1509 |
res=`eval $awk_prefix $awk $awk_param` |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1510 |
log 2 "Result: '$res'" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1511 |
if [ "$res" != "$awk_result" ] && [ "$awk" = "awk" ]; then |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1512 |
# User didn't supply his own awk, so try to detect some other known working names for an awk |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1513 |
for awk in $awks; do |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1514 |
log 2 "Trying: $awk_prefix $awk $awk_param" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1515 |
res=`eval $awk_prefix $awk $awk_param` |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1516 |
log 2 "Result: '$res'" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1517 |
if [ "$res" = "$awk_result" ]; then break; fi |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1518 |
done |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1519 |
|
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1520 |
if [ "$res" != "$awk_result" ]; then |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1521 |
log 1 "checking awk... not found" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1522 |
log 1 "configure: error: no awk found" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1523 |
log 1 "configure: error: please install one of the following: $awks" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1524 |
exit 1 |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1525 |
fi |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1526 |
fi |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1527 |
if [ "$res" != "$awk_result" ]; then |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1528 |
log 1 "checking awk... not found" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1529 |
log 1 "configure: error: you supplied '$awk' but it doesn't seem a valid gawk or mawk" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1530 |
exit 1 |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1531 |
fi |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1532 |
|
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1533 |
log 1 "checking awk... $awk" |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1534 |
} |
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1535 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1536 |
detect_os() { |
6403
6165d686c6c2
(svn r8810) [Configure] -Fix: "" variables if you test them, else if they are empty they return lovely errors (tnx to Celester for finding thisone ;))
truelight
parents:
6372
diff
changeset
|
1537 |
if [ "$os" = "DETECT" ]; then |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1538 |
# Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1539 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1540 |
# Try first via dumpmachine, then via uname |
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1541 |
os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk ' |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1542 |
/linux/ { print "UNIX"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1543 |
/darwin/ { print "OSX"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1544 |
/freebsd/ { print "FREEBSD"; exit} |
9624 | 1545 |
/openbsd/ { print "OPENBSD"; exit} |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1546 |
/netbsd/ { print "NETBSD"; exit} |
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1547 |
/hp-ux/ { print "HPUX"; exit} |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1548 |
/morphos/ { print "MORPHOS"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1549 |
/beos/ { print "BEOS"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1550 |
/sunos/ { print "SUNOS"; exit} |
6546
d420506b08d8
(svn r9017) [Config] -Fix: if 'solaris' is in gcc dumpmachine, we have SunOS
truelight
parents:
6517
diff
changeset
|
1551 |
/solaris/ { print "SUNOS"; exit} |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1552 |
/cygwin/ { print "CYGWIN"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1553 |
/mingw/ { print "MINGW"; exit} |
5790
fee3af90258e
(svn r7881) [Configure] -Fix: OS2 GCC indentifies itself with os2, not os/2
truelight
parents:
5789
diff
changeset
|
1554 |
/os2/ { print "OS2"; exit} |
6004
03795fd01cb8
(svn r8304) [WinCE] -Add: added configure detection for WinCE.
truelight
parents:
5838
diff
changeset
|
1555 |
/wince/ { print "WINCE"; exit} |
6208
ff9b5772fb65
(svn r8628) [PSP] -Add: added configure support for the PlayStation Portable target
truelight
parents:
6192
diff
changeset
|
1556 |
/psp/ { print "PSP"; exit} |
5726
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 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1559 |
if [ -z "$os" ]; then |
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
1560 |
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
|
1561 |
/linux/ { print "UNIX"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1562 |
/darwin/ { print "OSX"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1563 |
/freebsd/ { print "FREEBSD"; exit} |
9624 | 1564 |
/openbsd/ { print "OPENBSD"; exit} |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1565 |
/netbsd/ { print "NETBSD"; exit} |
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1566 |
/hp-ux/ { print "HPUX"; exit} |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1567 |
/morphos/ { print "MORPHOS"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1568 |
/beos/ { print "BEOS"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1569 |
/sunos/ { print "SUNOS"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1570 |
/cygwin/ { print "CYGWIN"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1571 |
/mingw/ { print "MINGW"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1572 |
/os\/2/ { print "OS2"; exit} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1573 |
'` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1574 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1575 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1576 |
if [ -z "$os" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1577 |
log 1 "detecting OS... none detected" |
9624 | 1578 |
log 1 "I couldn't detect your OS. Please use --os=OS to force one" |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
1579 |
log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1580 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1581 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1582 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1583 |
log 1 "detecting OS... $os" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1584 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1585 |
log 1 "forcing OS... $os" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1586 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1587 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1588 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1589 |
detect_sdl() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1590 |
# 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
|
1591 |
if [ "$with_sdl" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1592 |
log 1 "checking SDL... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1593 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1594 |
sdl_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1595 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1596 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1597 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1598 |
if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1599 |
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
|
1600 |
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
|
1601 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1602 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1603 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1604 |
if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1605 |
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
|
1606 |
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
|
1607 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1608 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1609 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1610 |
if [ "$enable_dedicated" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1611 |
log 1 "checking SDL... skipping" |
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 |
sdl_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1614 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1615 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1616 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1617 |
# 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
|
1618 |
if [ "$with_sdl" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1619 |
log 1 "checking SDL... OSX, skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1620 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1621 |
sdl_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1622 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1623 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1624 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1625 |
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
|
1626 |
sdl_config="sdl-config" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1627 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1628 |
sdl_config="$with_sdl" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1629 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1630 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1631 |
version=`$sdl_config --version 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1632 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1633 |
log 2 "executing $sdl_config --version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1634 |
log 2 " returned $version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1635 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1636 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1637 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1638 |
log 1 "checking SDL... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1639 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1640 |
# 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
|
1641 |
if [ "$with_sdl" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1642 |
log 1 "configure: error: sdl-config couldn't be found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1643 |
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
|
1644 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1645 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1646 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1647 |
sdl_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1648 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1649 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1650 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1651 |
log 1 "checking SDL... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1652 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1653 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1654 |
detect_cocoa() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1655 |
# 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
|
1656 |
if [ "$with_cocoa" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1657 |
log 1 "checking COCOA... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1658 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1659 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1660 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1661 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1662 |
if [ "$with_cocoa" = "2" ] && [ "$enable_dedicated" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1663 |
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
|
1664 |
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
|
1665 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1666 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1667 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1668 |
if [ "$enable_dedicated" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1669 |
log 1 "checking COCOA... skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1670 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1671 |
with_cocoa="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1672 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1673 |
fi |
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 |
# 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
|
1676 |
if [ "$with_cocoa" = "1" ] && [ "$os" != "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1677 |
log 1 "checking COCOA... not OSX, skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1678 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1679 |
with_cocoa="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1680 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1681 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1682 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1683 |
if [ "$os" != "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1684 |
log 1 "checking COCOA... not OSX" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1685 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1686 |
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
|
1687 |
exit 1 |
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 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1690 |
log 1 "checking COCOA... found" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1691 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1692 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1693 |
if [ "$enable_cocoa_quartz" != "0" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1694 |
log 1 "checking whether to enable the Quartz window subdriver... yes" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1695 |
else |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1696 |
log 1 "checking whether to enable the Quartz window subdriver... no" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1697 |
fi |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1698 |
|
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1699 |
if [ "$enable_cocoa_quickdraw" != "0" ]; then |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1700 |
log 1 "checking whether to enable the Quickdraw window subdriver... yes" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1701 |
else |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1702 |
log 1 "checking whether to enable the Quickdraw window subdriver... no" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
1703 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1704 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1705 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1706 |
detect_library() { |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1707 |
# $1 - config-param ($with_zlib value) |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1708 |
# $2 - library name ('zlib', sets $zlib) |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1709 |
# $3 - static library name (libz.a) |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1710 |
# $4 - header name (zlib.h) |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
1711 |
# $5 - force static (if non-empty) |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
1712 |
|
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
1713 |
if [ -n "$5" ]; then force_static="1"; fi |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1714 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1715 |
# 0 means no, 1 is auto-detect, 2 is force |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1716 |
if [ "$1" = "0" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1717 |
log 1 "checking $2... disabled" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1718 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1719 |
eval "$2=\"\"" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1720 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1721 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1722 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1723 |
log 2 "detecting $2" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1724 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1725 |
if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then |
9629 | 1726 |
eval "$2=`ls -1 /usr/include/*.h 2>/dev/null | egrep \"\/$4\$\"`" |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1727 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1728 |
if [ -z "$res" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1729 |
log 2 " trying /usr/include/$4... no" |
9629 | 1730 |
eval "$2=`ls -1 /usr/local/include/*.h 2>/dev/null | egrep \"\/$4\$\"`" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1731 |
fi |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1732 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1733 |
if [ -z "$res" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1734 |
log 2 " trying /usr/local/include/$4... no" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1735 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1736 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1737 |
eval "res=\$$2" |
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
1738 |
if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1739 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1740 |
log 2 " trying $res... found" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1741 |
# Now find the static lib, if needed |
9629 | 1742 |
eval "$2=`ls /lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1743 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1744 |
if [ -z "$res" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1745 |
log 2 " trying /lib/$3... no" |
9629 | 1746 |
eval "$2=`ls /usr/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1747 |
fi |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1748 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1749 |
if [ -z "$res" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1750 |
log 2 " trying /usr/lib/$3... no" |
9629 | 1751 |
eval "$2=`ls /usr/local/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1752 |
fi |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1753 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1754 |
if [ -z "$res" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1755 |
log 2 " trying /usr/local/lib/$3... no" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1756 |
log 1 "configure: error: $2 couldn't be found" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1757 |
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
|
1758 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1759 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1760 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1761 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1762 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1763 |
# Make sure it exists |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1764 |
if [ -f "$1" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1765 |
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
|
1766 |
else |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1767 |
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
|
1768 |
fi |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1769 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1770 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1771 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1772 |
if [ -z "$res" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1773 |
log 1 "checking $2... not found" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1774 |
if [ "$1" = "2" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1775 |
log 1 "configure: error: $2 couldn't be found" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1776 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1777 |
exit 1 |
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1778 |
elif [ "$1" != "1" ]; then |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1779 |
log 1 "configure: error: $2 couldn't be found" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1780 |
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
|
1781 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1782 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1783 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1784 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1785 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1786 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1787 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1788 |
eval "res=\$$2" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1789 |
log 2 " trying $res... found" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1790 |
|
6360
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1791 |
log 1 "checking $2... found" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1792 |
} |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1793 |
|
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1794 |
detect_zlib() { |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1795 |
detect_library "$with_zlib" "zlib" "libz.a" "zlib.h" |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1796 |
} |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1797 |
|
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1798 |
detect_libtimidity() { |
37f43b7ce27b
(svn r8757) -Add: added libtimidity music driver (it is a nice small library simular to timidity via extmidi)
truelight
parents:
6232
diff
changeset
|
1799 |
detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "timidity.h" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1800 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1801 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1802 |
detect_png() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1803 |
# 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
|
1804 |
if [ "$with_png" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1805 |
log 1 "checking libpng... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1806 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1807 |
png_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1808 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1809 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1810 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1811 |
if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1812 |
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
|
1813 |
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
|
1814 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1815 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1816 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1817 |
if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1818 |
png_config="libpng-config" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1819 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1820 |
png_config="$with_png" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1821 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1822 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1823 |
version=`$png_config --version 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1824 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1825 |
log 2 "executing $png_config --version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1826 |
log 2 " returned $version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1827 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1828 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1829 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1830 |
log 1 "checking libpng... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1831 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1832 |
# 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
|
1833 |
if [ "$with_png" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1834 |
log 1 "configure: error: libpng-config couldn't be found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1835 |
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
|
1836 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1837 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1838 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1839 |
png_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1840 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1841 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1842 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1843 |
log 1 "checking libpng... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1844 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1845 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1846 |
detect_freetype() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1847 |
# 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
|
1848 |
if [ "$with_freetype" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1849 |
log 1 "checking libfreetype... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1850 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1851 |
freetype_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1852 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1853 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1854 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1855 |
if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1856 |
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
|
1857 |
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
|
1858 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1859 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1860 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1861 |
if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1862 |
freetype_config="freetype-config" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1863 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1864 |
freetype_config="$with_freetype" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1865 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1866 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1867 |
version=`$freetype_config --version 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1868 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1869 |
log 2 "executing freetype_config --version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1870 |
log 2 " returned $version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1871 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1872 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1873 |
if [ -z "$version" ] || [ "$ret" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1874 |
log 1 "checking libfreetype... not found" |
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 |
# 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
|
1877 |
if [ "$with_freetype" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1878 |
log 1 "configure: error: freetype-config couldn't be found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1879 |
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
|
1880 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1881 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1882 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1883 |
freetype_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1884 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1885 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1886 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1887 |
log 1 "checking libfreetype... found" |
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 |
detect_fontconfig() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1891 |
# 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
|
1892 |
if [ "$with_fontconfig" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1893 |
log 1 "checking libfontconfig... disabled" |
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 |
fontconfig_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1896 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1897 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1898 |
|
6575
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1899 |
if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1900 |
log 1 "checking libfontconfig... WIN32, skipping" |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1901 |
fontconfig_config="" |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1902 |
return 0 |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1903 |
fi |
ce92be4d7a8d
(svn r9053) -Change [Config]: removed unneeded stuff for windows
glx
parents:
6572
diff
changeset
|
1904 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1905 |
if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1906 |
fontconfig_config="pkg-config fontconfig" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1907 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1908 |
fontconfig_config="$with_fontconfig" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1909 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1910 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1911 |
version=`$fontconfig_config --modversion 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1912 |
ret=$? |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1913 |
shortversion=`echo $version | cut -c 1,3` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1914 |
log 2 "executing $fontconfig_config --modversion" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1915 |
log 2 " returned $version" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1916 |
log 2 " exit code $ret" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1917 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1918 |
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
|
1919 |
if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1920 |
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
|
1921 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1922 |
log 1 "checking libfontconfig... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1923 |
fi |
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 |
# 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
|
1926 |
if [ "$with_fontconfig" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1927 |
log 1 "configure: error: fontconfig-config couldn't be found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1928 |
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
|
1929 |
exit 1 |
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 |
fontconfig_config="" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1933 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1934 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1935 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1936 |
log 1 "checking libfontconfig... found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1937 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1938 |
|
6209
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1939 |
detect_pspconfig() { |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1940 |
# 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
|
1941 |
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
|
1942 |
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
|
1943 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1944 |
psp_config="" |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1945 |
return 0 |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1946 |
fi |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1947 |
|
6212
39deaa03d180
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
6211
diff
changeset
|
1948 |
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
|
1949 |
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
|
1950 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1951 |
psp_config=""; |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1952 |
return 0 |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1953 |
fi |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1954 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1955 |
if [ "$os" != "PSP" ]; then |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1956 |
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
|
1957 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1958 |
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
|
1959 |
exit 1 |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1960 |
fi |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1961 |
|
6212
39deaa03d180
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
6211
diff
changeset
|
1962 |
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
|
1963 |
psp_config="psp-config" |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1964 |
else |
6212
39deaa03d180
(svn r8633) [PSP] -Fix r8629: mixed psp-config and pspconfig, making ./configure --reconfig to fail
truelight
parents:
6211
diff
changeset
|
1965 |
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
|
1966 |
fi |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1967 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1968 |
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
|
1969 |
ret=$? |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1970 |
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
|
1971 |
log 2 " returned $version" |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1972 |
log 2 " exit code $ret" |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1973 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1974 |
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
|
1975 |
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
|
1976 |
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
|
1977 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1978 |
# 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
|
1979 |
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
|
1980 |
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
|
1981 |
fi |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1982 |
exit 1 |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1983 |
fi |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1984 |
|
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1985 |
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
|
1986 |
} |
2505d5d90992
(svn r8629) [PSP] -Add: added psp-config detection in configure for PSP target
truelight
parents:
6208
diff
changeset
|
1987 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1988 |
detect_iconv() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1989 |
# 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
|
1990 |
if [ "$with_iconv" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1991 |
log 1 "checking iconv... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1992 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1993 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1994 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1995 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
1996 |
if [ "$with_iconv" = "1" ] && [ "$os" != "OSX" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1997 |
log 1 "checking iconv... not OSX, skipping" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1998 |
with_iconv="0" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
1999 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2000 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2001 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2002 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2003 |
# 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
|
2004 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2005 |
if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2006 |
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
|
2007 |
if [ -z "$iconv" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2008 |
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
|
2009 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2010 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2011 |
# Make sure it exists |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2012 |
iconv=`ls $with_iconv/include/iconv.h 2>/dev/null` |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2013 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2014 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2015 |
if [ -z "$iconv" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2016 |
log 1 "checking iconv... not found" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2017 |
if [ "$with_iconv" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2018 |
log 1 "configure: error: iconv couldn't be found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2019 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2020 |
exit 1 |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2021 |
elif [ "$with_iconv" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2022 |
log 1 "configure: error: iconv couldn't be found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2023 |
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
|
2024 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2025 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2026 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2027 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2028 |
return 0 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2029 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2030 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2031 |
if [ "$with_iconv" = "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2032 |
with_iconv="2" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2033 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2034 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2035 |
log 2 "found iconv in $iconv" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2036 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2037 |
log 1 "checking iconv... found" |
9722
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2038 |
|
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2039 |
# Check if we need to work around buggy iconv implementation where inbuf |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2040 |
# is wrongly typed as non-const. Correct implementation is at |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2041 |
# http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2042 |
|
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2043 |
cat > tmp.iconv.cpp << EOF |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2044 |
#include "src/stdafx.h" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2045 |
#include <iconv.h> |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2046 |
int main() { |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2047 |
static char buf[1024]; |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2048 |
iconv_t convd = 0; |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2049 |
const char *inbuf = ""; |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2050 |
char *outbuf = buf; |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2051 |
size_t outlen = 1023; |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2052 |
size_t inlen = 0; |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2053 |
return iconv(convd, &inbuf, &inlen, &outbuf, &outlen); |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2054 |
} |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2055 |
EOF |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2056 |
execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2057 |
eval $execute >&/dev/null |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2058 |
ret=$? |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2059 |
log 2 "executing $execute" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2060 |
log 2 " exit code $ret" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2061 |
if [ "$ret" = "0" ]; then have_broken_iconv="no"; else have_broken_iconv="yes"; fi |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2062 |
log 1 "checking if iconv has non-const inbuf... $have_broken_iconv" |
ebf0ece7d8f6
(svn r11503) [NoAI] -Sync: with trunk r11308:11502.
rubidium
parents:
9718
diff
changeset
|
2063 |
rm -f tmp.iconv tmp.iconv.cpp |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2064 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2065 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2066 |
_detect_sort() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2067 |
sort_test_in="d |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2068 |
a |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2069 |
c |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2070 |
b" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2071 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2072 |
sort_test_out="a |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2073 |
b |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2074 |
c |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2075 |
d" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2076 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2077 |
log 2 "running echo <array> | $1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2078 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2079 |
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
|
2080 |
sort="$1" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2081 |
log 2 " result was valid" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2082 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2083 |
log 2 " result was invalid" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2084 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2085 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2086 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2087 |
detect_sort() { |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2088 |
if [ "$with_sort" = "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2089 |
log 1 "checking sort... disabled" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2090 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2091 |
return |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2092 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2093 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2094 |
if [ "$with_sort" = "1" ] || [ "$with_sort" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2095 |
_detect_sort "sort" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2096 |
if [ -z "$sort" ]; then _detect_sort "/sbin/sort"; fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2097 |
if [ -z "$sort" ]; then _detect_sort "/usr/sbin/sort"; fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2098 |
if [ -z "$sort" ]; then _detect_sort "/usr/local/sbin/sort"; fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2099 |
if [ -z "$sort" ]; then _detect_sort "/bin/sort"; fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2100 |
if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2101 |
if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2102 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2103 |
_detect_sort "$with_sort" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2104 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2105 |
|
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2106 |
if [ -z "$sort" ]; then |
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2107 |
if [ "$with_sort" = "2" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2108 |
log 1 "checking sort... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2109 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2110 |
log 1 "configure: error: couldn't detect sort on your system" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2111 |
exit 1 |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2112 |
elif [ "$with_sort" != "1" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2113 |
log 1 "checking sort... $with_sort not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2114 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2115 |
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
|
2116 |
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
|
2117 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2118 |
exit 1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2119 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2120 |
log 1 "checking sort... not found" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2121 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2122 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2123 |
log 1 "checking sort... $sort" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2124 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2125 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2126 |
|
9363
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2127 |
detect_cputype() { |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2128 |
if [ -n "$cpu_type" ] && [ "$cpu_type" != "DETECT" ]; then |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2129 |
log 1 "forcing cpu-type... $cpu_type bits" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2130 |
return; |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2131 |
fi |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2132 |
echo "#include \"src/stdafx.h\"" > tmp.64bit.cpp |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2133 |
echo "assert_compile(sizeof(size_t) == 8);" >> tmp.64bit.cpp |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2134 |
echo "int main() { return 0; }" >> tmp.64bit.cpp |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2135 |
execute="$cxx_host $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2136 |
cpu_type="`eval $execute 2>/dev/null`" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2137 |
ret=$? |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2138 |
log 2 "executing $execute" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2139 |
log 2 " returned $cpu_type" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2140 |
log 2 " exit code $ret" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2141 |
if [ "$ret" = "0" ]; then cpu_type="64"; else cpu_type="32"; fi |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2142 |
log 1 "detecting cpu-type... $cpu_type bits" |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2143 |
rm -f tmp.64bit tmp.64bit.cpp |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2144 |
} |
56b5886b5cfc
(svn r9148) [NoAI] -Add: added 32/64bit detection support in config.lib
truelight
parents:
6626
diff
changeset
|
2145 |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2146 |
make_sed() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2147 |
# 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
|
2148 |
# We do this here, and not sooner, so universal builds also have this |
5792 | 2149 |
# automatically correct |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2150 |
# 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
|
2151 |
# 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
|
2152 |
# bytes too, but only for PPC. |
9629 | 2153 |
ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"` |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2154 |
if [ -n "$ppc" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2155 |
T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
2156 |
osx_sysroot_version=10.4u |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2157 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2158 |
T_CFLAGS="$CFLAGS" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2159 |
osx_sysroot_version=10.4u |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2160 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2161 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2162 |
T_LDFLAGS="$LDFLAGS" |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2163 |
if [ "$with_osx_sysroot" = "3" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2164 |
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
|
2165 |
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
|
2166 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2167 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2168 |
SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2169 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2170 |
# All the data needed to compile a single target |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2171 |
# Make sure if you compile multiple targets to |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2172 |
# use multiple OBJS_DIR, because all in-between |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2173 |
# binaries are stored in there, and nowhere else. |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2174 |
SRC_REPLACE=" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2175 |
s#!!CC_HOST!!#$cc_host#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2176 |
s#!!CXX_HOST!!#$cxx_host#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2177 |
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
|
2178 |
s#!!CXX_BUILD!!#$cxx_build#g; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2179 |
s#!!WINDRES!!#$windres#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2180 |
s#!!STRIP!!#$strip $strip_arg#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2181 |
s#!!LIPO!!#$lipo#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2182 |
s#!!CC_CFLAGS!!#$CC_CFLAGS#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2183 |
s#!!CFLAGS!!#$T_CFLAGS#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2184 |
s#!!CFLAGS_BUILD!!#$CFLAGS_BUILD#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2185 |
s#!!STRGEN_FLAGS!!#$strgen_flags#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2186 |
s#!!LIBS!!#$LIBS#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2187 |
s#!!LDFLAGS!!#$T_LDFLAGS#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2188 |
s#!!BIN_DIR!!#$BIN_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2189 |
s#!!ROOT_DIR!!#$ROOT_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2190 |
s#!!MEDIA_DIR!!#$MEDIA_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2191 |
s#!!SOURCE_LIST!!#$SOURCE_LIST#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2192 |
s#!!SRC_OBJS_DIR!!#$SRC_OBJS_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2193 |
s#!!LANG_OBJS_DIR!!#$LANG_OBJS_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2194 |
s#!!SRC_DIR!!#$SRC_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2195 |
s#!!OSXAPP!!#$OSXAPP#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2196 |
s#!!LANG_DIR!!#$LANG_DIR#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2197 |
s#!!TTD!!#$TTD#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2198 |
s#!!BINARY_DIR!!#$prefix_dir/$binary_dir#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2199 |
s#!!DATA_DIR!!#$prefix_dir/$data_dir#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2200 |
s#!!ICON_DIR!!#$prefix_dir/$icon_dir#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2201 |
s#!!PERSONAL_DIR!!#$personal_dir#g; |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
2202 |
s#!!SHARED_DIR!!#$shared_dir#g; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2203 |
s#!!INSTALL_DIR!!#$install_dir#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2204 |
s#!!STRGEN!!#$STRGEN#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2205 |
s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2206 |
s#!!ENDIAN_FORCE!!#$endian#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2207 |
s#!!STAGE!!#$STAGE#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2208 |
s#!!MAKEDEPEND!!#$makedepend#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2209 |
s#!!CFLAGS_MAKEDEP!!#$cflags_makedep#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2210 |
s#!!SORT!!#$sort#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2211 |
s#!!CONFIG_CACHE_COMPILER!!#config.cache.compiler#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2212 |
s#!!CONFIG_CACHE_LINKER!!#config.cache.linker#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2213 |
s#!!CONFIG_CACHE_ENDIAN!!#config.cache.endian#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2214 |
s#!!CONFIG_CACHE_SOURCE!!#config.cache.source#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2215 |
s#!!CONFIG_CACHE_VERSION!!#config.cache.version#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2216 |
s#!!CONFIG_CACHE_SOURCE_LIST!!#config.cache.source.list#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2217 |
s#!!LANG_SUPPRESS!!#$lang_suppress#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2218 |
s#!!OBJS_C!!#$OBJS_C#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2219 |
s#!!OBJS_CPP!!#$OBJS_CPP#g; |
6192
c6adfc929c6b
(svn r8605) -Codechange: [OSX] changed all objective C to objective C++
bjarni
parents:
6174
diff
changeset
|
2220 |
s#!!OBJS_MM!!#$OBJS_MM#g; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2221 |
s#!!OBJS_RC!!#$OBJS_RC#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2222 |
s#!!SRCS!!#$SRCS#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2223 |
s#!!OS!!#$os#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2224 |
s#!!CONFIGURE_FILES!!#$CONFIGURE_FILES#g; |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2225 |
s#!!REVISION!!#$revision#g; |
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
2226 |
s#!!AWK!!#$awk#g; |
9601
b499fdd106d5
(svn r9713) [NoAI] -Sync with trunk (r9631:9712).
rubidium
parents:
9569
diff
changeset
|
2227 |
s#!!GCC295!!#$gcc295#g; |
9626 | 2228 |
s#!!DISTCC!!#$distcc#g; |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2229 |
" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2230 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2231 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2232 |
generate_main() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2233 |
STAGE="[MAIN]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2234 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2235 |
make_sed |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2236 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2237 |
# Create the main Makefile |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2238 |
echo "Generating Makefile..." |
5806 | 2239 |
< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2240 |
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
|
2241 |
echo >> Makefile.am |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2242 |
# 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
|
2243 |
cp $SOURCE_LIST config.cache.source.list |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2244 |
# Make sure config.cache is OLDER then config.cache.source.list |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2245 |
touch config.cache |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2246 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2247 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2248 |
generate_lang() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2249 |
STAGE="[LANG]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2250 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2251 |
make_sed |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2252 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2253 |
# Create the language file |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2254 |
mkdir -p $LANG_OBJS_DIR |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2255 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2256 |
echo "Generating lang/Makefile..." |
5806 | 2257 |
< $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
|
2258 |
echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2259 |
echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2260 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2261 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2262 |
generate_src_normal() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2263 |
STAGE=$1 |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2264 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2265 |
make_sed |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2266 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2267 |
# Create the source file |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2268 |
mkdir -p $SRC_OBJS_DIR |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2269 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2270 |
echo "Generating $2/Makefile..." |
5806 | 2271 |
< $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
|
2272 |
echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2273 |
echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2274 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2275 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2276 |
generate_src_osx() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2277 |
cc_host_orig="$cc_host" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2278 |
cxx_host_orig="$cxx_host" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2279 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2280 |
BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2281 |
cc_host="$cc_host_orig -arch ppc" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2282 |
cxx_host="$cxx_host_orig -arch ppc" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2283 |
generate_src_normal "[PowerPC]" "objs/ppc" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2284 |
|
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
|
2285 |
BASE_SRC_OBJS_DIR="$OBJS_DIR/intel" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2286 |
cc_host="$cc_host_orig -arch i386" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2287 |
cxx_host="$cxx_host_orig -arch i386" |
5745 | 2288 |
generate_src_normal "[Intel]" "objs/intel" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2289 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2290 |
BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2291 |
cc_host="$cc_host_orig -arch ppc970" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2292 |
cxx_host="$cxx_host_orig -arch ppc970" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2293 |
CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2294 |
generate_src_normal "[PowerPC G5]" "objs/ppc970" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2295 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2296 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2297 |
generate_src() { |
5809
cd61f8b74f7d
(svn r7942) Trim another 192 lines from the configure monster
tron
parents:
5808
diff
changeset
|
2298 |
if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2299 |
generate_src_osx |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2300 |
else |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2301 |
generate_src_normal "[SRC]" "objs" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2302 |
fi |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2303 |
} |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2304 |
|
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2305 |
showhelp() { |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2306 |
echo "'configure' configures OpenTTD." |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2307 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2308 |
echo "Usage: $0 [OPTION]... [VAR=VALUE]..." |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2309 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2310 |
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
|
2311 |
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
|
2312 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2313 |
echo "Defaults for the options are specified in brackets." |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2314 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2315 |
echo "Configuration:" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2316 |
echo " -h, --help display this help and exit" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2317 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2318 |
echo "System types:" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2319 |
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
|
2320 |
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
|
2321 |
echo " on HOST [BUILD]" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2322 |
echo " --windres=WINDRES the windres to use [HOST-windres]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2323 |
echo " --strip=STRIP the strip to use [HOST-strip]" |
6407
483c1328a349
(svn r8814) [Config] -Add: added --awk and detect_awk. We now try to find an awk on the user system which allows gsub(). If not found, you can define one yourself, or it tells you versions you might want to install
truelight
parents:
6406
diff
changeset
|
2324 |
echo " --awk=AWK the awk to use in configure [awk]" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2325 |
echo " --lipo=LIPO the lipo to use (OSX ONLY) [HOST-lipo]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2326 |
echo " --os=OS the OS we are compiling for [DETECT]" |
10455
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
2327 |
echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/" |
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
2328 |
echo " MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/" |
22c441f5adf9
(svn r12997) [NoAI] -Sync: with trunk r12895:12996.
rubidium
parents:
10355
diff
changeset
|
2329 |
echo " WINCE/PSP" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2330 |
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
|
2331 |
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
|
2332 |
echo " Use with care!" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2333 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2334 |
echo "Paths:" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2335 |
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
|
2336 |
echo " files [/usr/local]" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2337 |
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
|
2338 |
echo " with the prefix-dir [games]" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2339 |
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
|
2340 |
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
|
2341 |
echo " [share/games/openttd]" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2342 |
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
|
2343 |
echo " with the prefix-dir [share/pixmaps]" |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
2344 |
echo " --personal-dir=dir location of the personal directory" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
2345 |
echo " [os-dependent default]" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
2346 |
echo " --shared-dir=dir location of shared data files" |
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
2347 |
echo " [os-dependent default]" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2348 |
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
|
2349 |
echo " Useful to install into jails [/]" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2350 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2351 |
echo "Features and packages:" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2352 |
echo " --enable-debug[=LVL] enable debug-mode (LVL=[0123], 0 is release)" |
9724
b39bc69bb2f2
(svn r12051) [NoAI] -Sync: with trunk (r11795:12050).
rubidium
parents:
9723
diff
changeset
|
2353 |
echo " --enable_desync_debug=[LVL] enable desync debug options (LVL=[012], 0 is none" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2354 |
echo " --enable-profiling enables profiling" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2355 |
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
|
2356 |
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
|
2357 |
echo " all HOSTs)" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2358 |
echo " --enable-translator enable extra output for translators" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2359 |
echo " --enable-universal enable universal builds (OSX ONLY)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2360 |
echo " --enable-osx-g5 enables optimalizations for G5 (OSX ONLY)" |
9723
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
2361 |
echo " --disable-cocoa-quartz disable the quartz window mode driver for Cocoa (OSX ONLY)" |
eee46cb39750
(svn r11796) [NoAI] -Sync: with trunk r11502:11795.
rubidium
parents:
9722
diff
changeset
|
2362 |
echo " --disable-cocoa-quickdraw disable the quickdraw window mode driver for Cocoa (OSX ONLY)" |
9704 | 2363 |
echo " --disable-unicode disable unicode support to build win9x" |
2364 |
echo " version (Win32 ONLY)" |
|
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2365 |
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
|
2366 |
echo " --disable-assert disable asserts (continue on errors)" |
9837
c9ec4f82e0d0
(svn r12503) [NoAI] -Sync: with trunk r12461:12501.
rubidium
parents:
9826
diff
changeset
|
2367 |
echo " --enable-strip enable any possible stripping" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2368 |
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
|
2369 |
echo " (OSX ONLY)" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2370 |
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
|
2371 |
echo " (OSX ONLY)" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2372 |
echo " --with-direct-music enable direct music support (Win32 ONLY)" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2373 |
echo " --with-sort=sort define a non-default location for sort" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2374 |
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
|
2375 |
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
|
2376 |
echo " midi-player" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2377 |
echo " --with-cocoa enables COCOA video driver (OSX ONLY)" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2378 |
echo " --with-sdl[=sdl-config] enables SDL video driver support" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2379 |
echo " --with-zlib[=zlib.a] enables zlib support" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2380 |
echo " --with-png[=libpng-config] enables libpng support" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2381 |
echo " --with-freetype[=freetype-config]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2382 |
echo " enables libfreetype support" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2383 |
echo " --with-fontconfig[=pkg-config fontconfig]" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2384 |
echo " enables fontconfig support" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2385 |
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
|
2386 |
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
|
2387 |
echo " --with-makedepend[=makedepend] enables makedepend support" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2388 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2389 |
echo "Some influential environment variables:" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2390 |
echo " CC C compiler command" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2391 |
echo " CXX C++ compiler command" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2392 |
echo " CFLAGS C compiler flags" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2393 |
echo " WINDRES windres command" |
5742
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2394 |
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
|
2395 |
echo " have libraries in a nonstandard" |
d9948762e08b
(svn r7775) -Fix (r7759): make ./configure --help lines at most 80 characters
rubidium
parents:
5736
diff
changeset
|
2396 |
echo " directory <lib dir>" |
5726
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2397 |
echo "" |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2398 |
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
|
2399 |
echo "it to find libraries and programs with nonstandard names/locations." |
8f399788f6c9
(svn r7759) -Merge: makefile rewrite. This merge features:
rubidium
parents:
diff
changeset
|
2400 |
} |