Compare commits
2937 Commits
v2.8.11
...
before_odb
Author | SHA1 | Date | |
---|---|---|---|
|
b1f381bf9b | ||
|
a76c2f3715 | ||
|
a9a854d73e | ||
|
4488a1d332 | ||
|
5a2b31a0d7 | ||
|
0eee633069 | ||
|
e6d18909c9 | ||
|
d81ad1f044 | ||
|
4bae66a8de | ||
|
9e06a15fc2 | ||
|
9bf6a1b80c | ||
|
70a9e561df | ||
|
143973fc13 | ||
|
bc0e68ebaf | ||
|
bf10569350 | ||
|
bc2ac5da6a | ||
|
f69c03def9 | ||
|
71c6b45513 | ||
|
45b81639ef | ||
|
196a75d48d | ||
|
05a09b0b9f | ||
|
4e0ed07931 | ||
|
6ca2e4af31 | ||
|
eb2badcbb6 | ||
|
bfa30135ba | ||
|
0882eb4ee2 | ||
|
51e7be5664 | ||
|
d4159b2d18 | ||
|
62d249cb22 | ||
|
065ae02d48 | ||
|
84e5ae3d3c | ||
|
85d2919f49 | ||
|
df2c23e79b | ||
|
b5ec7dd6ee | ||
|
50c549b98d | ||
|
30386aeb86 | ||
|
48510f6156 | ||
|
129d09bee9 | ||
|
576adedbc0 | ||
|
fe1efe6ab7 | ||
|
bdee3769af | ||
|
ee17111a41 | ||
|
45c156e0ff | ||
|
52e750fc75 | ||
|
59a722ea3a | ||
|
99d4fdfdcc | ||
|
c0030ca789 | ||
|
0b2e06f9f6 | ||
|
05b743ba80 | ||
|
624f89c2d7 | ||
|
c4b64a941e | ||
|
576b18f214 | ||
|
14ee8dcc83 | ||
|
060668a1f6 | ||
|
816964cfd8 | ||
|
4cda739ce4 | ||
|
1cfc497117 | ||
|
abdf096a05 | ||
|
67612ff18e | ||
|
df1bc4fa5c | ||
|
83b852b070 | ||
|
c8058a09e5 | ||
|
b0d7707bc4 | ||
|
24b209464f | ||
|
f8aeb3e356 | ||
|
2263f62d9b | ||
|
30cfcda5b5 | ||
|
736fe67c66 | ||
|
383144c756 | ||
|
e44ac7bcd8 | ||
|
a36885a079 | ||
|
4412408856 | ||
|
b89cac3f09 | ||
|
438fb233a0 | ||
|
43ea4e37eb | ||
|
5a9d14c1b5 | ||
|
b24442f845 | ||
|
500659a897 | ||
|
51146826fc | ||
|
ada162b932 | ||
|
dd6c8be6e9 | ||
|
ce0cf2b871 | ||
|
e00b31799c | ||
|
e256b53a3d | ||
|
76c39b5df1 | ||
|
d3b8fe1071 | ||
|
fb06f27139 | ||
|
2df2a65b2d | ||
|
001f0f8273 | ||
|
49fc3b9c03 | ||
|
e2da67f6d7 | ||
|
69357fa0cb | ||
|
c7c5a6197d | ||
|
67be459bba | ||
|
9743a4495c | ||
|
8abbc646c8 | ||
|
4d373bc038 | ||
|
729a8b9b44 | ||
|
e807896d46 | ||
|
c266eff98c | ||
|
525ee32a67 | ||
|
e3c35a0d32 | ||
|
0a13ee1b56 | ||
|
d37b709c4b | ||
|
2c3f6edd63 | ||
|
cf90f9cca5 | ||
|
11b3105abf | ||
|
cc28f5ecd0 | ||
|
2a4f365c04 | ||
|
7da1b21e25 | ||
|
ab5146089b | ||
|
716a15b700 | ||
|
e94d0c1e66 | ||
|
a3261ffb75 | ||
|
1a6d6b1071 | ||
|
883ea3bf80 | ||
|
c33edc08d6 | ||
|
7909f748e6 | ||
|
7e59e3d050 | ||
|
9a0a58f5af | ||
|
7e6b478087 | ||
|
3586d10f72 | ||
|
05725592b9 | ||
|
151b7b73cb | ||
|
99d21c0e1f | ||
|
9d31c23993 | ||
|
0206be6379 | ||
|
82ba48855e | ||
|
f48408ae35 | ||
|
a826202ecf | ||
|
d39780517d | ||
|
1e40f6676a | ||
|
fe8b03618a | ||
|
444833b323 | ||
|
c1a4ce66a6 | ||
|
d935b42145 | ||
|
646bac8a6e | ||
|
d350fbec22 | ||
|
b1ab476240 | ||
|
2978a784f5 | ||
|
ebdbecff4a | ||
|
0376cc529b | ||
|
c89e16e423 | ||
|
6a6ea041d9 | ||
|
1583600031 | ||
|
47b4bc1768 | ||
|
b9cd2cb909 | ||
|
44cc96a80c | ||
|
e97e6073b3 | ||
|
0962839d23 | ||
|
5273b98ebe | ||
|
88664cda08 | ||
|
99d8bc6593 | ||
|
ee8c79c13f | ||
|
6b61b594cf | ||
|
7a906e1a21 | ||
|
6919e3bb38 | ||
|
d20d5ee858 | ||
|
dad49cc7f9 | ||
|
e3408b704d | ||
|
35a7f94b94 | ||
|
0f1b6d7b58 | ||
|
f1aa2b83cd | ||
|
6b73ac78de | ||
|
d42b853581 | ||
|
8e5dbcdd50 | ||
|
f73eddd2a5 | ||
|
f0eebb39bc | ||
|
26f119eb25 | ||
|
143591e943 | ||
|
f226082da7 | ||
|
b853a317e3 | ||
|
a5fb925380 | ||
|
b85e0ae0a1 | ||
|
24904055f3 | ||
|
aa097547e9 | ||
|
797e38dde1 | ||
|
e9717bd5d8 | ||
|
bdb7278a27 | ||
|
8366ab05cd | ||
|
5fd636aa8a | ||
|
5ad3f0c8d1 | ||
|
14d6351382 | ||
|
987bb1c66b | ||
|
5b0c31c300 | ||
|
7d42f4d61b | ||
|
398eebb155 | ||
|
2826ef0c63 | ||
|
3115bfa8a4 | ||
|
e960ba596b | ||
|
17692c1de7 | ||
|
7f733b2674 | ||
|
fbbac9353b | ||
|
f2e582dda8 | ||
|
c005fb2809 | ||
|
86dd5aff13 | ||
|
dfaae3e640 | ||
|
91a865a4fa | ||
|
6e0e886278 | ||
|
a19e936e75 | ||
|
ce903b6f06 | ||
|
48d16e09ad | ||
|
11fa6e636b | ||
|
53e372c281 | ||
|
f5851311d3 | ||
|
b152d8c56c | ||
|
8de93aba53 | ||
|
e74f12021d | ||
|
6608fdab17 | ||
|
48801471de | ||
|
2d87db1201 | ||
|
a95cad1c25 | ||
|
d7ad415c50 | ||
|
25c702609d | ||
|
8ece1737f4 | ||
|
fb1a478979 | ||
|
3a04ad7917 | ||
|
854cdb0975 | ||
|
6fda7f01f9 | ||
|
1faa4ad2ba | ||
|
c6a95dd6a2 | ||
|
770882a69e | ||
|
8888d9710f | ||
|
21b2dde583 | ||
|
6e26d6b78c | ||
|
43de415736 | ||
|
cd64344431 | ||
|
7262371cd7 | ||
|
09e89ab1b6 | ||
|
457e5a40e7 | ||
|
84ef8365bc | ||
|
c0ae6c3bc4 | ||
|
69a05ef6d6 | ||
|
32b171bc0e | ||
|
ac0c512d86 | ||
|
3cb6eaec79 | ||
|
74e6734592 | ||
|
fd8a7b0b37 | ||
|
ad259ba5b2 | ||
|
e6a8416274 | ||
|
944287e68e | ||
|
30e62fdcb2 | ||
|
6987a0c480 | ||
|
b693769692 | ||
|
2aebd278e3 | ||
|
3a33127542 | ||
|
ad4814e733 | ||
|
eae20a30ea | ||
|
8611662072 | ||
|
d290d2fe93 | ||
|
c0845ad3a6 | ||
|
74f35eea76 | ||
|
fa2f57be4d | ||
|
d6b9cc87c0 | ||
|
c282ec4402 | ||
|
5abbb704ba | ||
|
bff023f172 | ||
|
c8fe7fda21 | ||
|
0ec1179b86 | ||
|
c0d9b217a7 | ||
|
232f89100e | ||
|
01e6aa1e2b | ||
|
d41ef7b547 | ||
|
934960d133 | ||
|
58fda45507 | ||
|
cc24bf9192 | ||
|
728ddc45e0 | ||
|
ed8385818f | ||
|
f62edb0ecd | ||
|
eb7637b587 | ||
|
ab3a145407 | ||
|
d8416992be | ||
|
00a77b7c5d | ||
|
ab171e9502 | ||
|
fc1f568e23 | ||
|
8cb1060f1e | ||
|
13f06c1bf0 | ||
|
6448dc217b | ||
|
65dd9ae23c | ||
|
640a91ab0b | ||
|
4c6a2a70dd | ||
|
0d8b0f94c0 | ||
|
1219a18740 | ||
|
489bf4ae93 | ||
|
fd67d2658b | ||
|
92ab7bed77 | ||
|
0272a10d2e | ||
|
5e60a12a06 | ||
|
d0edb9da60 | ||
|
22c1dcbb59 | ||
|
6f9822faf4 | ||
|
de414223ab | ||
|
1032aee2d4 | ||
|
9356b709aa | ||
|
15811f2f67 | ||
|
24a39c0dd5 | ||
|
710b82f34d | ||
|
a9dce8897e | ||
|
f07024ee6d | ||
|
a37c8e1cce | ||
|
1f5cd20ed5 | ||
|
ed37526d66 | ||
|
0217cc6196 | ||
|
afd8770dec | ||
|
3694bb76c1 | ||
|
f7e81ed1c2 | ||
|
74ab5f5b9d | ||
|
6908078e27 | ||
|
8c36c49496 | ||
|
4b4e81ee65 | ||
|
31c6672c66 | ||
|
d494512913 | ||
|
caf12a7917 | ||
|
ca7db61eac | ||
|
faa80db058 | ||
|
309aefbd9c | ||
|
24bd6cb9df | ||
|
523a54d953 | ||
|
c9bd045b24 | ||
|
73862e49f4 | ||
|
a2dd2ea753 | ||
|
8b375198b7 | ||
|
5c15fb214e | ||
|
c222ad41b2 | ||
|
8fd7108e7c | ||
|
043c67059f | ||
|
0edeeb6d96 | ||
|
5bd01f2048 | ||
|
526e19e2d3 | ||
|
03cf4aa61d | ||
|
564da6ff0b | ||
|
3cc3afeba0 | ||
|
3ee6201fb8 | ||
|
b3adca1e98 | ||
|
1a8e8d694b | ||
|
1ad9ba1462 | ||
|
d24f0fab26 | ||
|
4c1c25a778 | ||
|
3442c078ad | ||
|
8414a40c52 | ||
|
6854c3fccb | ||
|
391e226e8b | ||
|
261a9107f0 | ||
|
1d5a4d441b | ||
|
e5dd66e9d2 | ||
|
e8548d99ac | ||
|
af270b2773 | ||
|
1db2c81b63 | ||
|
8522a5458b | ||
|
fc694caa0a | ||
|
c5b8c66a84 | ||
|
385addaf21 | ||
|
b701f995b1 | ||
|
e86882e38d | ||
|
8a2a5a449e | ||
|
90254df808 | ||
|
b29b9485f6 | ||
|
db885f2a99 | ||
|
cecf8eee83 | ||
|
88b9909d1a | ||
|
00ceccee89 | ||
|
78cd9c69eb | ||
|
9bcc8016c1 | ||
|
260020e392 | ||
|
f513aa78ee | ||
|
39796bac00 | ||
|
db51a209d7 | ||
|
a9a56347b8 | ||
|
7d61c83f40 | ||
|
cc681534ed | ||
|
00ff24c81c | ||
|
16a6b53ddc | ||
|
d0007107fc | ||
|
f5dc1b7e49 | ||
|
b78b6e887e | ||
|
cec713c729 | ||
|
8e4b5265cd | ||
|
9056c785dd | ||
|
3df485fd5b | ||
|
985acf8734 | ||
|
0cf3e587a2 | ||
|
b4a11fe85c | ||
|
efb35bebfa | ||
|
a268f4b734 | ||
|
868302f326 | ||
|
131b1fba9d | ||
|
c4fd5ede54 | ||
|
1cffe60012 | ||
|
9c9b12747f | ||
|
8d5aff92f4 | ||
|
22b6de6a70 | ||
|
7ed0328efd | ||
|
dbfa728a07 | ||
|
1fc5dc69fd | ||
|
99b4164c2c | ||
|
86909f4c89 | ||
|
ebc9b89d52 | ||
|
6dd25d20be | ||
|
ca86035f16 | ||
|
86a41088fd | ||
|
f527e69e7c | ||
|
7cec1c9e15 | ||
|
c2e4537233 | ||
|
edddffb58b | ||
|
9e86e5ca64 | ||
|
03a126c68c | ||
|
63c95f2734 | ||
|
20a0e99964 | ||
|
0dd13d21cd | ||
|
a7b9ab6200 | ||
|
49297c840b | ||
|
cde9695427 | ||
|
d16d0917e4 | ||
|
e20d1329b5 | ||
|
2452025c59 | ||
|
aa3b041ed7 | ||
|
f3b84896e0 | ||
|
0d5ab92f84 | ||
|
d32332aaf6 | ||
|
7c77f33480 | ||
|
cb626df225 | ||
|
dadc879e99 | ||
|
aed836f372 | ||
|
8d92a3e988 | ||
|
041a0e26bb | ||
|
e1079eda55 | ||
|
64b9776ca6 | ||
|
4ec4d8610a | ||
|
b7fe22610e | ||
|
c07bf3a93f | ||
|
7e4fe193d1 | ||
|
d86c187031 | ||
|
ca06242be7 | ||
|
1d59165194 | ||
|
301f696372 | ||
|
00dc977232 | ||
|
ebfc214808 | ||
|
4ffb0f30f7 | ||
|
6d9ecc870a | ||
|
abb88ef36b | ||
|
f923b2930e | ||
|
a7060b8cae | ||
|
376b252c63 | ||
|
4a783bb436 | ||
|
4a03bf0918 | ||
|
453091c269 | ||
|
21f47fb900 | ||
|
b741dd400f | ||
|
8ab030012d | ||
|
5cdcb78775 | ||
|
4d1d071dae | ||
|
da249bc359 | ||
|
05787cec0d | ||
|
73a790d8d5 | ||
|
290cd3016c | ||
|
7742ea6a6f | ||
|
a9047d859d | ||
|
765bdb4a1b | ||
|
e040a4ff2c | ||
|
479647105b | ||
|
eb2d0d232c | ||
|
bc1d617aac | ||
|
1f25eb3aa9 | ||
|
630dad8cc1 | ||
|
1c06345ab6 | ||
|
eb096b8eeb | ||
|
a931295073 | ||
|
6950be0111 | ||
|
bd5c396871 | ||
|
5681ec3dfd | ||
|
32f34982cd | ||
|
02255e07d7 | ||
|
e1ef6b5da5 | ||
|
075946015d | ||
|
ced3df7730 | ||
|
d2175f3ecc | ||
|
9cf3d21870 | ||
|
5595181f48 | ||
|
5bc3ef05b8 | ||
|
1d9473d33b | ||
|
2f3584b169 | ||
|
4d5a1b0ab8 | ||
|
6f6a69cb55 | ||
|
5f77ee3b87 | ||
|
ad91e1ade0 | ||
|
2a7431e130 | ||
|
28be59b4ad | ||
|
37ba70a520 | ||
|
66e2ba91b2 | ||
|
0766270090 | ||
|
f3955fdff6 | ||
|
ab250e5c47 | ||
|
4baf78001e | ||
|
42599b710d | ||
|
a43bd048a3 | ||
|
e6d4038a8b | ||
|
066f3611df | ||
|
a0fef35d6b | ||
|
fdbd123ef9 | ||
|
b72812a640 | ||
|
1d9fe50dc9 | ||
|
4d5501cc75 | ||
|
892434f06f | ||
|
0187f0bcf4 | ||
|
cf509a9038 | ||
|
fd220f13d4 | ||
|
d494613ac1 | ||
|
780220b099 | ||
|
50fae378f2 | ||
|
420db5a599 | ||
|
c5288c5cfe | ||
|
c2331d9b50 | ||
|
92fdffb272 | ||
|
89e704cf63 | ||
|
c8aa3d8017 | ||
|
4f696af8d6 | ||
|
fa034c4511 | ||
|
9dac27ad48 | ||
|
1ff62f51ba | ||
|
bd8a7646cf | ||
|
ead90b5f73 | ||
|
88a37bc3d9 | ||
|
79f955ec15 | ||
|
03cd212405 | ||
|
4b5ac600de | ||
|
23a081d436 | ||
|
e0429715e2 | ||
|
79176c652a | ||
|
70550b222c | ||
|
1dd7badd1f | ||
|
a07bf2d003 | ||
|
85866f52b3 | ||
|
51c42fc50a | ||
|
7d8e5b8f04 | ||
|
37fde1063b | ||
|
118042914f | ||
|
b055d99116 | ||
|
4c784823a6 | ||
|
af312d2179 | ||
|
a3fd36e7c3 | ||
|
c21ee7925b | ||
|
09da4ae594 | ||
|
4309ed1748 | ||
|
a8e893433a | ||
|
c899416db0 | ||
|
688a201a5a | ||
|
614f971389 | ||
|
b15666a6fa | ||
|
be3d63c189 | ||
|
097119648b | ||
|
a976841204 | ||
|
74fe973bba | ||
|
b04fcede8f | ||
|
c1e17d4cc3 | ||
|
d60e8c6b0e | ||
|
c2edb90727 | ||
|
c2c87924e7 | ||
|
6cf1cf9e6d | ||
|
fe1b98f5d5 | ||
|
01a9232b5e | ||
|
b61af83717 | ||
|
d48687a071 | ||
|
c17b2e3151 | ||
|
24c4a50f43 | ||
|
c2a92c8013 | ||
|
6ef1b2a1c1 | ||
|
806f9e8330 | ||
|
a14337d63f | ||
|
c9c13e7043 | ||
|
8935265382 | ||
|
da19c58b60 | ||
|
2baf8467ce | ||
|
aad7e71c66 | ||
|
0e89a51a25 | ||
|
d989875a52 | ||
|
369d17c075 | ||
|
ef36734a79 | ||
|
513edac21e | ||
|
5367a38ad3 | ||
|
c59a09cfea | ||
|
d92cb0154b | ||
|
57f2a65292 | ||
|
ef974c00e0 | ||
|
8cb475f139 | ||
|
37cafc6af8 | ||
|
eedb553a68 | ||
|
e887bad5f3 | ||
|
b4ae0def64 | ||
|
429e2bb2fa | ||
|
bf6d45ebf6 | ||
|
69562a1d4c | ||
|
405a351f3f | ||
|
29b25edaf9 | ||
|
8fdaf7de91 | ||
|
afebb87be1 | ||
|
6b54668b4f | ||
|
91a6c65558 | ||
|
b1a3a96499 | ||
|
4f33a4dd4c | ||
|
a5de860f0b | ||
|
e15c84ce24 | ||
|
f71d3ba46c | ||
|
d14e1c3a1a | ||
|
a912e81f64 | ||
|
e0000f9494 | ||
|
5bad300d22 | ||
|
1b27b2bd2b | ||
|
07c51ff1fa | ||
|
b74077ace2 | ||
|
a87b466df3 | ||
|
fbda518cb7 | ||
|
daf5b37afd | ||
|
e0976f6db3 | ||
|
d19d8941c6 | ||
|
6bb29886cb | ||
|
d0b6742169 | ||
|
61cec318da | ||
|
1f0412088d | ||
|
677ab4a566 | ||
|
44f2a3d1c8 | ||
|
d8fcdf973f | ||
|
93fd94eb1a | ||
|
4f76c1a23a | ||
|
f5f688eddd | ||
|
8d2b3fc374 | ||
|
f9bf06acda | ||
|
a220ccb313 | ||
|
7274390ff1 | ||
|
0bd2681966 | ||
|
04e7692af1 | ||
|
ed12c5a22c | ||
|
941a4e6260 | ||
|
1f5df26884 | ||
|
bb809a9a80 | ||
|
3c47c04740 | ||
|
90adb9041c | ||
|
cb979a71de | ||
|
91a5e00c75 | ||
|
0d4ba4ef64 | ||
|
d501d4ef2a | ||
|
55339e8cb8 | ||
|
c7074d4419 | ||
|
cd722937d8 | ||
|
40196b1e27 | ||
|
7d46f92bb0 | ||
|
2b2883a5eb | ||
|
1774c3c535 | ||
|
ac2d749e88 | ||
|
7da48d4928 | ||
|
4f7e8fda39 | ||
|
c471f7e18f | ||
|
95ebbfe1fd | ||
|
2d615fe933 | ||
|
05962bdd2b | ||
|
18b40f3022 | ||
|
5bcdf503fa | ||
|
d545bdede6 | ||
|
61a11cd6fa | ||
|
4fe7567d90 | ||
|
4e57034053 | ||
|
0516de2cdb | ||
|
b667edaecd | ||
|
5ffb4b0865 | ||
|
e5dfb37831 | ||
|
58fd7634cf | ||
|
809e21b540 | ||
|
245b9db518 | ||
|
e6cfcc0df2 | ||
|
791b07a345 | ||
|
44061d3629 | ||
|
135d1ad065 | ||
|
b46ea7825d | ||
|
a4c721ee38 | ||
|
858a3a7a45 | ||
|
6757b667fd | ||
|
9cf3337215 | ||
|
c280da6918 | ||
|
134198f1b7 | ||
|
36a03ed8c3 | ||
|
fbbdc7bf85 | ||
|
198be84589 | ||
|
4d83610edf | ||
|
d61989a7de | ||
|
d92f353ce9 | ||
|
ab620250da | ||
|
89272c55ca | ||
|
1c0955dd36 | ||
|
3d9b52a808 | ||
|
18f2ae4965 | ||
|
278d7ab446 | ||
|
bec7b402c4 | ||
|
1ab4aff273 | ||
|
c782096417 | ||
|
96d665d249 | ||
|
4734640692 | ||
|
66e09788ab | ||
|
628f87da56 | ||
|
4f1cf94b94 | ||
|
cb367500d1 | ||
|
74374c9ecd | ||
|
c8f313b256 | ||
|
6848478c72 | ||
|
a84c5b6feb | ||
|
968454db03 | ||
|
6154212e51 | ||
|
6798451bb2 | ||
|
718fd18080 | ||
|
6977c3bf4d | ||
|
e98351eca9 | ||
|
86e37f69bc | ||
|
b7e9f8b136 | ||
|
0c6fcb099e | ||
|
ab97173392 | ||
|
2706e543a6 | ||
|
d209a914d2 | ||
|
3ecb8a5365 | ||
|
7ee7191cee | ||
|
10d1a99617 | ||
|
6ebbf01f47 | ||
|
ea29564c40 | ||
|
893727e58a | ||
|
a701b45539 | ||
|
253170d634 | ||
|
9a9c35d32c | ||
|
5bf3f27fc9 | ||
|
1c1ad00573 | ||
|
b9d30e5f8f | ||
|
c7bfb76a2c | ||
|
927f01da61 | ||
|
dcd79bff8c | ||
|
18b32eb5b5 | ||
|
1f361be22f | ||
|
32660a06c5 | ||
|
7d2beb15bb | ||
|
5c92385e69 | ||
|
c7db82dced | ||
|
b8b7b08777 | ||
|
754dc40969 | ||
|
e2125bdc32 | ||
|
4b859ff461 | ||
|
8ea3a63ea9 | ||
|
a0c2e4a050 | ||
|
974dc0de12 | ||
|
6d78998725 | ||
|
4346581b7c | ||
|
7738af5957 | ||
|
b1294ada8e | ||
|
f31bbefd10 | ||
|
a7dbf7c8bc | ||
|
56601ff2db | ||
|
bc1dab7e1f | ||
|
e9f8a82ec7 | ||
|
e7e1ad7d93 | ||
|
3ac1094bea | ||
|
d6694e1017 | ||
|
f55c979a00 | ||
|
7376079d09 | ||
|
eaa785079c | ||
|
8e190f0ed9 | ||
|
0b62d38796 | ||
|
e660f922f6 | ||
|
bcac816123 | ||
|
8da116cf66 | ||
|
27539df82b | ||
|
becac1ef57 | ||
|
c267759c8f | ||
|
ca6328c44e | ||
|
511383f91b | ||
|
6d7aee4f47 | ||
|
f8efd2dfff | ||
|
1722a3f626 | ||
|
5573f5b828 | ||
|
48271822ef | ||
|
225dfbc517 | ||
|
de38156422 | ||
|
4f46c20bc4 | ||
|
71e33cfbbd | ||
|
39f0cb547f | ||
|
03859c918c | ||
|
731eee9af2 | ||
|
f2b1c98a00 | ||
|
a8571f4e02 | ||
|
a9c64a1b2e | ||
|
6c67fde0b8 | ||
|
5a617be899 | ||
|
3cc305b2b4 | ||
|
8c56ac8330 | ||
|
e17206f71b | ||
|
a4535b9f39 | ||
|
b9d4eff64f | ||
|
8105182945 | ||
|
4fcbc84d65 | ||
|
194027acb3 | ||
|
967d3d9783 | ||
|
c4e43bea7b | ||
|
9c895994db | ||
|
99fda03aa3 | ||
|
a738f87cae | ||
|
387c7b3eef | ||
|
aa1b2573f3 | ||
|
22e97d4cbe | ||
|
94f6d685cb | ||
|
f06a1f33f1 | ||
|
84c5131950 | ||
|
68bc148cac | ||
|
808260ec32 | ||
|
52af3158e9 | ||
|
afb6a92fee | ||
|
be3dc3318b | ||
|
8e2701ea8a | ||
|
4a7ebfc1f2 | ||
|
72ee73c196 | ||
|
605497ce5b | ||
|
90f6792f53 | ||
|
d89e391b21 | ||
|
0ddf669fc9 | ||
|
8d18e3653e | ||
|
ddac39da93 | ||
|
715b3df02f | ||
|
7d3e8dce7b | ||
|
6da8eee196 | ||
|
bd5554212e | ||
|
15f3714795 | ||
|
e82b00a76d | ||
|
d381b7dfdd | ||
|
dc834029a3 | ||
|
fe8402e653 | ||
|
9cce71a0f9 | ||
|
c118d8b06e | ||
|
4c0d2cd3d0 | ||
|
e09200046e | ||
|
e5eaf55744 | ||
|
cae92a4988 | ||
|
6f3f9b50aa | ||
|
f196316400 | ||
|
bbf941bda9 | ||
|
e2b497f7a6 | ||
|
c59112bba5 | ||
|
5b70207eb4 | ||
|
afa292ff31 | ||
|
94a2af7672 | ||
|
022a8d0284 | ||
|
65fd2fc261 | ||
|
a1353ea496 | ||
|
3c0f8ed250 | ||
|
e6d0599dc7 | ||
|
5608bce45d | ||
|
34b340a08e | ||
|
f5ca194a78 | ||
|
7d36417da1 | ||
|
1e990633f8 | ||
|
a047aff270 | ||
|
e081b01f4d | ||
|
a8505db0fa | ||
|
7305bbf0ac | ||
|
ecac5b81f8 | ||
|
ebda9490d0 | ||
|
5e3c3fc9b8 | ||
|
1a2fe0cbea | ||
|
525007cf12 | ||
|
35c63208f0 | ||
|
8f68971791 | ||
|
58611b5a50 | ||
|
19cf1ef3a7 | ||
|
0a42e3b6ac | ||
|
de34bb081b | ||
|
628f9e9596 | ||
|
fe906309d7 | ||
|
d3f00f5993 | ||
|
2a225ba641 | ||
|
a607d8d633 | ||
|
aa767a4521 | ||
|
900af4701c | ||
|
f81e22cf6e | ||
|
6371dc5ddc | ||
|
148af7c534 | ||
|
50918c652c | ||
|
f87da781d2 | ||
|
f4075f30fa | ||
|
a0f63de941 | ||
|
57c2270cd7 | ||
|
93153d9a00 | ||
|
a58c5d3e56 | ||
|
b0744f8068 | ||
|
2f68482ef8 | ||
|
057bf0be54 | ||
|
2e297951cd | ||
|
d94de683a6 | ||
|
c4e1d0fc47 | ||
|
141fad6334 | ||
|
4849eced7f | ||
|
6e69dd00cc | ||
|
0c689c8dd6 | ||
|
b4e4313265 | ||
|
01101e2da6 | ||
|
c369ea0bec | ||
|
39d6633948 | ||
|
1baa0a9db5 | ||
|
8630a814ce | ||
|
eedf7bedb4 | ||
|
99635c9934 | ||
|
594d84fede | ||
|
37140a7124 | ||
|
dcd9ce72d5 | ||
|
b2dd2f28f3 | ||
|
c1daf25293 | ||
|
b55e184291 | ||
|
a7af285d1a | ||
|
a9c3b09ee6 | ||
|
7e57f04a17 | ||
|
58d1a31694 | ||
|
404e3102be | ||
|
1c0338c561 | ||
|
333e57d578 | ||
|
5a1e0e91a1 | ||
|
106e875e59 | ||
|
ef81fe8b3f | ||
|
b2f0b9342a | ||
|
1e0f0a90e0 | ||
|
fc9361e3ec | ||
|
ef37a43194 | ||
|
071691a05d | ||
|
319fe1034c | ||
|
77c1fa98ce | ||
|
272be12047 | ||
|
bb351eab34 | ||
|
b3482afb55 | ||
|
d6f2a8911e | ||
|
d8af5b3aad | ||
|
61873536a0 | ||
|
e71bf8b256 | ||
|
11fe6505b8 | ||
|
3214311765 | ||
|
442c56e6ee | ||
|
b4e05bddd7 | ||
|
f631cd8e12 | ||
|
00978afa69 | ||
|
e7ec36183c | ||
|
05ef417f46 | ||
|
57309d1415 | ||
|
9c41aa9717 | ||
|
369559cab0 | ||
|
0d5b49cfb5 | ||
|
a236aa2058 | ||
|
7f73c398d5 | ||
|
83e51c483e | ||
|
9d8fe14a97 | ||
|
b8fd3d7cc2 | ||
|
46abf0775b | ||
|
469d3e9b7b | ||
|
d47db7e06a | ||
|
cf4a8b2698 | ||
|
df4aed1cf0 | ||
|
966cb94d85 | ||
|
ec36b155bd | ||
|
f0dfc29c71 | ||
|
a2db25a143 | ||
|
4fdfe2f3ae | ||
|
0286d08d14 | ||
|
6989272940 | ||
|
fe5f448f43 | ||
|
effd54b05e | ||
|
d8331a013b | ||
|
351461fc83 | ||
|
8ca1a013e4 | ||
|
89216929ee | ||
|
b899f05f9e | ||
|
3af0741ccc | ||
|
3d9b742c7d | ||
|
1c2aa6f237 | ||
|
6b65e37304 | ||
|
884a369a73 | ||
|
671c43ff32 | ||
|
e879caa6a3 | ||
|
eea0562328 | ||
|
4d76ea948a | ||
|
49d8a7819b | ||
|
d6f513f829 | ||
|
a2c5db764c | ||
|
991ad6cd02 | ||
|
08f35f8720 | ||
|
b0f76951bc | ||
|
9222c61388 | ||
|
5c5a0f3c39 | ||
|
3e1512cdfe | ||
|
d2001a563b | ||
|
8b51786f6e | ||
|
6fdf2acccd | ||
|
c534e69669 | ||
|
11f406f91f | ||
|
313d9977bb | ||
|
6991087b08 | ||
|
3c1a167904 | ||
|
0295153cbc | ||
|
b3a7495cbc | ||
|
f28b24bb6a | ||
|
42f9292efb | ||
|
f77c0fe312 | ||
|
ba0c92a67d | ||
|
508d12b224 | ||
|
1457ea31cd | ||
|
8743ec79b7 | ||
|
9795e0dbc2 | ||
|
e0f88b1ac7 | ||
|
ff42758536 | ||
|
a8ff046ba9 | ||
|
5d18e02915 | ||
|
38a14fe926 | ||
|
f032212850 | ||
|
f2f889d997 | ||
|
e875c17db7 | ||
|
e7e97a594d | ||
|
be2ad872dc | ||
|
1f7e12cc26 | ||
|
580e09f7c7 | ||
|
9cf58b6979 | ||
|
07b1232d2c | ||
|
cb147822d0 | ||
|
af110130e6 | ||
|
ed903e4242 | ||
|
ee5aa9d44f | ||
|
25d6eb3a77 | ||
|
a8780ad5bb | ||
|
e2948f175e | ||
|
69659fd770 | ||
|
fe686e5a1f | ||
|
ce65118e62 | ||
|
cdbcd6c12f | ||
|
c225b981b6 | ||
|
c0472c7c9e | ||
|
c978d28a2a | ||
|
259502c61d | ||
|
18359b1945 | ||
|
4c1a4c4180 | ||
|
6420b4c55d | ||
|
6619edf0ea | ||
|
cf283a470a | ||
|
4f167b46b4 | ||
|
6f7f0d0a2d | ||
|
5ad2b5ce07 | ||
|
7a3ba5af83 | ||
|
0be79c8a80 | ||
|
01cd7f7575 | ||
|
b1fd5b3506 | ||
|
775f4c5361 | ||
|
4508fcd20a | ||
|
9a45b5d576 | ||
|
ef4279890a | ||
|
e7ff34edfd | ||
|
a5001e9361 | ||
|
66c71d8a3d | ||
|
baac339546 | ||
|
fc715b5088 | ||
|
8749ce0a6f | ||
|
02b28440a3 | ||
|
55fbde1232 | ||
|
f2f1d735ca | ||
|
6865660d5a | ||
|
e93523680b | ||
|
9ed9755237 | ||
|
b0a207df87 | ||
|
2465458c06 | ||
|
d42e12e8dd | ||
|
b1c702af6f | ||
|
5f6cafd149 | ||
|
4252569b32 | ||
|
5770bfeb87 | ||
|
12d0b79493 | ||
|
7bcc9eb973 | ||
|
434e29032f | ||
|
8e16c3f2b6 | ||
|
92d912a2c9 | ||
|
7dfe6f2a51 | ||
|
9550ee9870 | ||
|
47124ca667 | ||
|
98883bca6f | ||
|
6cdcbce3e5 | ||
|
b5fce9e2df | ||
|
9d52aad39a | ||
|
704c349086 | ||
|
1c5eeec392 | ||
|
61478ea03f | ||
|
2e38bcd2dc | ||
|
ce0bb89d45 | ||
|
5f1f21d2a5 | ||
|
e63807a8a4 | ||
|
0c8ae72029 | ||
|
ea88e9bca9 | ||
|
39931206f7 | ||
|
78355ffc7b | ||
|
2d1593cd4b | ||
|
b20573601f | ||
|
d31a4a84fb | ||
|
0a6c4c2e3b | ||
|
5e1eac149f | ||
|
7523de907d | ||
|
af57c51ab7 | ||
|
c11132ca80 | ||
|
a9639e76ed | ||
|
8ba1644391 | ||
|
a187327964 | ||
|
ba51e75bb0 | ||
|
a1312bc8b2 | ||
|
d970f7d5cb | ||
|
3c7410a5ba | ||
|
befa9b614f | ||
|
1e08ad102a | ||
|
94473fa8e4 | ||
|
288b6107e1 | ||
|
ab0f37b97b | ||
|
6a4cbac17a | ||
|
a2bd84a532 | ||
|
50257dba06 | ||
|
c70557da08 | ||
|
46753a7ce5 | ||
|
d3c58c7ec0 | ||
|
c6f9dfe8ef | ||
|
a6a0bd38c6 | ||
|
11c467ef1a | ||
|
ee8fd6b1bd | ||
|
664f3fd4eb | ||
|
7da37f2c5d | ||
|
3d44a14558 | ||
|
d5025dc00f | ||
|
cb3c7fdda6 | ||
|
d05005c11f | ||
|
1032be03d5 | ||
|
64dfdfa28b | ||
|
aa25b7f983 | ||
|
3b6280beb2 | ||
|
3ef595d5f8 | ||
|
de004174ff | ||
|
325ab46800 | ||
|
b534968dc3 | ||
|
1d66b09982 | ||
|
f24fc8367d | ||
|
6af769427a | ||
|
98c389845f | ||
|
5814e8ba4e | ||
|
84ebfcbd18 | ||
|
e16417726c | ||
|
6ac902639c | ||
|
6bddfdbf19 | ||
|
b7ed9e10d3 | ||
|
238663c183 | ||
|
b0fc907f70 | ||
|
8e10778e0e | ||
|
6534efcf7b | ||
|
6e198e97ec | ||
|
8577d8c34d | ||
|
8786868c1b | ||
|
f100b1c33e | ||
|
b93aafaba9 | ||
|
60869e7219 | ||
|
ba752031a5 | ||
|
00ce89e74a | ||
|
fae8664187 | ||
|
c052164410 | ||
|
3c029873c6 | ||
|
28fcfbfe09 | ||
|
a59bbda13f | ||
|
8e913f796a | ||
|
bd08f2f766 | ||
|
8c7f47ddde | ||
|
dc300f9ffc | ||
|
5fe050c360 | ||
|
c7a757aa56 | ||
|
c3ee702552 | ||
|
650c0aa918 | ||
|
a596eeb93f | ||
|
28529e37e2 | ||
|
0bf36922c8 | ||
|
e83e16de9e | ||
|
bd63020652 | ||
|
92bf6cc15a | ||
|
a8098f8653 | ||
|
4db03d266b | ||
|
0514c6a202 | ||
|
621ed8af21 | ||
|
94b1f7bcd3 | ||
|
345fec0d57 | ||
|
1ffeecf7a9 | ||
|
a6ac8d7582 | ||
|
0a904ed2c8 | ||
|
21dffed2f6 | ||
|
cabf4bca21 | ||
|
773cca4887 | ||
|
033bf67c3c | ||
|
5732efaa91 | ||
|
aba9bfd00a | ||
|
c185173ef0 | ||
|
0ff20b9f00 | ||
|
b5dbe15d0b | ||
|
5458b18a18 | ||
|
d03dab2a64 | ||
|
22ca9ff5b2 | ||
|
57e2b887a0 | ||
|
6dc2e82330 | ||
|
c5cf866314 | ||
|
0728199b91 | ||
|
9ed8b5a7b2 | ||
|
6ac84a7872 | ||
|
991dd5beb9 | ||
|
ec0114abef | ||
|
9bb3f212e2 | ||
|
17a691c1ef | ||
|
f5595af61e | ||
|
e966f815d4 | ||
|
e4dd1e19a2 | ||
|
af717fa87a | ||
|
6ff49cbcd4 | ||
|
e2badebb8f | ||
|
b6ac40dc77 | ||
|
5c4ed98d99 | ||
|
5a83f42b3a | ||
|
c2d122aa7d | ||
|
c4c6ada953 | ||
|
0836334e9f | ||
|
39434ba375 | ||
|
4799f3baab | ||
|
f762ea32ed | ||
|
6b06a7271f | ||
|
a9aead31d6 | ||
|
d23bf09c7f | ||
|
5a0ed193cd | ||
|
fc5eacdb48 | ||
|
d2505ba254 | ||
|
50b2d54446 | ||
|
d96c09df7e | ||
|
392b9a6fba | ||
|
5debbdcf7b | ||
|
1a1f3e4b53 | ||
|
e6c0bfec22 | ||
|
0a82af9b91 | ||
|
99bc6ea392 | ||
|
e0062c047e | ||
|
2f6aa043a6 | ||
|
60edcf4535 | ||
|
bf511d579f | ||
|
173f3c03a0 | ||
|
cedd7b22f4 | ||
|
cde76cf2a9 | ||
|
2b753fb4c2 | ||
|
37b784f01c | ||
|
1a5cd56aac | ||
|
479574aab2 | ||
|
ebdc834105 | ||
|
68fb51cd1d | ||
|
30f3757b50 | ||
|
4e0a055757 | ||
|
7fb870e15b | ||
|
2eaf6433f2 | ||
|
4f81b96d10 | ||
|
0cc0ce0688 | ||
|
a70598d58e | ||
|
602e33659e | ||
|
1877544c7d | ||
|
163d665402 | ||
|
0200fb2788 | ||
|
259a2a7332 | ||
|
f49fd6d0cd | ||
|
98d9f577ea | ||
|
d16619f8d0 | ||
|
b052a864e9 | ||
|
d4e5987995 | ||
|
56eeb97339 | ||
|
a989a329db | ||
|
87f351de6c | ||
|
ee90e2641d | ||
|
f2958fdce5 | ||
|
194f742fba | ||
|
a4027e7487 | ||
|
ec873c943d | ||
|
4d62edfb07 | ||
|
e16916eae4 | ||
|
7315ad282d | ||
|
dee059c469 | ||
|
68ed8430fa | ||
|
f244aef282 | ||
|
c2291b1f80 | ||
|
5c8ac0b6ca | ||
|
0081dd7246 | ||
|
602a857b25 | ||
|
75ce4cb180 | ||
|
cfa3d7ba83 | ||
|
3a0b1f421f | ||
|
d7640339e9 | ||
|
330e8ab901 | ||
|
46ff9bd5dd | ||
|
9b36293596 | ||
|
fd2be5df8d | ||
|
42fc0309be | ||
|
39c20230ba | ||
|
e6310bbc5a | ||
|
edc0987174 | ||
|
4e21a649f0 | ||
|
81e9dec6f5 | ||
|
7ffc857fb2 | ||
|
30519b021a | ||
|
5abefd049e | ||
|
bd0b594dff | ||
|
7f2bcd064c | ||
|
69f5e42053 | ||
|
9826452012 | ||
|
ab29bb87b2 | ||
|
53a118d6fe | ||
|
fd749f4a70 | ||
|
7b1bf3ad2d | ||
|
13aaa50f48 | ||
|
d761f75188 | ||
|
78ecb74822 | ||
|
721257e14d | ||
|
a15107c002 | ||
|
db23ced867 | ||
|
21f0762a1a | ||
|
1f3b7817eb | ||
|
eaf113a4ed | ||
|
13f071c06b | ||
|
8a02058ab2 | ||
|
7e1df0e638 | ||
|
bcbb02480b | ||
|
bdcb213757 | ||
|
28efe6544f | ||
|
d8e5b12fe8 | ||
|
d45127a543 | ||
|
9580fdc3b1 | ||
|
9ec6078f41 | ||
|
950905affd | ||
|
fe45b493dc | ||
|
e31f4da5f0 | ||
|
39456ee667 | ||
|
75d9e50223 | ||
|
7477f0898c | ||
|
19f6bff448 | ||
|
1c7ca6a0c8 | ||
|
40e5ebbf98 | ||
|
5e1fd3eb61 | ||
|
8019a67305 | ||
|
7062497fde | ||
|
8c714e065c | ||
|
788f963310 | ||
|
1c871fe2a4 | ||
|
04fd66c9f7 | ||
|
b1f8fd3b41 | ||
|
291b0f5b14 | ||
|
9a9b00b57f | ||
|
b99891b0c8 | ||
|
43a7c679ac | ||
|
8802d332af | ||
|
ab595566b1 | ||
|
e3b13be45a | ||
|
9435c35e40 | ||
|
999020e1bb | ||
|
7d10ec93c4 | ||
|
3bc8edd575 | ||
|
80f8355d66 | ||
|
2dab040a1d | ||
|
15e5ef78ae | ||
|
b69ae27a05 | ||
|
be3dcfb31a | ||
|
2686d9339b | ||
|
f6e3890101 | ||
|
35fc0be75c | ||
|
4fc1c0f091 | ||
|
4a3f5ad0f5 | ||
|
a342cb00c5 | ||
|
57c42b6227 | ||
|
e0cfa71527 | ||
|
d3e9a6f3bf | ||
|
50e2789913 | ||
|
929bd94ee1 | ||
|
696a18c7e7 | ||
|
75aa53c927 | ||
|
dd2422b320 | ||
|
0d5c7b2dca | ||
|
76de6a6e20 | ||
|
76bfdc9ad9 | ||
|
414721d003 | ||
|
7b673beff4 | ||
|
b05fde97c5 | ||
|
2fe90784ae | ||
|
c7c441ccee | ||
|
420455b510 | ||
|
6164301821 | ||
|
700614e05e | ||
|
fc17828ab2 | ||
|
47fe7ff382 | ||
|
dc99a350df | ||
|
b9e7f0115d | ||
|
68ce1d3499 | ||
|
18ac7bef9e | ||
|
d81f6eac73 | ||
|
d6a41cc7d5 | ||
|
4b01ba739a | ||
|
9b7835a516 | ||
|
079b2f6ba2 | ||
|
a201463482 | ||
|
7978bc7293 | ||
|
e0a050e347 | ||
|
d38f70b249 | ||
|
be0ba55041 | ||
|
ba0f12ef24 | ||
|
eb86e7755e | ||
|
90a77e6484 | ||
|
531814a7fb | ||
|
00711afdd6 | ||
|
593177c566 | ||
|
cb296f303e | ||
|
8d1547ef46 | ||
|
d993e05b2d | ||
|
a5398eb9c4 | ||
|
dc65c743e5 | ||
|
35f1f4f7ea | ||
|
09f0108224 | ||
|
5881d27bcf | ||
|
993f08452d | ||
|
d1b736b796 | ||
|
ad877f92c6 | ||
|
c5d7b81ecf | ||
|
dd25c6ee10 | ||
|
300b44a933 | ||
|
6cfdfed86b | ||
|
9ce97705fc | ||
|
8eb3a3a923 | ||
|
117f4046d7 | ||
|
416a4799e5 | ||
|
69cce15178 | ||
|
81c882b613 | ||
|
d476275306 | ||
|
b01204c942 | ||
|
aff909dd4f | ||
|
994f04a3f2 | ||
|
410390cf09 | ||
|
80820772ad | ||
|
f966a73d40 | ||
|
1663c65500 | ||
|
724b119a15 | ||
|
6ae3ead6f0 | ||
|
c560da981a | ||
|
5d88a6b579 | ||
|
149210fbba | ||
|
21686ff448 | ||
|
28ffb1f22f | ||
|
a33c7045d1 | ||
|
63415a83f7 | ||
|
8f0b4082f4 | ||
|
056b067f47 | ||
|
823fb291ae | ||
|
37a4076eb5 | ||
|
63a09523da | ||
|
8d6c5e4f3f | ||
|
049908c573 | ||
|
6b6bd02c07 | ||
|
105260e89f | ||
|
1757c449c4 | ||
|
f291c98e52 | ||
|
af9c764aa1 | ||
|
10de049c42 | ||
|
7c37eb10fd | ||
|
e9c7391947 | ||
|
12e8247795 | ||
|
a007b626a7 | ||
|
84a90fc847 | ||
|
2e1338ee4f | ||
|
ab6ef7e6e8 | ||
|
f62262aacf | ||
|
062ccd654a | ||
|
541aa82180 | ||
|
ae51cebbe6 | ||
|
f728025eae | ||
|
4e5b3a4eb5 | ||
|
5bce3e6feb | ||
|
01c0981e75 | ||
|
19984725d5 | ||
|
ec74e45971 | ||
|
faa60a4f0b | ||
|
8728cae3bf | ||
|
872ef9434a | ||
|
0bf751e7e9 | ||
|
3a3dde0d44 | ||
|
b724bafee0 | ||
|
d23849361d | ||
|
eb9524ca66 | ||
|
8650108199 | ||
|
52de37c78f | ||
|
c475be6dfa | ||
|
351c06476d | ||
|
4871d34290 | ||
|
e37e082ef2 | ||
|
0c1602b8ad | ||
|
fdb9d2b867 | ||
|
c4cd8712cd | ||
|
1fc10687bf | ||
|
9a5bfa1eab | ||
|
385960a91f | ||
|
125892b804 | ||
|
b3cbba47eb | ||
|
1a75935d3f | ||
|
d9605e634b | ||
|
cacd819d0e | ||
|
c0a66d9237 | ||
|
aec1621e4f | ||
|
eb6cb20793 | ||
|
4c2a8d899d | ||
|
c41845733d | ||
|
22cc2fd905 | ||
|
1e96933183 | ||
|
e0954e729d | ||
|
74e10fcc6a | ||
|
c49f887978 | ||
|
48a2e193ec | ||
|
45344b3880 | ||
|
0a7ce61e65 | ||
|
c6255a6eab | ||
|
5a20d2ced0 | ||
|
f8bcb37d99 | ||
|
a862159daa | ||
|
c73cff0535 | ||
|
8f35356e49 | ||
|
c253e005aa | ||
|
57beadd2b7 | ||
|
aad2787407 | ||
|
de6a9bb6c1 | ||
|
5b87170050 | ||
|
ad8d42f83c | ||
|
f463afe347 | ||
|
94dd22873e | ||
|
b013c97102 | ||
|
66160760e1 | ||
|
24d68c95ad | ||
|
ba98e032a7 | ||
|
1d5fda5dc6 | ||
|
1cd5e95c1c | ||
|
e0743e63ea | ||
|
1878d1ecef | ||
|
c1e10a22b6 | ||
|
7652a41dc7 | ||
|
a1eb65c246 | ||
|
b9b8b59c0d | ||
|
2a5e6d1b3a | ||
|
b086d55fe1 | ||
|
abde328337 | ||
|
6256849fdf | ||
|
6e5f6c7c60 | ||
|
13e24d7987 | ||
|
6e9b091980 | ||
|
c1d028f225 | ||
|
7e9b47df4f | ||
|
6679eeeb9b | ||
|
c6538cfea9 | ||
|
ccfc71271d | ||
|
c7cf729fe4 | ||
|
e86d4e59c1 | ||
|
092793cb6d | ||
|
b380533ca2 | ||
|
65d722ba54 | ||
|
b3f62dd521 | ||
|
a29d690d6e | ||
|
1821abd1ce | ||
|
63415a4212 | ||
|
7c5a378ff2 | ||
|
ae04c0f156 | ||
|
a24aa4279a | ||
|
931d76980e | ||
|
3b7ab6bda8 | ||
|
ff9bb105a0 | ||
|
1529bc41dc | ||
|
585892aac6 | ||
|
4efffd8750 | ||
|
6fad7ae1d5 | ||
|
eca4774075 | ||
|
f1a0855d24 | ||
|
91fd8ba770 | ||
|
fa15eac7ec | ||
|
372bed0a2b | ||
|
4b57db792c | ||
|
921dd444fe | ||
|
99be3b7c7c | ||
|
81ec6f01f2 | ||
|
6954a1e2c9 | ||
|
c821db16e6 | ||
|
cc67d082f7 | ||
|
f4f963f4a5 | ||
|
d76a558d4d | ||
|
4dfbedd3f5 | ||
|
a0826b119e | ||
|
2afb9e1690 | ||
|
f3d32879d6 | ||
|
aea33a3e85 | ||
|
a9b9495bc0 | ||
|
87b66c2838 | ||
|
bfd67dca3a | ||
|
bc5e942bf3 | ||
|
a3e70e1f3b | ||
|
84281b92d5 | ||
|
d71a2d7863 | ||
|
d0bc78e2bf | ||
|
b4ff336e1d | ||
|
86d870753c | ||
|
e0b3b9d044 | ||
|
befda04080 | ||
|
b8a922d0d3 | ||
|
2ddff00c92 | ||
|
30c15c1d73 | ||
|
659863d8a7 | ||
|
35f94ffd66 | ||
|
767e083562 | ||
|
2b232d202a | ||
|
b0bf0e50ea | ||
|
fbaf7d4513 | ||
|
0accd1cfe8 | ||
|
a64be16ef8 | ||
|
fe4a282956 | ||
|
c0bfefb6cf | ||
|
4a32fcf155 | ||
|
e36a8aff9a | ||
|
ab7eba4c38 | ||
|
fc6557a6f5 | ||
|
59678f3fae | ||
|
949ff63e2f | ||
|
ba705c09b4 | ||
|
54f6914375 | ||
|
d545f8030a | ||
|
7239c22f2b | ||
|
b181f9a580 | ||
|
3a4721954c | ||
|
c393881600 | ||
|
e94cd97dd7 | ||
|
879180b655 | ||
|
bacbf21352 | ||
|
10816efb2c | ||
|
722ed5bed5 | ||
|
0d7c4404ac | ||
|
b38e5da178 | ||
|
659f4d7615 | ||
|
e2985da831 | ||
|
68d2c3bedc | ||
|
82a4f054a9 | ||
|
666e33ab46 | ||
|
802e382ff1 | ||
|
d1ae263893 | ||
|
81df6af392 | ||
|
cc91438c0f | ||
|
93de378435 | ||
|
442cd17f74 | ||
|
fa4f4c58ea | ||
|
58227f65ca | ||
|
0b0849b5a5 | ||
|
f6342fb5e6 | ||
|
d6cb12871f | ||
|
12058e0cb5 | ||
|
352d9b8957 | ||
|
26296ac997 | ||
|
d6adfdf934 | ||
|
2c6725e622 | ||
|
134b124794 | ||
|
0f0223d38a | ||
|
729b47568a | ||
|
b5ef33b2ae | ||
|
98d2df7443 | ||
|
907f2fabf7 | ||
|
35d2f1b82e | ||
|
533b005afd | ||
|
155c2f6c82 | ||
|
db18be5792 | ||
|
be39d6f592 | ||
|
5d0fac27c4 | ||
|
98cf46c8d2 | ||
|
8ac09e5213 | ||
|
b0c4d5d792 | ||
|
549b95b3de | ||
|
c67b782d27 | ||
|
6f207e6699 | ||
|
f35c88fcca | ||
|
19817fd33e | ||
|
c7dc005723 | ||
|
dad909f709 | ||
|
c4f6f41c84 | ||
|
402dc2145d | ||
|
cc096b11ea | ||
|
209ce629ac | ||
|
65c1133755 | ||
|
b46b1d59d6 | ||
|
9e9f08b5ed | ||
|
fddca1dce4 | ||
|
bfd0555665 | ||
|
5d465013d6 | ||
|
dff1625b7d | ||
|
4427147544 | ||
|
a297dec681 | ||
|
76adcbf2d1 | ||
|
047c1182f9 | ||
|
bfb6847df6 | ||
|
6972616433 | ||
|
fd9cd37f66 | ||
|
b4e0eabd78 | ||
|
598e55d714 | ||
|
62d8ddb2ee | ||
|
3c448b2e88 | ||
|
5ebe4b5b56 | ||
|
075ff4102b | ||
|
f764e0ed58 | ||
|
0dc8d2242c | ||
|
73049b0db3 | ||
|
a9a0ceca5b | ||
|
884898a79a | ||
|
721d183848 | ||
|
121640d59b | ||
|
befba9e4d3 | ||
|
c06359e617 | ||
|
8936f975b4 | ||
|
5487ff0f50 | ||
|
163d9efc6b | ||
|
6243633c63 | ||
|
643de21414 | ||
|
28c513cb25 | ||
|
81b635b1ef | ||
|
05c5f28144 | ||
|
beed4c4b53 | ||
|
b4e0dd391c | ||
|
f8fc38322f | ||
|
c57fe715b2 | ||
|
cdff92b982 | ||
|
478cbb089e | ||
|
564ab31a53 | ||
|
1545d942ec | ||
|
9fcd0bf7f3 | ||
|
f3a8b1b68e | ||
|
b70642258f | ||
|
f9c980f617 | ||
|
d5e0be7d42 | ||
|
dc7bf04dcf | ||
|
129b8b1a21 | ||
|
c5e7a7d769 | ||
|
ff0846a09f | ||
|
b11af9ed9d | ||
|
371bc2f714 | ||
|
dc6923a52c | ||
|
50f1747a7c | ||
|
ed38aa559c | ||
|
8ecb322ecb | ||
|
690a4c0a9b | ||
|
38f43f0246 | ||
|
2970ae54d3 | ||
|
4263bab00e | ||
|
59b28f2a14 | ||
|
c5f0d1f903 | ||
|
8329541967 | ||
|
52e75e6a80 | ||
|
653a54d049 | ||
|
eff41cb91e | ||
|
fa64a0c396 | ||
|
c24937e4cc | ||
|
2702a0c1bf | ||
|
1feeb78361 | ||
|
d7d0ed353b | ||
|
395367bcd3 | ||
|
7e0f753950 | ||
|
d296fd8ff7 | ||
|
59a14f6984 | ||
|
f74a73b365 | ||
|
235fb242f6 | ||
|
fb48a5f865 | ||
|
7608fd01a1 | ||
|
c36d477458 | ||
|
c3b0ceb5a9 | ||
|
8f3447c289 | ||
|
2f6550d9c2 | ||
|
d3ae69de98 | ||
|
faa5c14f8c | ||
|
02191df4b1 | ||
|
b541538fa5 | ||
|
a23717e506 | ||
|
06c73b9852 | ||
|
93344f258a | ||
|
26f03c44d0 | ||
|
b04edcaf5f | ||
|
5f167b77d2 | ||
|
68d9be05da | ||
|
36866abca3 | ||
|
d5aea4245e | ||
|
e8a301af2e | ||
|
87d9092b70 | ||
|
1a51ca3303 | ||
|
27ee942feb | ||
|
e8b86d2538 | ||
|
cfa87e8121 | ||
|
1f540d9658 | ||
|
7d9a266c85 | ||
|
2cd78b2a87 | ||
|
0bc58f9580 | ||
|
cfddeb1067 | ||
|
4c84a0dc49 | ||
|
5fcc0986fc | ||
|
bd4e083419 | ||
|
90ac8b5005 | ||
|
9dcf65d3c1 | ||
|
5620726fd7 | ||
|
091e74e76b | ||
|
ad2633bd96 | ||
|
02e817a239 | ||
|
c8b26ef59e | ||
|
01399dcd57 | ||
|
ca4c9b7e56 | ||
|
6626de903e | ||
|
fcea31d51b | ||
|
62602fbd53 | ||
|
0d23e82531 | ||
|
4960f9fc9a | ||
|
1528e0b85f | ||
|
cef590ee27 | ||
|
9e20825c53 | ||
|
b86ad1d632 | ||
|
ad973712cd | ||
|
e905fd1c79 | ||
|
c9afb3cbc5 | ||
|
092ee46f03 | ||
|
8f6d9cb3f7 | ||
|
f461887a02 | ||
|
9d0e03774e | ||
|
dee28fdd4d | ||
|
8bd37efca7 | ||
|
50c95f691c | ||
|
111d99489d | ||
|
d1f6e2cfe2 | ||
|
30957174e5 | ||
|
8a3bc532fd | ||
|
d3cefe87d7 | ||
|
303a585db2 | ||
|
08fa76dc25 | ||
|
610e05a433 | ||
|
49c9d05986 | ||
|
fdfebc6ac2 | ||
|
0d2cd276cc | ||
|
fb2c90cab8 | ||
|
4aae00c69c | ||
|
c8b1fdc0b5 | ||
|
cb2f2135b0 | ||
|
8dd37b0326 | ||
|
9372787028 | ||
|
f1e589cd3d | ||
|
13b5552592 | ||
|
76fc401aa5 | ||
|
04ab8b6ddf | ||
|
1e50d914af | ||
|
1436bf0bed | ||
|
ba64d0b6d5 | ||
|
3be926e348 | ||
|
3f6187f1d3 | ||
|
3cf279b861 | ||
|
621b83d9b3 | ||
|
df08bf5ab3 | ||
|
2765cbb5aa | ||
|
5cb78ae7c4 | ||
|
c3316efa21 | ||
|
2c17722ec8 | ||
|
8736cc485b | ||
|
09ac36f80b | ||
|
9fbc9db0fa | ||
|
3cfcae3b4d | ||
|
c3793e4660 | ||
|
781130bf60 | ||
|
97b253782a | ||
|
f11af09331 | ||
|
ed650677e1 | ||
|
48670a3300 | ||
|
44be939a5e | ||
|
0fd26ccb31 | ||
|
42a505eae0 | ||
|
8bdc8a9c98 | ||
|
37db38bc52 | ||
|
82e77a8027 | ||
|
564a5bbe57 | ||
|
0433abb04f | ||
|
1002abaa77 | ||
|
5deedd6e79 | ||
|
0be0990e41 | ||
|
951f68d01c | ||
|
04d29fda82 | ||
|
e40dfb3a38 | ||
|
09a68e8818 | ||
|
b4f4d3dd61 | ||
|
193d0c9310 | ||
|
6b24b421ce | ||
|
b67bca8c6b | ||
|
2fe1143153 | ||
|
a7d8ec1e42 | ||
|
0cb7e05cd1 | ||
|
e3e8e3c0aa | ||
|
92a17abc1b | ||
|
f3b757e41c | ||
|
2755491049 | ||
|
a0477b5a2b | ||
|
375e3718e8 | ||
|
e5b889c91e | ||
|
c08eb1d348 | ||
|
5c82ed90df | ||
|
da7d0696d1 | ||
|
1b701a43b8 | ||
|
04fc5ddd16 | ||
|
8622e8cdce | ||
|
da1bd25f29 | ||
|
21dd7c5b4c | ||
|
3dd2cf729d | ||
|
143f778f65 | ||
|
32326dc3d9 | ||
|
17aa8c0476 | ||
|
05a8831af2 | ||
|
1d8acb7d4d | ||
|
1b54a5d2cc | ||
|
c1eada835a | ||
|
2523e9b700 | ||
|
210bb741b9 | ||
|
d59c756578 | ||
|
1c6c52fdef | ||
|
82008f15b7 | ||
|
aa34396cb2 | ||
|
75a788ee92 | ||
|
248d0a8970 | ||
|
4ff9366dc1 | ||
|
90576c50fc | ||
|
46bd197877 | ||
|
96aaaff865 | ||
|
1b3b96d84c | ||
|
0518029cec | ||
|
b044829c47 | ||
|
235751501d | ||
|
23714996e9 | ||
|
f13a38a5fa | ||
|
1be9182df8 | ||
|
c94f845b16 | ||
|
d2b23b6730 | ||
|
52cd064365 | ||
|
f7ed8c899f | ||
|
c2ac2afd09 | ||
|
c87a0bc8cb | ||
|
baf3d1dc0a | ||
|
9ffb659a29 | ||
|
c7c94fa73e | ||
|
1a64259d4e | ||
|
2fa73716ca | ||
|
2d9152d5d6 | ||
|
3203e334b0 | ||
|
3c95c71037 | ||
|
da9714b5c8 | ||
|
a7c987f91e | ||
|
9cc79dd629 | ||
|
7549148b56 | ||
|
5becc84185 | ||
|
db2a7aabf9 | ||
|
cb352236d9 | ||
|
1e085eeb89 | ||
|
353a4edc6e | ||
|
31fdb8d993 | ||
|
893f78406d | ||
|
afde166737 | ||
|
e8375af8ff | ||
|
fbcb02294f | ||
|
dc89b7bf7b | ||
|
0e795b0597 | ||
|
4745f3c6ae | ||
|
df57f6bea3 | ||
|
8e1dac8274 | ||
|
b045eff215 | ||
|
f7a3c9be64 | ||
|
d3a0a0eeab | ||
|
2229243bdf | ||
|
a2979ead8d | ||
|
3b170aa895 | ||
|
66c59e2c54 | ||
|
7fca7a731d | ||
|
97800f6618 | ||
|
9c57566224 | ||
|
095cb950db | ||
|
b9a325a19f | ||
|
8906471733 | ||
|
55bfbcb92b | ||
|
55809d1394 | ||
|
a930afc71b | ||
|
6ff68ce9ad | ||
|
b8e3f1cfb7 | ||
|
361f4288eb | ||
|
defde6bc66 | ||
|
806ad81958 | ||
|
5f4d182091 | ||
|
7e0bac9d7d | ||
|
df18cc7aa1 | ||
|
10bd1f7d3b | ||
|
c079af66c8 | ||
|
6ad0a7d52f | ||
|
11624aa059 | ||
|
5d262fdda8 | ||
|
829a2e9521 | ||
|
ad3628fa86 | ||
|
781a8d7f3e | ||
|
03dc5fadef | ||
|
deab0851ff | ||
|
047b6c71d6 | ||
|
dedead3227 | ||
|
96c2a0dd74 | ||
|
92c6baaff2 | ||
|
c2ca375c56 | ||
|
a9c9588480 | ||
|
50415ad7ee | ||
|
5cb837400e | ||
|
378964d49d | ||
|
3a69bca110 | ||
|
a1abca322f | ||
|
30715fa195 | ||
|
8db4a5d27a | ||
|
82a99c692c | ||
|
467175ab3f | ||
|
e7308074d8 | ||
|
e713a90b3f | ||
|
cc4d99cfb7 | ||
|
819850ff06 | ||
|
c3112d560e | ||
|
b553626907 | ||
|
7a4523c810 | ||
|
81a220373b | ||
|
21e3e3bc75 | ||
|
305c49a1a9 | ||
|
5cc18d7986 | ||
|
be3eff6271 | ||
|
59953bf4ba | ||
|
1e510b1e2d | ||
|
29825f5fc4 | ||
|
70eca0fa29 | ||
|
4a36f6b0a2 | ||
|
8f7ed3f3a5 | ||
|
d6a54ad7c8 | ||
|
a78303202f | ||
|
e6c222e712 | ||
|
41b2b34b1b | ||
|
927773c764 | ||
|
3eddc6bc00 | ||
|
9b89d98dac | ||
|
0da1f4c072 | ||
|
a55e4e4260 | ||
|
7d36c6a8eb | ||
|
3a41827a6d | ||
|
831faf970a | ||
|
178d7ec235 | ||
|
99d471a5db | ||
|
8060b0be0e | ||
|
681e441286 | ||
|
ff0d9d83cd | ||
|
8a46124968 | ||
|
d4adf63ba3 | ||
|
59ee63e934 | ||
|
15b239c0eb | ||
|
dc2819335f | ||
|
0ce4fad6ae | ||
|
010eb424bb | ||
|
498ace9e1f | ||
|
e4e83f385a | ||
|
cf9a878b54 | ||
|
8a7afe4dfe | ||
|
a81a4db388 | ||
|
e559e76ed9 | ||
|
bc521497d3 | ||
|
378a3872eb | ||
|
644cb5372c | ||
|
a4a44612a6 | ||
|
50f5d508a8 | ||
|
43c05cf8e1 | ||
|
6285e36ba0 | ||
|
67cff9dc2f | ||
|
b1b592ad75 | ||
|
819d77af7c | ||
|
47c9446614 | ||
|
01705e98c1 | ||
|
76a93e31dd | ||
|
486a594182 | ||
|
8237a1c052 | ||
|
9be4fc3cea | ||
|
741f81ac6f | ||
|
29263adce4 | ||
|
3393bed9b4 | ||
|
343ce358df | ||
|
aa0f7b67fd | ||
|
57d7f9888e | ||
|
db56793066 | ||
|
c97c00543b | ||
|
a4c1cdc9dc | ||
|
bc5443ba07 | ||
|
9154a136d5 | ||
|
47b378bd88 | ||
|
3dccf96eab | ||
|
e6893d5d28 | ||
|
3b6c95eb5f | ||
|
b5a3a81b9c | ||
|
223b7504a2 | ||
|
26822b76fa | ||
|
456e5c2107 | ||
|
620c9408b8 | ||
|
9d1eeb0bf2 | ||
|
dcf6360308 | ||
|
3b861ac783 | ||
|
335d3a472a | ||
|
817270659e | ||
|
5b077ec744 | ||
|
7e173fdcef | ||
|
fee043161b | ||
|
a2e4a628ee | ||
|
0d5f4ba3b0 | ||
|
33c6e437f5 | ||
|
8c3a71838a | ||
|
cc8ce392c5 | ||
|
c655dbdd89 | ||
|
6493d270f2 | ||
|
c4b330b35d | ||
|
171284c29a | ||
|
e1a4589263 | ||
|
c533405853 | ||
|
3b0265a32c | ||
|
91d6301a7b | ||
|
363868e5eb | ||
|
26ee65c723 | ||
|
99953df064 | ||
|
e3e99f92bd | ||
|
c0a4dfbb0a | ||
|
b4aa9fec65 | ||
|
9c8d71beb8 | ||
|
8dda1e5b25 | ||
|
fffa9fbcb9 | ||
|
af579c91c2 | ||
|
70cab5b769 | ||
|
6c1483e3ec | ||
|
1be2473f59 | ||
|
4325471812 | ||
|
5a10553d6f | ||
|
f99bfeea73 | ||
|
21324807f5 | ||
|
afc89ff455 | ||
|
8e4ac1a068 | ||
|
b4a980f4f5 | ||
|
325cf48f5a | ||
|
1748289348 | ||
|
cc87a04c9d | ||
|
f87a111f9e | ||
|
75b16a30bd | ||
|
05f32fc39e | ||
|
dc3065a56f | ||
|
1f602af615 | ||
|
25fab0dca9 | ||
|
e7b54c0721 | ||
|
f70f1f25da | ||
|
0cdb0b9666 | ||
|
9f9a581228 | ||
|
a3a08bd84e | ||
|
4afa6df339 | ||
|
8116a0c55e | ||
|
75c25a8219 | ||
|
06354b5621 | ||
|
346d8899f3 | ||
|
264f22613c | ||
|
173ca738fd | ||
|
b94d29a7a1 | ||
|
43c742d005 | ||
|
bbe645133b | ||
|
34a0dc614e | ||
|
28117f2426 | ||
|
63ab3daed9 | ||
|
5440a04fa8 | ||
|
7dd1ae1114 | ||
|
eafd76b02c | ||
|
e9793aef3c | ||
|
7f580b6380 | ||
|
6859e6fcca | ||
|
6b5a8c7d98 | ||
|
14eacdd46a | ||
|
e273c962f8 | ||
|
9daaea2854 | ||
|
ebc0b15552 | ||
|
32a2c06eed | ||
|
79b83ef085 | ||
|
b7276b44ce | ||
|
89360a8c87 | ||
|
1bb592b878 | ||
|
1918a4c47f | ||
|
bafddbe882 | ||
|
ccc20afae9 | ||
|
2e9c0c010a | ||
|
600b3983e9 | ||
|
2cdb6fdb13 | ||
|
75722dbab8 | ||
|
94aff5ff86 | ||
|
a78a8f7fd5 | ||
|
4609ee2ef8 | ||
|
132276cf0d | ||
|
7708a26720 | ||
|
e02c72fa45 | ||
|
52d16c5e3b | ||
|
52b7ece54c | ||
|
f18eaf2687 | ||
|
4e4e981fe6 | ||
|
97660d4213 | ||
|
9b6b9e0c9c | ||
|
f4f5d5697d | ||
|
bc855d0932 | ||
|
f605c2584f | ||
|
9b5933bcbc | ||
|
ea098413d0 | ||
|
6a7d4d7190 | ||
|
9fc3681aeb | ||
|
54eaf0c8b2 | ||
|
5a5cdd3142 | ||
|
f718689984 | ||
|
80442e9470 | ||
|
3de9120b03 | ||
|
f7aeba1cdd | ||
|
58862dfa1a | ||
|
105fbe1ffa | ||
|
d5c87edd82 | ||
|
527343602e | ||
|
0597e7f977 | ||
|
7816e624f3 | ||
|
947848a1dd | ||
|
6a121452ee | ||
|
5a9f61010b | ||
|
fa89dabe0b | ||
|
e0da84df05 | ||
|
3e09bcfd02 | ||
|
ebe1d1579b | ||
|
993b016d6c | ||
|
6daba577e9 | ||
|
d87887c1b7 | ||
|
404aba09e5 | ||
|
6a74af89fc | ||
|
557844d031 | ||
|
6c4ebcda60 | ||
|
153bc803a8 | ||
|
cc5bd48eff | ||
|
0eabd3c635 | ||
|
9aee0061fe | ||
|
90f58090f6 | ||
|
96ad3e4eb4 | ||
|
d51aa8d87b | ||
|
316ef03b27 | ||
|
07977ff28e | ||
|
c3b8bf3fb5 | ||
|
cf63f3d3ae | ||
|
79f45cf784 | ||
|
115de22f78 | ||
|
a8988cb339 | ||
|
f450b5cf10 | ||
|
f8ab85ae72 | ||
|
d1cd787b75 | ||
|
15c1210982 | ||
|
65f3f920ba | ||
|
08bee49e39 | ||
|
1f3d991197 | ||
|
7c2b62db91 | ||
|
bf0e8244d9 | ||
|
80332672ab | ||
|
30d560f4cf | ||
|
f2a1b1bd23 | ||
|
a9dce709f5 | ||
|
5064e6eff3 | ||
|
11aac4baa6 | ||
|
633566f6ef | ||
|
18cea8715a | ||
|
d51beb8834 | ||
|
3ad2d97259 | ||
|
4bd5322403 | ||
|
05059b3a48 | ||
|
8279e59a61 | ||
|
4a9eae369e | ||
|
9b59b90cda | ||
|
abc505b493 | ||
|
5149f75b93 | ||
|
3c771d6191 | ||
|
8a540c887c | ||
|
54429bb380 | ||
|
c45ead7b4b | ||
|
6ae2a4b72f | ||
|
e8f5903971 | ||
|
33c2a4b7e2 | ||
|
04abe4bc8f | ||
|
9859d369b4 | ||
|
6d99eb3e37 | ||
|
05492dd1eb | ||
|
fef0a330e9 | ||
|
add4bb4044 | ||
|
50eeb96fbe | ||
|
b39fc8d7b1 | ||
|
43147cef6c | ||
|
c91922129f | ||
|
fb5b13210e | ||
|
fa36fe3680 | ||
|
ddeca22ce8 | ||
|
70ee369088 | ||
|
10f9d5a25b | ||
|
030e504664 | ||
|
d029969fcc | ||
|
c5a8bc105c | ||
|
e734e438fc | ||
|
828ed945a7 | ||
|
e5abfc486b | ||
|
a0421c774c | ||
|
bc31c60fff | ||
|
0b898d4558 | ||
|
50e02008a0 | ||
|
dc168f05b4 | ||
|
92258cc146 | ||
|
db6634e0d5 | ||
|
c730fa076c | ||
|
1125dc3f5c | ||
|
b2b510728e | ||
|
52b62ccea8 | ||
|
969e35994d | ||
|
4358b585f1 | ||
|
5c68088294 | ||
|
2035ad112e | ||
|
e6c287cc2b | ||
|
c0ac3149bf | ||
|
523b9ce4fd | ||
|
996173c401 | ||
|
39bc0347fd | ||
|
9d529fa05c | ||
|
069a4f3c95 | ||
|
5acec11245 | ||
|
9cea4218b1 | ||
|
745817ffbc | ||
|
6552c7af6c | ||
|
39e00125e5 | ||
|
42f03e67d1 | ||
|
cf5d50573f | ||
|
6ceb105f1e | ||
|
295ebfd081 | ||
|
a95a6eb4aa | ||
|
7b377ed9b6 | ||
|
ae4c09a83b | ||
|
9005f2edfd | ||
|
531030e2d2 | ||
|
eddb964405 | ||
|
06f5d9758f | ||
|
834f138686 | ||
|
9f6986b3e2 | ||
|
665e6a8753 | ||
|
a50cf60efe | ||
|
ef0f138756 | ||
|
6af350d428 | ||
|
4dd10327d2 | ||
|
f4854380c1 | ||
|
854386fd92 | ||
|
d6b7a9285c | ||
|
60f8c22b25 | ||
|
a6e13ce4f3 | ||
|
80dc1dd378 | ||
|
760fdb6755 | ||
|
849c353a39 | ||
|
7546ba03f3 | ||
|
8fee630648 | ||
|
853c39d78b | ||
|
56ba039411 | ||
|
dda522bf4f | ||
|
2f769cb93b | ||
|
82c91ef51f | ||
|
ecb7235d76 | ||
|
af4bfc044f | ||
|
fe03e62800 | ||
|
bb5521a9f3 | ||
|
641ed513f8 | ||
|
16fc7c4524 | ||
|
cbaa866f0a | ||
|
cd5dea50f8 | ||
|
54a8a78e3b | ||
|
e19a8aea87 | ||
|
ba5787676d | ||
|
26564cf29d | ||
|
29014baaa5 | ||
|
c5c0121402 | ||
|
e1379e29e2 | ||
|
d0cf495347 | ||
|
a6a68df85b | ||
|
3681c515e2 | ||
|
4b5a7d3d09 | ||
|
61011e917f | ||
|
c6a6bbbf63 | ||
|
8a536fa330 | ||
|
3f0df5c401 | ||
|
61053de43b | ||
|
2e61f68141 | ||
|
b8c73e75d0 | ||
|
617fb24fc9 | ||
|
759d51f229 | ||
|
f4c90fdfaf | ||
|
171d613212 | ||
|
a237d7ed48 | ||
|
6f45066bd8 | ||
|
7c9cc57c02 | ||
|
a970aa7a50 | ||
|
eecc043f6c | ||
|
d483da3c76 | ||
|
436bb9f539 | ||
|
e57ee9bb0c | ||
|
7d73178688 | ||
|
d2499ec278 | ||
|
c1bf673475 | ||
|
81769ae053 | ||
|
61d31e9528 | ||
|
08e8a24d33 | ||
|
14980f5162 | ||
|
7c5e27c0e5 | ||
|
e7aab1094d | ||
|
b7d403419e | ||
|
359bd4d1a2 | ||
|
a7ea63e21f | ||
|
ad78ab8c50 | ||
|
4ca056ea2b | ||
|
a962cdf410 | ||
|
08295a040c | ||
|
378c9833b7 | ||
|
463c2e5bc7 | ||
|
b1d3206523 | ||
|
cbfc9df676 | ||
|
fd4081aa33 | ||
|
b5a4975771 | ||
|
2a1cf3e9ad | ||
|
5644933fa6 | ||
|
93febff2f3 | ||
|
02f935fbab | ||
|
d7a80cf5cd | ||
|
31b7522e2b | ||
|
f5f93ea573 | ||
|
8f93a29f8e | ||
|
d9485f89b8 | ||
|
28e88942bc | ||
|
5486c1a283 | ||
|
147adf0a3a | ||
|
8af53fb428 | ||
|
b348c1dac1 | ||
|
d63f7562cf | ||
|
2a69b4e849 | ||
|
4f0cd9b61e | ||
|
92d21a8a07 | ||
|
6b81fbd8de | ||
|
3368424ae8 | ||
|
de160b0647 | ||
|
ad02525dad | ||
|
4542739ccb | ||
|
2233af93b0 | ||
|
16a81f6fe7 | ||
|
2dd8d2d7f0 | ||
|
378b042b98 | ||
|
785d8330bb | ||
|
8639b30da1 | ||
|
c98543210a | ||
|
38b36b4c67 | ||
|
0e2132fd88 | ||
|
b1c673942d | ||
|
bd3f83f763 | ||
|
f3140390f9 | ||
|
8145496b9b | ||
|
b40bf35c76 | ||
|
c961c0cfca | ||
|
2a686bd333 | ||
|
e608ff58de | ||
|
9a183206da | ||
|
2e53e220c2 | ||
|
15506ffe15 | ||
|
47a8a4d5cc | ||
|
68a9527d51 | ||
|
1a81eea8d4 | ||
|
90adbcca75 | ||
|
bb650010c8 | ||
|
ccd4deab6b | ||
|
d18c8d3d94 | ||
|
17709275f9 | ||
|
98c4eb3910 | ||
|
fb52c2b671 | ||
|
dbea442a15 | ||
|
b77afb41f3 | ||
|
bd72306dc8 | ||
|
6346588525 | ||
|
191abe25ad | ||
|
5a5f4ba417 | ||
|
f785bfddbd | ||
|
b8ec69e863 | ||
|
441dfa1d99 | ||
|
342a2719e0 | ||
|
8e3d083ba0 | ||
|
5992e60b96 | ||
|
83dcd78142 | ||
|
05cc594ad2 | ||
|
a7f8eb6d0f | ||
|
c6ba246b98 | ||
|
9f1b1b78e1 | ||
|
eb4083ef0b | ||
|
6c4f5ea559 | ||
|
7ecb75b78e | ||
|
ca08b543ec | ||
|
76046d7390 | ||
|
0cb6a6e451 | ||
|
d642a7226f | ||
|
f005ea42f0 | ||
|
d536aafb14 | ||
|
992527a573 | ||
|
6580df1b72 | ||
|
c7554da8a9 | ||
|
5d36cf23a7 | ||
|
dbecee02ed | ||
|
d1b7ed6792 | ||
|
e80118cfb9 | ||
|
ce457f1245 | ||
|
e3f6cbd99c | ||
|
dd0ef3324b | ||
|
c8eb817283 | ||
|
414b7b4016 | ||
|
e229d82e0e | ||
|
0f767c96b2 | ||
|
f7b3c5ec4c | ||
|
8cdd754651 | ||
|
ce2fe5bc8a | ||
|
102798af35 | ||
|
8b34b16301 | ||
|
a14670e28e | ||
|
96360917d3 | ||
|
d8b48f4de9 | ||
|
9b13595038 | ||
|
551fe9528a | ||
|
a1f1afe401 | ||
|
c1df0a3b58 | ||
|
acf0c9acfc | ||
|
07d02e9ee0 | ||
|
2a015b8917 | ||
|
6b4f099df5 | ||
|
cdb11cb99e | ||
|
88c23b64c7 | ||
|
02c7347b7f | ||
|
d2ea08b9e1 | ||
|
b2c3b76648 | ||
|
8b6fd08a41 | ||
|
c12291f32c | ||
|
466e87bd8c | ||
|
e3b81044ee | ||
|
fa3b08caf1 | ||
|
abbb59e8eb | ||
|
2d2dd913b7 | ||
|
48eba62925 | ||
|
4af1a3931e | ||
|
3ddb5c284b | ||
|
c76f52c9c8 | ||
|
b3eb9bf553 | ||
|
f252b6587c | ||
|
1693108cfe | ||
|
f705f97d31 | ||
|
0727e0a7f8 | ||
|
216d173fba | ||
|
76ff8ed673 | ||
|
9076e56d93 | ||
|
399a4fe570 | ||
|
2d76b6d8c3 | ||
|
764471557e | ||
|
badea31707 | ||
|
67393addd8 | ||
|
f6eaf52a45 | ||
|
7e7e2b4e9a | ||
|
c9f7896861 | ||
|
cd632a8617 | ||
|
480f42ec8e | ||
|
f8087c0d2c | ||
|
37867b24f6 | ||
|
7b2d175c47 | ||
|
47239bd6b6 | ||
|
72fa3e8a21 | ||
|
30c45bdd06 | ||
|
7058b79442 | ||
|
bdba6fdc0d | ||
|
46ba1bb26d | ||
|
609da8bbad | ||
|
5050b626e5 | ||
|
552240ce17 | ||
|
b7452b3a0e | ||
|
c1dda21b64 | ||
|
5bcdac458c | ||
|
632e5b636d | ||
|
a6c2e2c765 | ||
|
e6733873f5 | ||
|
0fa5ce0c76 | ||
|
9092371c0a | ||
|
e26d5213ec | ||
|
f2ccaa2279 | ||
|
75cbbafdeb | ||
|
a023b456b4 | ||
|
733f486aac | ||
|
03cebc22cb | ||
|
b62f94ff48 | ||
|
7660b85c31 | ||
|
fab3f50eb7 | ||
|
f06db45d64 | ||
|
fa5f72b36f | ||
|
0024ec5086 | ||
|
8c64c153a0 | ||
|
5ab9534bc6 | ||
|
aea9f6d5d3 | ||
|
a616619755 | ||
|
8d3a53745e | ||
|
34c76c8155 | ||
|
32efa676be | ||
|
c0d5ae7447 | ||
|
5647b95a66 | ||
|
87d3473070 | ||
|
cb949fa96c | ||
|
65aeaf19f6 | ||
|
49a70977b3 | ||
|
58afa32bf4 | ||
|
fdf19d289f | ||
|
4dd2530846 | ||
|
6fa2dd0eb9 | ||
|
e8ddc5bda1 | ||
|
00d153468c | ||
|
aa67a27af1 | ||
|
d174f457e6 | ||
|
e55a667c1c | ||
|
8c58338193 | ||
|
8e34db1d94 | ||
|
adbd3cbc71 | ||
|
4215a4386e | ||
|
39013ba095 | ||
|
861a14e13c | ||
|
092d7f88f6 | ||
|
0e5ab03007 | ||
|
01078b2b22 | ||
|
badcaaaf32 | ||
|
0b14a7bdfd | ||
|
24b3a55485 | ||
|
d774f9161c | ||
|
69c928ef47 | ||
|
fe295b0d3e | ||
|
9812391356 | ||
|
6d50049a5c | ||
|
92f4e151a6 | ||
|
31002e44b5 | ||
|
d7e918b594 | ||
|
b372319fa0 | ||
|
047c5f3e6d | ||
|
e5280d4fa4 | ||
|
61a0b9059a | ||
|
09b86e698c | ||
|
6ab069f2b6 | ||
|
c4106e3b2f | ||
|
385fa87513 | ||
|
0df7cb7e43 | ||
|
c8b431ad4b | ||
|
412b97cc9a | ||
|
532ae0f6ff | ||
|
d836b8bcf2 | ||
|
d84cc8c13b | ||
|
40f00746d2 | ||
|
4ecdf8fc40 | ||
|
b928bd059f | ||
|
ce3b4b90c5 | ||
|
7c310bc89f | ||
|
18bab03e69 | ||
|
be242e631b | ||
|
855f31ebe7 | ||
|
b91fd70410 | ||
|
c4ec0ce820 | ||
|
125817d0e3 | ||
|
c905c0d60f | ||
|
33e61c47c0 | ||
|
e606c82297 | ||
|
d65cbb3788 | ||
|
6b06226335 | ||
|
192f8ddc0b | ||
|
c43507b0fe | ||
|
56d152b225 | ||
|
01ba4b6713 | ||
|
deda45e8c2 | ||
|
5ca930b18b | ||
|
8174149440 | ||
|
5a1c7626d1 | ||
|
38d377e230 | ||
|
055de35012 | ||
|
ee864b6db4 | ||
|
e2dc45d8f1 | ||
|
cdf068a42c | ||
|
be33a1c726 | ||
|
f9efaa8b62 | ||
|
ec5006bdc6 | ||
|
6e7b8bcbd7 | ||
|
e678981e9a | ||
|
0a5af992db | ||
|
7890307b53 | ||
|
1a74f5615b | ||
|
538a0c0de2 | ||
|
f89919f5e9 | ||
|
a757b4a725 | ||
|
ca88598dd1 | ||
|
df08c3b5a3 | ||
|
cc9ffc23f3 | ||
|
6d020baf20 | ||
|
7450674943 | ||
|
fd91cec141 | ||
|
39affc0451 | ||
|
0475aefcb4 | ||
|
698dd55ced | ||
|
8f98c051f9 | ||
|
8d7bfa660d | ||
|
cb5ec61f65 | ||
|
3d63133a5e | ||
|
696d13ee0e | ||
|
4738d6746b | ||
|
88f67c2242 | ||
|
823b6635f6 | ||
|
e8f6339b51 | ||
|
28bf2f3c66 | ||
|
886f61cacb | ||
|
ccc8c01a11 | ||
|
f4322df68b | ||
|
e4f9c52180 | ||
|
c8db4e1560 | ||
|
d63c9ecf46 | ||
|
936632d3b2 | ||
|
85bf679acc | ||
|
c105dda081 | ||
|
a48b659563 | ||
|
2e91a01aea | ||
|
72a061ccd2 | ||
|
63e0279662 | ||
|
041254895c | ||
|
c741d33feb | ||
|
a68962fc90 | ||
|
d8a4b666cf | ||
|
24ad931818 | ||
|
359fb29e43 | ||
|
93daabe060 | ||
|
cde242b856 | ||
|
7df24e7868 | ||
|
69ce77e25a | ||
|
0db8bb5866 | ||
|
39b61aa3eb | ||
|
56c6fc01a9 | ||
|
c1dc9f8394 | ||
|
a0369cb367 | ||
|
bc9e85a319 | ||
|
0d045709bc | ||
|
6714afd94c | ||
|
6fe7685d0c | ||
|
13dd765c70 | ||
|
0f1fbeb810 | ||
|
f94560fec9 | ||
|
f0e9eda2a5 | ||
|
3e54156282 | ||
|
d38819f56f | ||
|
f08b7bec7f | ||
|
86033c4b6f | ||
|
d71789cc5b | ||
|
9ac4391323 | ||
|
ae765fde7b | ||
|
20c81bed84 | ||
|
e960c20e38 | ||
|
1c8c91463f | ||
|
914e69451f | ||
|
8b31a4a3dc | ||
|
30083ad8e7 | ||
|
c0da0dbabf | ||
|
72be9a3a27 | ||
|
404ac4c67d | ||
|
eb41aed90a | ||
|
9f7617cad6 | ||
|
169c011352 | ||
|
001ad728a4 | ||
|
701bc6cab5 | ||
|
5d3f234b6b | ||
|
0871b34352 | ||
|
b03466749c | ||
|
c37cba8974 | ||
|
9861f022c3 | ||
|
4e1fd51de7 | ||
|
5d2ad2f1db | ||
|
7719a100f7 | ||
|
b8f434e731 | ||
|
d7330233fd | ||
|
56b1244c21 | ||
|
4794d69c84 | ||
|
b5c3f53e15 | ||
|
88bee7e621 | ||
|
abb6edd197 | ||
|
3087eaea04 | ||
|
bdee9d109c | ||
|
87f0efe2d7 | ||
|
a9fdf82418 | ||
|
4a11340a1c | ||
|
c71b212607 | ||
|
29392c81aa | ||
|
b2df5ddf6a | ||
|
97a8589874 | ||
|
b6a9c1fe89 | ||
|
23a5584da6 | ||
|
6e26499721 | ||
|
f030b28c93 | ||
|
261205e4e5 | ||
|
c5bc21bd1f | ||
|
744b73167b | ||
|
0ad2a19e42 | ||
|
a41b5c2fd4 | ||
|
e3a50b565b | ||
|
aa05661d10 | ||
|
36b89edff4 | ||
|
fe9183e785 | ||
|
c5dc89a1b1 | ||
|
261fb04124 | ||
|
b70362998b | ||
|
b5085b0273 | ||
|
5edb3cb52d | ||
|
bb5b728505 | ||
|
9390546335 | ||
|
68f146206f | ||
|
419c224122 | ||
|
64b989fe0b | ||
|
06b5b35265 | ||
|
45d23373e0 | ||
|
9bc9312015 | ||
|
5a572f6c0a | ||
|
be4bb86efd | ||
|
cb738b8baf | ||
|
79e6631727 | ||
|
a19918eb35 | ||
|
f8a280159d | ||
|
9f556d1dd6 | ||
|
e216f7c8cf | ||
|
fab86f26bf | ||
|
d12dce0f7f | ||
|
bc3863bd16 | ||
|
9f7a07ab9f | ||
|
7de1a0d196 | ||
|
13ab552e4d | ||
|
3c77aabe59 | ||
|
20160a32ea | ||
|
e74d43ab63 | ||
|
18138662ef | ||
|
bb596005f5 | ||
|
d43eb2a0d5 | ||
|
1e93d59553 | ||
|
2ee322d90c | ||
|
a6cdd52188 | ||
|
676e9e35f2 | ||
|
b9dac1ab88 | ||
|
a61c912241 | ||
|
e0666bdc7b | ||
|
48e9cac2ad | ||
|
f8e1a81f3e | ||
|
de4a74e2d0 | ||
|
58261d9a7a | ||
|
53143e5480 | ||
|
084314581d | ||
|
114cdc750b | ||
|
f10b672bd8 | ||
|
26ef973fa2 | ||
|
b33df83245 | ||
|
f9b5691a1b | ||
|
86ed9a0dc7 | ||
|
afbd54e0d7 | ||
|
efb2c52f8c | ||
|
35c7138631 | ||
|
4976f9967a | ||
|
365271b573 | ||
|
ddaa6e899b | ||
|
3c69a2ec86 | ||
|
9c49977bd6 | ||
|
0e6383ef7e | ||
|
aeb6ebe2a5 | ||
|
a1c882c99d | ||
|
ef5fcb0905 | ||
|
ae4ccf12b6 | ||
|
6cd674726b | ||
|
ba142bfbfa | ||
|
ff7282e135 | ||
|
e6cac2dff4 | ||
|
25107357ef | ||
|
b5dc8fdbfd | ||
|
4f767c1e8f | ||
|
bbd321ffc2 | ||
|
0daf5e6be2 | ||
|
7fd3acaf54 | ||
|
75aa19469b | ||
|
750040fabb | ||
|
162f6b2aee | ||
|
d6c11fa975 | ||
|
ca152e4cf4 | ||
|
ef316e23c9 | ||
|
b483f5fed2 | ||
|
549cc3a835 | ||
|
23ec96e3f5 | ||
|
72e610241a | ||
|
58e8013e82 | ||
|
87eaa6f666 | ||
|
5f48b3adcc | ||
|
e602dae828 | ||
|
74fa325376 | ||
|
6682e732a6 | ||
|
aea37008b7 | ||
|
b2ddcd05fc | ||
|
45e6e6f8ab | ||
|
28f15a1f70 | ||
|
c4fa5aa7b0 | ||
|
08291defc2 | ||
|
207ddcc988 | ||
|
006b7af2b2 | ||
|
ab63e6ae49 | ||
|
0bdd807424 | ||
|
535920ff93 | ||
|
e570a44b37 | ||
|
ac6e0eb154 | ||
|
15c6269f89 | ||
|
f77bbb455f | ||
|
a34ef99baa | ||
|
0d3abce0d8 | ||
|
a56a1234a5 | ||
|
ccee328e0b | ||
|
5ec9d741e0 | ||
|
f262b25c93 | ||
|
cb6e26b88e | ||
|
dedf5d9f66 | ||
|
b5d59f11f0 | ||
|
9c26fe83eb | ||
|
655c20fcd5 | ||
|
66c72081f7 | ||
|
8299991033 | ||
|
bc94d944d0 | ||
|
23205be83c | ||
|
bb8bd6ef8a | ||
|
b2fde0cfed | ||
|
065761f297 | ||
|
b17b3870ac | ||
|
2a91055427 | ||
|
0edbcd6041 | ||
|
c04c7a3d0a | ||
|
42b0d8b96d | ||
|
c3a58b249e | ||
|
47b6ebde09 | ||
|
19fb58e85b | ||
|
33046a8283 |
12
.cvsignore
12
.cvsignore
@@ -1,12 +0,0 @@
|
|||||||
.gdb_history
|
|
||||||
config.cache
|
|
||||||
configarg.cache
|
|
||||||
config.status
|
|
||||||
wx-config
|
|
||||||
config.log
|
|
||||||
stamp-h.in
|
|
||||||
Makefile
|
|
||||||
setup.h
|
|
||||||
*tags
|
|
||||||
.DS_Store
|
|
||||||
autom4te.cache
|
|
262
BuildCVS.txt
262
BuildCVS.txt
@@ -1,262 +0,0 @@
|
|||||||
------------------------------------------------------------------------
|
|
||||||
How to build the sources from CVS
|
|
||||||
------------------------------------------------------------------------
|
|
||||||
|
|
||||||
Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
|
|
||||||
etc. alongside these instructions.
|
|
||||||
|
|
||||||
I) Windows using plain makefiles
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
a) If using Microsoft Visual C++ 5.0 or 6.0
|
|
||||||
|
|
||||||
Ensure that the command-line compiler and tools (including
|
|
||||||
nmake) are installed and ready to run. Depending on your
|
|
||||||
installation there may be a batch file (commonly named VCVARS32.BAT)
|
|
||||||
that needs to be run to set correct environment variables and PATH entries.
|
|
||||||
|
|
||||||
Continue with item c) below.
|
|
||||||
|
|
||||||
|
|
||||||
b) If using the MinGW or Cygwin compilers
|
|
||||||
|
|
||||||
You can get MinGW from http://www.mingw.org/
|
|
||||||
|
|
||||||
Cygwin is available at http://www.cygwin.com/
|
|
||||||
|
|
||||||
If you are using Cygwin or MinGW together with the MSYS environment, you
|
|
||||||
can build the library using configure (see "Unix ports" and
|
|
||||||
"Windows using configure" below). You can also
|
|
||||||
build wxWidgets without configure using native makefile, but only with
|
|
||||||
MinGW. Using Cygwin together with Windows makefile is no longer supported.
|
|
||||||
|
|
||||||
If building with MinGW without configure:
|
|
||||||
|
|
||||||
-> Set your path so that it includes the directory
|
|
||||||
where your compiler and tools reside
|
|
||||||
|
|
||||||
-> Make sure you have GNU Make installed. It must be Windows native version.
|
|
||||||
Download it from http://www.mingw.org, the executable will be called
|
|
||||||
mingw32-make.exe.
|
|
||||||
|
|
||||||
-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
|
|
||||||
but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
|
|
||||||
have to change variable GCC_VERSION in config.gcc (see msw/install.txt
|
|
||||||
for details).
|
|
||||||
|
|
||||||
If using configure, Unix instructions apply.
|
|
||||||
|
|
||||||
|
|
||||||
c) Build instructions
|
|
||||||
|
|
||||||
Assumming that you installed the wxWidgets sources
|
|
||||||
into c:\wxWidgets:
|
|
||||||
|
|
||||||
-> Copy c:\wxWidgets\include\wx\msw\setup0.h
|
|
||||||
to c:\wxWidgets\include\wx\msw\setup.h
|
|
||||||
-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
|
|
||||||
the features you would like to compile wxWidgets with[out].
|
|
||||||
|
|
||||||
and std iostreams are disabled with
|
|
||||||
#define wxUSE_STD_IOSTREAM 0
|
|
||||||
|
|
||||||
-> type: cd c:\wxWidgets\build\msw
|
|
||||||
-> type: make -f makefile.gcc (if using GNU tools)
|
|
||||||
or type: nmake -f makefile.vc (if using MS VC++)
|
|
||||||
etc.
|
|
||||||
|
|
||||||
See also docs/msw/install.txt for additional compilation options.
|
|
||||||
|
|
||||||
d) Borland (including free command line tools)
|
|
||||||
Download tools from http://www.borland.com/downloads/
|
|
||||||
|
|
||||||
See docs/msw/install.txt for details; in brief:
|
|
||||||
|
|
||||||
-> type cd c:\wxWidgets\build\msw
|
|
||||||
-> type make -f makefile.bcc
|
|
||||||
|
|
||||||
You can customize many things in the build process, detailed description is
|
|
||||||
in docs/msw/install.txt.
|
|
||||||
|
|
||||||
|
|
||||||
II) Unix ports
|
|
||||||
--------------
|
|
||||||
|
|
||||||
Building wxGTK or wxMotif completely without configure
|
|
||||||
won't ever work, but there is now a new makefile system
|
|
||||||
that works without libtool and automake, using only
|
|
||||||
configure to create what is needed.
|
|
||||||
|
|
||||||
In order to create configure, you need to have the
|
|
||||||
GNU autoconf package (version > 2.54) installed
|
|
||||||
on your system and type run "autoconf" in the base
|
|
||||||
directory (or run the autogen.sh script in the same
|
|
||||||
directory, which just calls autoconf). Note that you usually don't
|
|
||||||
need to do this because configure is included in CVS.
|
|
||||||
|
|
||||||
Set WXWIN environment variable to the base directory such
|
|
||||||
as ~/wxWidgets (this is actually not really needed).
|
|
||||||
|
|
||||||
-> type: export WXWIN=~/wxWidgets
|
|
||||||
-> type: md mybuild
|
|
||||||
-> type: cd mybuild
|
|
||||||
-> type: ../configure --with-motif
|
|
||||||
or type: ../configure --with-gtk
|
|
||||||
-> type: make
|
|
||||||
-> type: su <type root password>
|
|
||||||
-> type: make install
|
|
||||||
-> type: ldconfig
|
|
||||||
-> type: exit
|
|
||||||
|
|
||||||
Call configure with --disable-shared to create a static
|
|
||||||
library. Calling "make uninstall" will remove the installed
|
|
||||||
library and "make dist" will create a distribution (not
|
|
||||||
yet complete).
|
|
||||||
|
|
||||||
III) Windows using configure
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
wxWidgets can be built on Windows using MSYS (see
|
|
||||||
http://www.mingw.org/), which is a POSIX build environment
|
|
||||||
for Windows. With MSYS you can just ./configure && make (see also VII,
|
|
||||||
Unix->Windows cross-compiling using configure).
|
|
||||||
|
|
||||||
Of course, you can also build the library using plain makefiles (see
|
|
||||||
section I).
|
|
||||||
|
|
||||||
IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
Refer to the readme.txt and install.txt files in docs/mac to build
|
|
||||||
wxWidgets under Classic Mac OS using CodeWarrior.
|
|
||||||
|
|
||||||
If you are checking out the CVS sources using cvs under Mac OS X and
|
|
||||||
compiling under Classic Mac OS:
|
|
||||||
|
|
||||||
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
|
|
||||||
CodeWarrior may ignore them. Checking out the CVS sources using cvs
|
|
||||||
under Mac OS X creates untyped files which can lead to compilation
|
|
||||||
errors under CodeWarrior which are hard to track down.
|
|
||||||
|
|
||||||
- convert the xml files to CodeWarrior binary projects using the supplied
|
|
||||||
AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
|
|
||||||
|
|
||||||
V) MacOS X using configure and the Developer Tools
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
You need to have the Developer Tools installed. If this is not the case,
|
|
||||||
you will need to register at the Apple Developer web site (this is a free
|
|
||||||
registration) in order to download the Developer Tools installer.
|
|
||||||
|
|
||||||
In order to create configure, you need to have the
|
|
||||||
GNU autoconf package (version >= 2.54) installed
|
|
||||||
on your system and type run "autoconf" in the base
|
|
||||||
directory (or run the autogen.sh script in the same
|
|
||||||
directory, which just calls autoconf).
|
|
||||||
|
|
||||||
-> type: mkdir macbuild
|
|
||||||
-> type: cd macbuild
|
|
||||||
-> type: ../configure --with-mac
|
|
||||||
or type: ../configure
|
|
||||||
-> type: make
|
|
||||||
|
|
||||||
VI) OS/2
|
|
||||||
----------------------------------------
|
|
||||||
No notes.
|
|
||||||
|
|
||||||
VII) Unix->Windows cross-compiling using configure
|
|
||||||
--------------------------------------------------
|
|
||||||
|
|
||||||
First you'll need a cross-compiler; linux glibc binaries of MinGW and
|
|
||||||
Cygwin (both based on egcs) can be found at
|
|
||||||
ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
|
|
||||||
based on the latest MinGW release can be found at
|
|
||||||
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
|
|
||||||
Otherwise you can compile one yourself.
|
|
||||||
|
|
||||||
[ A Note about Cygwin and MinGW: the main difference is that Cygwin
|
|
||||||
binaries are always linked against cygwin.dll. This dll encapsulates most
|
|
||||||
standard Unix C extensions, which is very handy if you're porting unix
|
|
||||||
software to windows. However, wxMSW doesn't need this, so MinGW is
|
|
||||||
preferable if you write portable C(++). ]
|
|
||||||
|
|
||||||
You might want to build both Unix and Windows binaries in the same source
|
|
||||||
tree; to do this make subdirs for each e.g. unix and win32. If you've
|
|
||||||
already build wxWidgets in the main dir, do a 'make distclean' there,
|
|
||||||
otherwise configure will get confused. (In any case, read the section 'Unix
|
|
||||||
using configure' and make sure you're able to build a native wxWidgets
|
|
||||||
library; cross-compiling errors can be pretty obscure and you'll want to be
|
|
||||||
sure that your configure setup is basically sound.)
|
|
||||||
|
|
||||||
To cross compile the windows library, do
|
|
||||||
-> cd win32
|
|
||||||
(or whatever you called it)
|
|
||||||
Now run configure. There are two ways to do this
|
|
||||||
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
|
|
||||||
where --build= should read whatever platform you're building on. Configure
|
|
||||||
will notice that build and host platforms differ, and automatically prepend
|
|
||||||
i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
|
|
||||||
The other way to run configure is by specifying the names of the binaries
|
|
||||||
yourself:
|
|
||||||
-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
|
|
||||||
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
|
|
||||||
../configure --host=i586-mingw32 --with-mingw
|
|
||||||
|
|
||||||
(all assuming you're using MinGW)
|
|
||||||
By default this will compile a DLL, if you want a static library,
|
|
||||||
specify --disable-shared.
|
|
||||||
|
|
||||||
Type
|
|
||||||
-> make
|
|
||||||
and wait, wait, wait. Don't leave the room, because the minute you do there
|
|
||||||
will be a compile error :-)
|
|
||||||
|
|
||||||
NB: if you are using a very old compiler you risk to get quite a few warnings
|
|
||||||
about "ANSI C++ forbids implicit conversion from 'void *'" in all places
|
|
||||||
where va_arg macro is used. This is due to a bug in (some versions of)
|
|
||||||
MinGW headers which may be corrected by upgrading your compier,
|
|
||||||
otherwise you might edit the file
|
|
||||||
|
|
||||||
${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
|
|
||||||
|
|
||||||
(instead of egcs-2.91.57 you may have something different), searching for
|
|
||||||
the lines
|
|
||||||
|
|
||||||
/* Define __gnuc_va_list. */
|
|
||||||
|
|
||||||
#ifndef __GNUC_VA_LIST
|
|
||||||
#define __GNUC_VA_LIST
|
|
||||||
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
|
|
||||||
typedef char *__gnuc_va_list;
|
|
||||||
#else
|
|
||||||
typedef void *__gnuc_va_list;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
and adding "|| defined(_WIN32)" to the list of platforms on which
|
|
||||||
__gnuc_va_list is char *.
|
|
||||||
|
|
||||||
If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
|
|
||||||
(or just libwx_msw.a if you opted for a static build).
|
|
||||||
Now try building the minimal sample:
|
|
||||||
|
|
||||||
-> cd samples/minimal
|
|
||||||
-> make
|
|
||||||
|
|
||||||
and run it with wine, for example (or copy to a Windows box)
|
|
||||||
-> wine minimal.exe
|
|
||||||
|
|
||||||
If all is well, do an install; from win32
|
|
||||||
-> make install
|
|
||||||
|
|
||||||
Native and cross-compiled installations can co-exist peacefully
|
|
||||||
(as long as their widget sets differ), except for wx-config. You might
|
|
||||||
want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
|
|
||||||
|
|
||||||
Cross-compiling TODO:
|
|
||||||
---------------------
|
|
||||||
- resource compiling must be done manually for now (should/can we link the
|
|
||||||
default wx resources into libwx_msw.a?) [ No we can't; the linker won't
|
|
||||||
link it in... you have to supply an object file ]
|
|
||||||
- static executables are HUGE -- there must be room for improvement.
|
|
||||||
|
|
261
BuildSVN.txt
Normal file
261
BuildSVN.txt
Normal file
@@ -0,0 +1,261 @@
|
|||||||
|
------------------------------------------------------------------------
|
||||||
|
How to build the sources from SVN
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
|
||||||
|
etc. alongside these instructions.
|
||||||
|
|
||||||
|
I) Windows using plain makefiles
|
||||||
|
----------------------------------------
|
||||||
|
|
||||||
|
a) If using Microsoft Visual C++ 5.0 or 6.0
|
||||||
|
|
||||||
|
Ensure that the command-line compiler and tools (including
|
||||||
|
nmake) are installed and ready to run. Depending on your
|
||||||
|
installation there may be a batch file (commonly named VCVARS32.BAT)
|
||||||
|
that needs to be run to set correct environment variables and PATH entries.
|
||||||
|
|
||||||
|
Continue with item c) below.
|
||||||
|
|
||||||
|
|
||||||
|
b) If using the MinGW or Cygwin compilers
|
||||||
|
|
||||||
|
You can get MinGW from http://www.mingw.org/
|
||||||
|
|
||||||
|
Cygwin is available at http://www.cygwin.com/
|
||||||
|
|
||||||
|
If you are using Cygwin or MinGW together with the MSYS environment, you
|
||||||
|
can build the library using configure (see "Unix ports" and
|
||||||
|
"Windows using configure" below). You can also
|
||||||
|
build wxWidgets without configure using native makefile, but only with
|
||||||
|
MinGW. Using Cygwin together with Windows makefile is no longer supported.
|
||||||
|
|
||||||
|
If building with MinGW without configure:
|
||||||
|
|
||||||
|
-> Set your path so that it includes the directory
|
||||||
|
where your compiler and tools reside
|
||||||
|
|
||||||
|
-> Make sure you have GNU Make installed. It must be Windows native version.
|
||||||
|
Download it from http://www.mingw.org, the executable will be called
|
||||||
|
mingw32-make.exe.
|
||||||
|
|
||||||
|
-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
|
||||||
|
but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
|
||||||
|
have to change variable GCC_VERSION in config.gcc (see msw/install.txt
|
||||||
|
for details).
|
||||||
|
|
||||||
|
If using configure, Unix instructions apply.
|
||||||
|
|
||||||
|
|
||||||
|
c) Build instructions
|
||||||
|
|
||||||
|
Assuming that you installed the wxWidgets sources into c:\wxWidgets:
|
||||||
|
|
||||||
|
-> Copy c:\wxWidgets\include\wx\msw\setup0.h
|
||||||
|
to c:\wxWidgets\include\wx\msw\setup.h
|
||||||
|
-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
|
||||||
|
the features you would like to compile wxWidgets with[out].
|
||||||
|
|
||||||
|
and std iostreams are disabled with
|
||||||
|
#define wxUSE_STD_IOSTREAM 0
|
||||||
|
|
||||||
|
-> type: cd c:\wxWidgets\build\msw
|
||||||
|
-> type: make -f makefile.gcc (if using GNU tools)
|
||||||
|
or type: nmake -f makefile.vc (if using MS VC++)
|
||||||
|
etc.
|
||||||
|
|
||||||
|
See also docs/msw/install.txt for additional compilation options.
|
||||||
|
|
||||||
|
d) Borland (including free command line tools)
|
||||||
|
Download tools from http://www.borland.com/downloads/
|
||||||
|
|
||||||
|
See docs/msw/install.txt for details; in brief:
|
||||||
|
|
||||||
|
-> type cd c:\wxWidgets\build\msw
|
||||||
|
-> type make -f makefile.bcc
|
||||||
|
|
||||||
|
You can customize many things in the build process, detailed description is
|
||||||
|
in docs/msw/install.txt.
|
||||||
|
|
||||||
|
|
||||||
|
II) Unix ports
|
||||||
|
--------------
|
||||||
|
|
||||||
|
Building wxGTK or wxMotif completely without configure
|
||||||
|
won't ever work, but there is now a new makefile system
|
||||||
|
that works without libtool and automake, using only
|
||||||
|
configure to create what is needed.
|
||||||
|
|
||||||
|
In order to create configure, you need to have the
|
||||||
|
GNU autoconf package (version > 2.54) installed
|
||||||
|
on your system and type run "autoconf" in the base
|
||||||
|
directory (or run the autogen.sh script in the same
|
||||||
|
directory, which just calls autoconf). Note that you usually don't
|
||||||
|
need to do this because configure is included in SVN.
|
||||||
|
|
||||||
|
Set WXWIN environment variable to the base directory such
|
||||||
|
as ~/wxWidgets (this is actually not really needed).
|
||||||
|
|
||||||
|
-> type: export WXWIN=~/wxWidgets
|
||||||
|
-> type: md mybuild
|
||||||
|
-> type: cd mybuild
|
||||||
|
-> type: ../configure --with-motif
|
||||||
|
or type: ../configure --with-gtk
|
||||||
|
-> type: make
|
||||||
|
-> type: su <type root password>
|
||||||
|
-> type: make install
|
||||||
|
-> type: ldconfig
|
||||||
|
-> type: exit
|
||||||
|
|
||||||
|
Call configure with --disable-shared to create a static
|
||||||
|
library. Calling "make uninstall" will remove the installed
|
||||||
|
library and "make dist" will create a distribution (not
|
||||||
|
yet complete).
|
||||||
|
|
||||||
|
III) Windows using configure
|
||||||
|
----------------------------------------
|
||||||
|
|
||||||
|
wxWidgets can be built on Windows using MSYS (see
|
||||||
|
http://www.mingw.org/), which is a POSIX build environment
|
||||||
|
for Windows. With MSYS you can just ./configure && make (see also VII,
|
||||||
|
Unix->Windows cross-compiling using configure).
|
||||||
|
|
||||||
|
Of course, you can also build the library using plain makefiles (see
|
||||||
|
section I).
|
||||||
|
|
||||||
|
IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
|
||||||
|
----------------------------------------
|
||||||
|
|
||||||
|
Refer to the readme.txt and install.txt files in docs/mac to build
|
||||||
|
wxWidgets under Classic Mac OS using CodeWarrior.
|
||||||
|
|
||||||
|
If you are checking out the SVN sources using svn under Mac OS X and
|
||||||
|
compiling under Classic Mac OS:
|
||||||
|
|
||||||
|
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
|
||||||
|
CodeWarrior may ignore them. Checking out the SVN sources using svn
|
||||||
|
under Mac OS X creates untyped files which can lead to compilation
|
||||||
|
errors under CodeWarrior which are hard to track down.
|
||||||
|
|
||||||
|
- convert the xml files to CodeWarrior binary projects using the supplied
|
||||||
|
AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
|
||||||
|
|
||||||
|
V) MacOS X using configure and the Developer Tools
|
||||||
|
----------------------------------------
|
||||||
|
|
||||||
|
You need to have the Developer Tools installed. If this is not the case,
|
||||||
|
you will need to register at the Apple Developer web site (this is a free
|
||||||
|
registration) in order to download the Developer Tools installer.
|
||||||
|
|
||||||
|
In order to create configure, you need to have the
|
||||||
|
GNU autoconf package (version >= 2.54) installed
|
||||||
|
on your system and type run "autoconf" in the base
|
||||||
|
directory (or run the autogen.sh script in the same
|
||||||
|
directory, which just calls autoconf).
|
||||||
|
|
||||||
|
-> type: mkdir macbuild
|
||||||
|
-> type: cd macbuild
|
||||||
|
-> type: ../configure --with-mac
|
||||||
|
or type: ../configure
|
||||||
|
-> type: make
|
||||||
|
|
||||||
|
VI) OS/2
|
||||||
|
----------------------------------------
|
||||||
|
No notes.
|
||||||
|
|
||||||
|
VII) Unix->Windows cross-compiling using configure
|
||||||
|
--------------------------------------------------
|
||||||
|
|
||||||
|
First you'll need a cross-compiler; linux glibc binaries of MinGW and
|
||||||
|
Cygwin (both based on egcs) can be found at
|
||||||
|
ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
|
||||||
|
based on the latest MinGW release can be found at
|
||||||
|
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
|
||||||
|
Otherwise you can compile one yourself.
|
||||||
|
|
||||||
|
[ A Note about Cygwin and MinGW: the main difference is that Cygwin
|
||||||
|
binaries are always linked against cygwin.dll. This dll encapsulates most
|
||||||
|
standard Unix C extensions, which is very handy if you're porting unix
|
||||||
|
software to windows. However, wxMSW doesn't need this, so MinGW is
|
||||||
|
preferable if you write portable C(++). ]
|
||||||
|
|
||||||
|
You might want to build both Unix and Windows binaries in the same source
|
||||||
|
tree; to do this make subdirs for each e.g. unix and win32. If you've
|
||||||
|
already build wxWidgets in the main dir, do a 'make distclean' there,
|
||||||
|
otherwise configure will get confused. (In any case, read the section 'Unix
|
||||||
|
using configure' and make sure you're able to build a native wxWidgets
|
||||||
|
library; cross-compiling errors can be pretty obscure and you'll want to be
|
||||||
|
sure that your configure setup is basically sound.)
|
||||||
|
|
||||||
|
To cross compile the windows library, do
|
||||||
|
-> cd win32
|
||||||
|
(or whatever you called it)
|
||||||
|
Now run configure. There are two ways to do this
|
||||||
|
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
|
||||||
|
where --build= should read whatever platform you're building on. Configure
|
||||||
|
will notice that build and host platforms differ, and automatically prepend
|
||||||
|
i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
|
||||||
|
The other way to run configure is by specifying the names of the binaries
|
||||||
|
yourself:
|
||||||
|
-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
|
||||||
|
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
|
||||||
|
../configure --host=i586-mingw32 --with-mingw
|
||||||
|
|
||||||
|
(all assuming you're using MinGW)
|
||||||
|
By default this will compile a DLL, if you want a static library,
|
||||||
|
specify --disable-shared.
|
||||||
|
|
||||||
|
Type
|
||||||
|
-> make
|
||||||
|
and wait, wait, wait. Don't leave the room, because the minute you do there
|
||||||
|
will be a compile error :-)
|
||||||
|
|
||||||
|
NB: if you are using a very old compiler you risk to get quite a few warnings
|
||||||
|
about "ANSI C++ forbids implicit conversion from 'void *'" in all places
|
||||||
|
where va_arg macro is used. This is due to a bug in (some versions of)
|
||||||
|
MinGW headers which may be corrected by upgrading your compier,
|
||||||
|
otherwise you might edit the file
|
||||||
|
|
||||||
|
${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
|
||||||
|
|
||||||
|
(instead of egcs-2.91.57 you may have something different), searching for
|
||||||
|
the lines
|
||||||
|
|
||||||
|
/* Define __gnuc_va_list. */
|
||||||
|
|
||||||
|
#ifndef __GNUC_VA_LIST
|
||||||
|
#define __GNUC_VA_LIST
|
||||||
|
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
|
||||||
|
typedef char *__gnuc_va_list;
|
||||||
|
#else
|
||||||
|
typedef void *__gnuc_va_list;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
and adding "|| defined(_WIN32)" to the list of platforms on which
|
||||||
|
__gnuc_va_list is char *.
|
||||||
|
|
||||||
|
If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
|
||||||
|
(or just libwx_msw.a if you opted for a static build).
|
||||||
|
Now try building the minimal sample:
|
||||||
|
|
||||||
|
-> cd samples/minimal
|
||||||
|
-> make
|
||||||
|
|
||||||
|
and run it with wine, for example (or copy to a Windows box)
|
||||||
|
-> wine minimal.exe
|
||||||
|
|
||||||
|
If all is well, do an install; from win32
|
||||||
|
-> make install
|
||||||
|
|
||||||
|
Native and cross-compiled installations can co-exist peacefully
|
||||||
|
(as long as their widget sets differ), except for wx-config. You might
|
||||||
|
want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
|
||||||
|
|
||||||
|
Cross-compiling TODO:
|
||||||
|
---------------------
|
||||||
|
- resource compiling must be done manually for now (should/can we link the
|
||||||
|
default wx resources into libwx_msw.a?) [ No we can't; the linker won't
|
||||||
|
link it in... you have to supply an object file ]
|
||||||
|
- static executables are HUGE -- there must be room for improvement.
|
||||||
|
|
28706
Makefile.in
28706
Makefile.in
File diff suppressed because it is too large
Load Diff
131
acinclude.m4
131
acinclude.m4
@@ -132,7 +132,7 @@ AC_DEFUN([WX_CPP_NEW_HEADERS],
|
|||||||
AC_LANG_SAVE
|
AC_LANG_SAVE
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_CPLUSPLUS
|
||||||
|
|
||||||
AC_CHECK_HEADERS(iostream,,, [ ])
|
AC_CHECK_HEADERS([iostream],,, [ ])
|
||||||
|
|
||||||
if test "$ac_cv_header_iostream" = "yes" ; then
|
if test "$ac_cv_header_iostream" = "yes" ; then
|
||||||
ifelse([$1], , :, [$1])
|
ifelse([$1], , :, [$1])
|
||||||
@@ -357,10 +357,13 @@ AC_DEFUN([WX_ARG_CACHE_NAME],)
|
|||||||
dnl this macro checks for a three-valued command line --with argument:
|
dnl this macro checks for a three-valued command line --with argument:
|
||||||
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
|
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
|
||||||
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
|
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
|
||||||
|
dnl
|
||||||
|
dnl the default value (used if the option is not specified at all) is the value
|
||||||
|
dnl of wxUSE_ALL_FEATURES (which is "yes" by default but can be changed by
|
||||||
|
dnl giving configure --disable-all-features option)
|
||||||
AC_DEFUN([WX_ARG_SYS_WITH],
|
AC_DEFUN([WX_ARG_SYS_WITH],
|
||||||
[
|
[
|
||||||
AC_MSG_CHECKING([for --with-$1])
|
AC_MSG_CHECKING([for --with-$1])
|
||||||
no_cache=0
|
|
||||||
AC_ARG_WITH($1, [$2],
|
AC_ARG_WITH($1, [$2],
|
||||||
[
|
[
|
||||||
if test "$withval" = yes; then
|
if test "$withval" = yes; then
|
||||||
@@ -374,21 +377,23 @@ AC_DEFUN([WX_ARG_SYS_WITH],
|
|||||||
else
|
else
|
||||||
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
|
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
|
||||||
fi
|
fi
|
||||||
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
LINE=`grep "$3" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
else
|
else
|
||||||
no_cache=1
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
|
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$wxUSE_ALL_FEATURES}"
|
||||||
])
|
])
|
||||||
|
|
||||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||||
if test "$no_cache" != 1; then
|
if test "x$cache" = xyes; then
|
||||||
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
|
echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$$3" = yes; then
|
if test "$$3" = yes; then
|
||||||
@@ -409,8 +414,15 @@ dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
|
|||||||
AC_DEFUN([WX_ARG_WITH],
|
AC_DEFUN([WX_ARG_WITH],
|
||||||
[
|
[
|
||||||
withstring=$4
|
withstring=$4
|
||||||
|
defaultval=$wxUSE_ALL_FEATURES
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$withstring" = xwithout; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
AC_MSG_CHECKING([for --${withstring:-with}-$1])
|
AC_MSG_CHECKING([for --${withstring:-with}-$1])
|
||||||
no_cache=0
|
|
||||||
AC_ARG_WITH($1, [$2],
|
AC_ARG_WITH($1, [$2],
|
||||||
[
|
[
|
||||||
if test "$withval" = yes; then
|
if test "$withval" = yes; then
|
||||||
@@ -418,41 +430,64 @@ AC_DEFUN([WX_ARG_WITH],
|
|||||||
else
|
else
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
||||||
fi
|
fi
|
||||||
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
LINE=`grep "$3" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
else
|
else
|
||||||
no_cache=1
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
|
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
|
||||||
])
|
])
|
||||||
|
|
||||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||||
if test "$no_cache" != 1; then
|
if test "x$cache" = xyes; then
|
||||||
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
|
echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$$3" = yes; then
|
if test x"$withstring" = xwithout; then
|
||||||
AC_MSG_RESULT(yes)
|
if test $$3 = yes; then
|
||||||
|
result=no
|
||||||
|
else
|
||||||
|
result=yes
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
result=$$3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_MSG_RESULT($result)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl same as WX_ARG_WITH but makes it clear that the option is enabled by default
|
||||||
|
AC_DEFUN([WX_ARG_WITHOUT], [WX_ARG_WITH($1, [$2], $3, without)])
|
||||||
|
|
||||||
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
|
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
|
||||||
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
|
dnl usage: WX_ARG_ENABLE(option, helpmessage, var, [enablestring], [default])
|
||||||
dnl
|
dnl
|
||||||
dnl enablestring is a hack and allows to show "checking for --disable-foo"
|
dnl enablestring can be omitted or a literal string "disable" and allows to
|
||||||
dnl message when running configure instead of the default "checking for
|
dnl show "checking for --disable-foo" message when running configure instead of
|
||||||
dnl --enable-foo" one whih is useful for the options enabled by default
|
dnl the default "checking for --enable-foo" one whih is useful for the options
|
||||||
|
dnl enabled by default
|
||||||
|
dnl
|
||||||
|
dnl the "default" argument can be omitted or contain the default value to use
|
||||||
|
dnl for the option if it's unspecified
|
||||||
AC_DEFUN([WX_ARG_ENABLE],
|
AC_DEFUN([WX_ARG_ENABLE],
|
||||||
[
|
[
|
||||||
enablestring=$4
|
enablestring=$4
|
||||||
|
defaultval=$5
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
||||||
no_cache=0
|
|
||||||
AC_ARG_ENABLE($1, [$2],
|
AC_ARG_ENABLE($1, [$2],
|
||||||
[
|
[
|
||||||
if test "$enableval" = yes; then
|
if test "$enableval" = yes; then
|
||||||
@@ -460,30 +495,44 @@ AC_DEFUN([WX_ARG_ENABLE],
|
|||||||
else
|
else
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
AS_TR_SH(wx_cv_use_$1)='$3=no'
|
||||||
fi
|
fi
|
||||||
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
LINE=`grep "$3" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
|
cache=yes
|
||||||
else
|
else
|
||||||
no_cache=1
|
cache=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
|
AS_TR_SH(wx_cv_use_$1)='$3=${'DEFAULT_$3":-$defaultval}"
|
||||||
])
|
])
|
||||||
|
|
||||||
eval "$AS_TR_SH(wx_cv_use_$1)"
|
eval "$AS_TR_SH(wx_cv_use_$1)"
|
||||||
if test "$no_cache" != 1; then
|
if test "x$cache" = xyes; then
|
||||||
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
|
echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$$3" = yes; then
|
if test x"$enablestring" = xdisable; then
|
||||||
AC_MSG_RESULT(yes)
|
if test $$3 = yes; then
|
||||||
|
result=no
|
||||||
|
else
|
||||||
|
result=yes
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
result=$$3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_MSG_RESULT($result)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl the same as WX_ARG_ENABLE but makes it more clear that the option is
|
||||||
|
dnl enabled by default
|
||||||
|
AC_DEFUN([WX_ARG_DISABLE], [WX_ARG_ENABLE($1, [$2], $3, disable)])
|
||||||
|
|
||||||
|
dnl same as WX_ARG_ENABLE but defaults to wxUSE_ALL_FEATURES instead of "yes"
|
||||||
|
AC_DEFUN([WX_ARG_FEATURE], [WX_ARG_ENABLE($1, [$2], $3,, $wxUSE_ALL_FEATURES)])
|
||||||
|
|
||||||
dnl Like WX_ARG_ENABLE but accepts a parameter.
|
dnl Like WX_ARG_ENABLE but accepts a parameter.
|
||||||
dnl
|
dnl
|
||||||
@@ -496,31 +545,33 @@ dnl
|
|||||||
dnl --enable-foo wxUSE_FOO=yes
|
dnl --enable-foo wxUSE_FOO=yes
|
||||||
dnl --disable-foo wxUSE_FOO=no
|
dnl --disable-foo wxUSE_FOO=no
|
||||||
dnl --enable-foo=bar wxUSE_FOO=bar
|
dnl --enable-foo=bar wxUSE_FOO=bar
|
||||||
dnl <not given> value from configarg.cache or wxUSE_FOO=no
|
dnl <not given> value from configarg.cache or
|
||||||
|
dnl wxUSE_FOO=$DEFAULT_wxUSE_FOO
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
AC_DEFUN([WX_ARG_ENABLE_PARAM],
|
||||||
[
|
[
|
||||||
enablestring=$4
|
enablestring=$4
|
||||||
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
|
||||||
no_cache=0
|
|
||||||
AC_ARG_ENABLE($1, [$2],
|
AC_ARG_ENABLE($1, [$2],
|
||||||
[
|
[
|
||||||
wx_cv_use_$1="$3='$enableval'"
|
wx_cv_use_$1="$3='$enableval'"
|
||||||
|
cache=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
LINE=`grep "$3" ${wx_arg_cache_file}`
|
LINE=`grep "^$3=" ${wx_arg_cache_file}`
|
||||||
if test "x$LINE" != x ; then
|
if test "x$LINE" != x ; then
|
||||||
eval "DEFAULT_$LINE"
|
eval "DEFAULT_$LINE"
|
||||||
wx_cv_use_$1='$3='$DEFAULT_$3
|
cache=yes
|
||||||
else
|
else
|
||||||
no_cache=1
|
cache=no
|
||||||
wx_cv_use_$1="$3=no"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
wx_cv_use_$1='$3='$DEFAULT_$3
|
||||||
])
|
])
|
||||||
|
|
||||||
eval "$wx_cv_use_$1"
|
eval "$wx_cv_use_$1"
|
||||||
if test "$no_cache" != 1; then
|
if test "x$cache" = xyes; then
|
||||||
echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
|
echo "$3=$$3" >> ${wx_arg_cache_file}.tmp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_RESULT([$$3])
|
AC_MSG_RESULT([$$3])
|
||||||
|
2
aclocal.m4
vendored
2
aclocal.m4
vendored
@@ -12,6 +12,7 @@
|
|||||||
# PARTICULAR PURPOSE.
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
|
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
|
||||||
|
m4_include([build/aclocal/atomic_builtins.m4])
|
||||||
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
|
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
|
||||||
m4_include([build/aclocal/bakefile-dllar.m4])
|
m4_include([build/aclocal/bakefile-dllar.m4])
|
||||||
m4_include([build/aclocal/bakefile-lang.m4])
|
m4_include([build/aclocal/bakefile-lang.m4])
|
||||||
@@ -21,4 +22,5 @@ m4_include([build/aclocal/gtk-2.0.m4])
|
|||||||
m4_include([build/aclocal/gtk.m4])
|
m4_include([build/aclocal/gtk.m4])
|
||||||
m4_include([build/aclocal/pkg.m4])
|
m4_include([build/aclocal/pkg.m4])
|
||||||
m4_include([build/aclocal/sdl.m4])
|
m4_include([build/aclocal/sdl.m4])
|
||||||
|
m4_include([build/aclocal/visibility.m4])
|
||||||
m4_include([acinclude.m4])
|
m4_include([acinclude.m4])
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * addbookm_xpm[] = {
|
static char *addbookm_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * back_xpm[] = {
|
static char * back_xpm[] = {
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * cdrom_xpm[] = {
|
static char *cdrom_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 36 1",
|
"16 15 36 1",
|
||||||
"= c #9BACC2",
|
"= c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * copy_xpm[] = {
|
static char *copy_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 23 1",
|
"16 15 23 1",
|
||||||
"o c #97C4E7",
|
"o c #97C4E7",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * cross_xpm[] = {
|
static char *cross_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"10 10 2 1",
|
"10 10 2 1",
|
||||||
" c Gray0",
|
" c Gray0",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * cut_xpm[] = {
|
static char *cut_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 25 1",
|
"16 15 25 1",
|
||||||
"6 c #D8BDC0",
|
"6 c #D8BDC0",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * deffile_xpm[] = {
|
static char *deffile_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 16 32 1",
|
"16 16 32 1",
|
||||||
"= c #97C4E7",
|
"= c #97C4E7",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * delbookm_xpm[] = {
|
static char *delbookm_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * delete_xpm[] = {
|
static char *delete_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 21 1",
|
"16 15 21 1",
|
||||||
"2 c #A5AEBD",
|
"2 c #A5AEBD",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * dir_up_xpm[] = {
|
static char *dir_up_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 31 1",
|
"16 15 31 1",
|
||||||
"6 c #9BACC2",
|
"6 c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * down_xpm[] = {
|
static char * down_xpm[] = {
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * exefile_xpm[] = {
|
static char *exefile_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 16 51 1",
|
"16 16 51 1",
|
||||||
"% c #E8E8EC",
|
"% c #E8E8EC",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * fileopen_xpm[] = {
|
static char *fileopen_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 36 1",
|
"16 15 36 1",
|
||||||
"6 c #9BACC2",
|
"6 c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * filesave_xpm[] = {
|
static char *filesave_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 21 1",
|
"16 15 21 1",
|
||||||
"O c #FFFFFF",
|
"O c #FFFFFF",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * filesaveas_xpm[] = {
|
static char *filesaveas_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 23 1",
|
"16 15 23 1",
|
||||||
"X c Black",
|
"X c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * find_xpm[] = {
|
static char *find_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 41 1",
|
"16 15 41 1",
|
||||||
"y c #A06959",
|
"y c #A06959",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * findrepl_xpm[] = {
|
static char *findrepl_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 42 1",
|
"16 15 42 1",
|
||||||
"y c #A06959",
|
"y c #A06959",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * floppy_xpm[] = {
|
static char *floppy_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 18 1",
|
"16 15 18 1",
|
||||||
"& c #E3E4E6",
|
"& c #E3E4E6",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * folder_xpm[] = {
|
static char *folder_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 22 1",
|
"16 15 22 1",
|
||||||
"> c #9BACC2",
|
"> c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * folder_open_xpm[] = {
|
static char *folder_open_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 31 1",
|
"16 15 31 1",
|
||||||
"6 c #9BACC2",
|
"6 c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * forward_xpm[] = {
|
static char * forward_xpm[] = {
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * error_xpm[] = {
|
static char *error_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 4 1",
|
"48 48 4 1",
|
||||||
" c None",
|
" c None",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * info_xpm[] = {
|
static char *info_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 9 1",
|
"48 48 9 1",
|
||||||
"$ c Black",
|
"$ c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * question_xpm[] = {
|
static char *question_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 21 1",
|
"48 48 21 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * warning_xpm[] = {
|
static char *warning_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 9 1",
|
"48 48 9 1",
|
||||||
"@ c Black",
|
"@ c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * harddisk_xpm[] = {
|
static char *harddisk_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 39 1",
|
"16 15 39 1",
|
||||||
"7 c #E3E4E6",
|
"7 c #E3E4E6",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * helpicon_xpm[] = {
|
static char *helpicon_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 6 1",
|
"32 32 6 1",
|
||||||
" c Gray0",
|
" c Gray0",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * home_xpm[] = {
|
static char *home_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * htmbook_xpm[] = {
|
static char * htmbook_xpm[] = {
|
||||||
"16 16 6 1",
|
"16 16 6 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * htmfoldr_xpm[] = {
|
static char * htmfoldr_xpm[] = {
|
||||||
"16 16 6 1",
|
"16 16 6 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * htmoptns_xpm[] = {
|
static char * htmoptns_xpm[] = {
|
||||||
"16 15 2 1",
|
"16 15 2 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c #000000",
|
". c #000000",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * htmpage_xpm[] = {
|
static char * htmpage_xpm[] = {
|
||||||
"16 16 4 1",
|
"16 16 4 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c #808080",
|
". c #808080",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * htmsidep_xpm[] = {
|
static char *htmsidep_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 6 1",
|
"16 15 6 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * listview_xpm[] = {
|
static char *listview_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 4 1",
|
"16 15 4 1",
|
||||||
" c Black",
|
" c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * missimg_xpm[] = {
|
static char *missimg_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 5 1",
|
"32 32 5 1",
|
||||||
"X c Black",
|
"X c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * error_xpm[] = {
|
static char *error_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 4 1",
|
"48 48 4 1",
|
||||||
" c None",
|
" c None",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * info_xpm[] = {
|
static char *info_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 9 1",
|
"48 48 9 1",
|
||||||
"$ c Black",
|
"$ c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * question_xpm[] = {
|
static char *question_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 21 1",
|
"48 48 21 1",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * warning_xpm[] = {
|
static char *warning_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"48 48 9 1",
|
"48 48 9 1",
|
||||||
"@ c Black",
|
"@ c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * new_xpm[] = {
|
static char *new_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 29 1",
|
"16 15 29 1",
|
||||||
"* c #97C4E7",
|
"* c #97C4E7",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * new_dir_xpm[] = {
|
static char *new_dir_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 22 1",
|
"16 15 22 1",
|
||||||
"X c Black",
|
"X c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * paste_xpm[] = {
|
static char *paste_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 25 1",
|
"16 15 25 1",
|
||||||
"< c #FEECE4",
|
"< c #FEECE4",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * print_xpm[] = {
|
static char *print_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 39 1",
|
"16 15 39 1",
|
||||||
"< c #E3E4E6",
|
"< c #E3E4E6",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * quit_xpm[] = {
|
static char *quit_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 69 1",
|
"16 15 69 1",
|
||||||
"@ c Black",
|
"@ c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * redo_xpm[] = {
|
static char *redo_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 37 1",
|
"16 15 37 1",
|
||||||
"4 c #9BACC2",
|
"4 c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * removable_xpm[] = {
|
static char *removable_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 23 1",
|
"16 15 23 1",
|
||||||
"@ c #C3C3C4",
|
"@ c #C3C3C4",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * repview_xpm[] = {
|
static char *repview_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
" c Black",
|
" c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * tick_xpm[] = {
|
static char *tick_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"10 10 2 1",
|
"10 10 2 1",
|
||||||
". c Gray0",
|
". c Gray0",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * tipicon_xpm[] = {
|
static char *tipicon_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"32 32 9 1",
|
"32 32 9 1",
|
||||||
"$ c Black",
|
"$ c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * toparent_xpm[] = {
|
static char * toparent_xpm[] = {
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * undo_xpm[] = {
|
static char *undo_xpm[] = {
|
||||||
/* columns rows colors chars-per-pixel */
|
/* columns rows colors chars-per-pixel */
|
||||||
"16 15 37 1",
|
"16 15 37 1",
|
||||||
"4 c #9BACC2",
|
"4 c #9BACC2",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * up_xpm[] = {
|
static char * up_xpm[] = {
|
||||||
"16 15 3 1",
|
"16 15 3 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c Black",
|
". c Black",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * wxwin16x16_xpm[] = {
|
static char *wxwin16x16_xpm[] = {
|
||||||
"16 16 6 1",
|
"16 16 6 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c #000000",
|
". c #000000",
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static const char * wxwin32x32_xpm[] = {
|
static char *wxwin32x32_xpm[] = {
|
||||||
"32 32 6 1",
|
"32 32 6 1",
|
||||||
" c None",
|
" c None",
|
||||||
". c #000000",
|
". c #000000",
|
||||||
|
442
autoconf_inc.m4
442
autoconf_inc.m4
File diff suppressed because one or more lines are too long
@@ -1,3 +1,2 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#autoconf
|
autoconf
|
||||||
make -f build/autogen.mk
|
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
wince
|
|
26
build/aclocal/atomic_builtins.m4
Normal file
26
build/aclocal/atomic_builtins.m4
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
|
||||||
|
dnl Checks for availability of GCC's atomic operations builtins.
|
||||||
|
dnl Defines HAVE_GCC_ATOMIC_BUILTINS if available.
|
||||||
|
|
||||||
|
AC_DEFUN([WX_ATOMIC_BUILTINS],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
|
if test -n "$GCC"; then
|
||||||
|
AC_MSG_CHECKING([for __sync_fetch_* builtins])
|
||||||
|
AC_CACHE_VAL(wx_cv_cc_gcc_atomic_builtins, [
|
||||||
|
AC_TRY_COMPILE(
|
||||||
|
[],
|
||||||
|
[
|
||||||
|
int value=0;
|
||||||
|
__sync_fetch_and_add(&value, 1);
|
||||||
|
__sync_sub_and_fetch(&value, 1);
|
||||||
|
],
|
||||||
|
wx_cv_cc_gcc_atomic_builtins=yes,
|
||||||
|
wx_cv_cc_gcc_atomic_builtins=no)
|
||||||
|
])
|
||||||
|
AC_MSG_RESULT([$wx_cv_cc_gcc_atomic_builtins])
|
||||||
|
if test $wx_cv_cc_gcc_atomic_builtins = yes; then
|
||||||
|
AC_DEFINE([HAVE_GCC_ATOMIC_BUILTINS])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
@@ -59,36 +59,6 @@ AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
|
|||||||
AC_LANG_POP($2)
|
AC_LANG_POP($2)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl More specific version of the above macro checking whether the compiler
|
|
||||||
dnl version is at least the given one (assumes that we do use this compiler)
|
|
||||||
dnl
|
|
||||||
dnl _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(NAME, LANG, SYMBOL, VER, VERMSG, IF-YES, IF-NO)
|
|
||||||
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
|
|
||||||
[
|
|
||||||
AC_LANG_PUSH($2)
|
|
||||||
AC_CACHE_CHECK(
|
|
||||||
[whether we are using $1 $2 compiler v$5 or later],
|
|
||||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
|
|
||||||
[AC_TRY_COMPILE(
|
|
||||||
[],
|
|
||||||
[
|
|
||||||
#ifndef $3 || $3 < $4
|
|
||||||
choke me
|
|
||||||
#endif
|
|
||||||
],
|
|
||||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
|
|
||||||
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
|
|
||||||
)
|
|
||||||
]
|
|
||||||
)
|
|
||||||
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4" = "xyes"; then
|
|
||||||
:; $6
|
|
||||||
else
|
|
||||||
:; $7
|
|
||||||
fi
|
|
||||||
AC_LANG_POP($2)
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
|
dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
|
||||||
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
|
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
|
||||||
[
|
[
|
||||||
@@ -147,29 +117,6 @@ AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
|
|||||||
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
|
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl Intel compiler command line options changed in incompatible ways sometimes
|
|
||||||
dnl before v8 (-KPIC was replaced with gcc-compatible -fPIC) and again in v10
|
|
||||||
dnl (-create-pch deprecated in favour of -pch-create) so we need to test for
|
|
||||||
dnl its exact version too
|
|
||||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_8],
|
|
||||||
[
|
|
||||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 800, 8, INTELCC8=yes)
|
|
||||||
])
|
|
||||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_8],
|
|
||||||
[
|
|
||||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 800, 8, INTELCXX8=yes)
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_10],
|
|
||||||
[
|
|
||||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 1000, 10, INTELCC10=yes)
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_10],
|
|
||||||
[
|
|
||||||
_AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 1000, 10, INTELCXX10=yes)
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
|
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
|
||||||
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
|
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
|
||||||
[
|
[
|
||||||
@@ -247,12 +194,6 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
|
|||||||
dnl always test for it
|
dnl always test for it
|
||||||
AC_BAKEFILE_PROG_INTEL$1
|
AC_BAKEFILE_PROG_INTEL$1
|
||||||
|
|
||||||
dnl If we use Intel compiler we also need to know its version
|
|
||||||
if test "$INTEL$1" = "yes"; then
|
|
||||||
AC_BAKEFILE_PROG_INTEL$1_8
|
|
||||||
AC_BAKEFILE_PROG_INTEL$1_10
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl if we're using gcc, we can't be using any of incompatible compilers
|
dnl if we're using gcc, we can't be using any of incompatible compilers
|
||||||
if test "x$G$1" != "xyes"; then
|
if test "x$G$1" != "xyes"; then
|
||||||
if test "x$1" = "xC"; then
|
if test "x$1" = "xC"; then
|
||||||
@@ -272,9 +213,7 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
|
|||||||
|
|
||||||
Darwin)
|
Darwin)
|
||||||
AC_BAKEFILE_PROG_MW$1
|
AC_BAKEFILE_PROG_MW$1
|
||||||
if test "$MW$1" != "yes"; then
|
AC_BAKEFILE_PROG_XL$1
|
||||||
AC_BAKEFILE_PROG_XL$1
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
IRIX*)
|
IRIX*)
|
||||||
@@ -282,11 +221,8 @@ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
Linux*)
|
Linux*)
|
||||||
dnl Sun CC is now available under Linux too, test for it unless
|
dnl Sun CC is now available under Linux too
|
||||||
dnl we already found that we were using a different compiler
|
AC_BAKEFILE_PROG_SUN$1
|
||||||
if test "$INTEL$1" != "yes"; then
|
|
||||||
AC_BAKEFILE_PROG_SUN$1
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
HP-UX*)
|
HP-UX*)
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
dnl
|
dnl
|
||||||
dnl This file is part of Bakefile (http://www.bakefile.org)
|
dnl This file is part of Bakefile (http://bakefile.sourceforge.net)
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright (C) 2003-2007 Vaclav Slavik and others
|
dnl Copyright (C) 2003-2007 Vaclav Slavik and others
|
||||||
dnl
|
dnl
|
||||||
@@ -126,7 +126,8 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
|
|||||||
PLATFORM_BEOS=1
|
PLATFORM_BEOS=1
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
|
dnl wxWidgets-specific: allow unknown Unix systems
|
||||||
|
dnl AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@@ -207,10 +208,6 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
|
|||||||
dlldir="$libdir"
|
dlldir="$libdir"
|
||||||
|
|
||||||
case "${BAKEFILE_HOST}" in
|
case "${BAKEFILE_HOST}" in
|
||||||
dnl PA-RISC HP systems used .sl but IA64 use ELF-64 and so use the
|
|
||||||
dnl standard .so extension
|
|
||||||
ia64-hp-hpux* )
|
|
||||||
;;
|
|
||||||
*-hp-hpux* )
|
*-hp-hpux* )
|
||||||
SO_SUFFIX="sl"
|
SO_SUFFIX="sl"
|
||||||
SO_SUFFIX_MODULE="sl"
|
SO_SUFFIX_MODULE="sl"
|
||||||
@@ -312,9 +309,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-linux* )
|
*-*-linux* )
|
||||||
dnl newer icc versions use -fPIC just as gcc does and, in fact, the
|
if test "$INTELCC" = "yes"; then
|
||||||
dnl newest (v10+) ones don't even understand -KPIC any longer
|
|
||||||
if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
|
|
||||||
PIC_FLAG="-KPIC"
|
PIC_FLAG="-KPIC"
|
||||||
elif test "x$SUNCXX" = "xyes"; then
|
elif test "x$SUNCXX" = "xyes"; then
|
||||||
SHARED_LD_CC="${CC} -G -o"
|
SHARED_LD_CC="${CC} -G -o"
|
||||||
@@ -336,7 +331,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
|
|||||||
chmod +x shared-ld-sh
|
chmod +x shared-ld-sh
|
||||||
|
|
||||||
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
|
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
|
||||||
SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
|
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
|
||||||
|
|
||||||
dnl Most apps benefit from being fully binded (its faster and static
|
dnl Most apps benefit from being fully binded (its faster and static
|
||||||
dnl variables initialized at startup work).
|
dnl variables initialized at startup work).
|
||||||
@@ -489,13 +484,12 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
|||||||
USE_SOVERLINUX=0
|
USE_SOVERLINUX=0
|
||||||
USE_SOVERSOLARIS=0
|
USE_SOVERSOLARIS=0
|
||||||
USE_SOVERCYGWIN=0
|
USE_SOVERCYGWIN=0
|
||||||
USE_SOTWOSYMLINKS=0
|
USE_SOSYMLINKS=0
|
||||||
USE_MACVERSION=0
|
USE_MACVERSION=0
|
||||||
SONAME_FLAG=
|
SONAME_FLAG=
|
||||||
|
|
||||||
case "${BAKEFILE_HOST}" in
|
case "${BAKEFILE_HOST}" in
|
||||||
*-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
|
*-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
|
||||||
*-*-k*bsd*-gnu | *-*-mirbsd* )
|
|
||||||
if test "x$SUNCXX" = "xyes"; then
|
if test "x$SUNCXX" = "xyes"; then
|
||||||
SONAME_FLAG="-h "
|
SONAME_FLAG="-h "
|
||||||
else
|
else
|
||||||
@@ -503,19 +497,20 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
|||||||
fi
|
fi
|
||||||
USE_SOVERSION=1
|
USE_SOVERSION=1
|
||||||
USE_SOVERLINUX=1
|
USE_SOVERLINUX=1
|
||||||
USE_SOTWOSYMLINKS=1
|
USE_SOSYMLINKS=1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-solaris2* )
|
*-*-solaris2* )
|
||||||
SONAME_FLAG="-h "
|
SONAME_FLAG="-h "
|
||||||
USE_SOVERSION=1
|
USE_SOVERSION=1
|
||||||
USE_SOVERSOLARIS=1
|
USE_SOVERSOLARIS=1
|
||||||
|
USE_SOSYMLINKS=1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-darwin* )
|
*-*-darwin* )
|
||||||
USE_MACVERSION=1
|
USE_MACVERSION=1
|
||||||
USE_SOVERSION=1
|
USE_SOVERSION=1
|
||||||
USE_SOTWOSYMLINKS=1
|
USE_SOSYMLINKS=1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*-*-cygwin* )
|
*-*-cygwin* )
|
||||||
@@ -529,7 +524,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
|
|||||||
AC_SUBST(USE_SOVERSOLARIS)
|
AC_SUBST(USE_SOVERSOLARIS)
|
||||||
AC_SUBST(USE_SOVERCYGWIN)
|
AC_SUBST(USE_SOVERCYGWIN)
|
||||||
AC_SUBST(USE_MACVERSION)
|
AC_SUBST(USE_MACVERSION)
|
||||||
AC_SUBST(USE_SOTWOSYMLINKS)
|
AC_SUBST(USE_SOSYMLINKS)
|
||||||
AC_SUBST(SONAME_FLAG)
|
AC_SUBST(SONAME_FLAG)
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -644,21 +639,18 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
|
|||||||
AC_CHECK_TOOL(STRIP, strip, :)
|
AC_CHECK_TOOL(STRIP, strip, :)
|
||||||
AC_CHECK_TOOL(NM, nm, :)
|
AC_CHECK_TOOL(NM, nm, :)
|
||||||
|
|
||||||
dnl This check is necessary because "install -d" doesn't exist on
|
case ${BAKEFILE_HOST} in
|
||||||
dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
|
*-hp-hpux* )
|
||||||
AC_MSG_CHECKING([for command to install directories])
|
dnl HP-UX install doesn't handle the "-d" switch so don't
|
||||||
INSTALL_TEST_DIR=acbftest$$
|
dnl use it there
|
||||||
$INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
|
INSTALL_DIR="mkdir -p"
|
||||||
if test $? = 0 -a -d $INSTALL_TEST_DIR; then
|
;;
|
||||||
rmdir $INSTALL_TEST_DIR
|
* )
|
||||||
dnl we must refer to makefile's $(INSTALL) variable and not
|
dnl we must refer to makefile's $(INSTALL) variable and not
|
||||||
dnl current value of shell variable, hence the single quoting:
|
dnl current value of shell variable, hence the single quoting:
|
||||||
INSTALL_DIR='$(INSTALL) -d'
|
INSTALL_DIR='$(INSTALL) -d'
|
||||||
AC_MSG_RESULT([$INSTALL -d])
|
;;
|
||||||
else
|
esac
|
||||||
INSTALL_DIR="mkdir -p"
|
|
||||||
AC_MSG_RESULT([mkdir -p])
|
|
||||||
fi
|
|
||||||
AC_SUBST(INSTALL_DIR)
|
AC_SUBST(INSTALL_DIR)
|
||||||
|
|
||||||
LDFLAGS_GUI=
|
LDFLAGS_GUI=
|
||||||
@@ -747,19 +739,20 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
|
|||||||
GCC_PCH=1
|
GCC_PCH=1
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
if test "$INTELCXX8" = "yes"; then
|
AC_TRY_COMPILE([],
|
||||||
AC_MSG_RESULT([yes])
|
[
|
||||||
ICC_PCH=1
|
#if !defined(__INTEL_COMPILER) || \
|
||||||
if test "$INTELCXX10" = "yes"; then
|
(__INTEL_COMPILER < 800)
|
||||||
ICC_PCH_CREATE_SWITCH="-pch-create"
|
There is no PCH support
|
||||||
ICC_PCH_USE_SWITCH="-pch-use"
|
#endif
|
||||||
else
|
],
|
||||||
ICC_PCH_CREATE_SWITCH="-create-pch"
|
[
|
||||||
ICC_PCH_USE_SWITCH="-use-pch"
|
AC_MSG_RESULT([yes])
|
||||||
fi
|
ICC_PCH=1
|
||||||
else
|
],
|
||||||
AC_MSG_RESULT([no])
|
[
|
||||||
fi
|
AC_MSG_RESULT([no])
|
||||||
|
])
|
||||||
])
|
])
|
||||||
if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
|
if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
|
||||||
USE_PCH=1
|
USE_PCH=1
|
||||||
@@ -775,8 +768,6 @@ AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
|
|||||||
|
|
||||||
AC_SUBST(GCC_PCH)
|
AC_SUBST(GCC_PCH)
|
||||||
AC_SUBST(ICC_PCH)
|
AC_SUBST(ICC_PCH)
|
||||||
AC_SUBST(ICC_PCH_CREATE_SWITCH)
|
|
||||||
AC_SUBST(ICC_PCH_USE_SWITCH)
|
|
||||||
AC_SUBST(BK_MAKE_PCH)
|
AC_SUBST(BK_MAKE_PCH)
|
||||||
])
|
])
|
||||||
|
|
||||||
@@ -807,12 +798,6 @@ AC_DEFUN([AC_BAKEFILE],
|
|||||||
[
|
[
|
||||||
AC_PREREQ([2.58])
|
AC_PREREQ([2.58])
|
||||||
|
|
||||||
dnl We need to always run C/C++ compiler tests, but it's also possible
|
|
||||||
dnl for the user to call these macros manually, hence this instead of
|
|
||||||
dnl simply calling these macros. See http://www.bakefile.org/ticket/64
|
|
||||||
AC_REQUIRE([AC_BAKEFILE_PROG_CC])
|
|
||||||
AC_REQUIRE([AC_BAKEFILE_PROG_CXX])
|
|
||||||
|
|
||||||
if test "x$BAKEFILE_HOST" = "x"; then
|
if test "x$BAKEFILE_HOST" = "x"; then
|
||||||
if test "x${host}" = "x" ; then
|
if test "x${host}" = "x" ; then
|
||||||
AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
|
AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
|
||||||
@@ -833,11 +818,7 @@ AC_DEFUN([AC_BAKEFILE],
|
|||||||
AC_BAKEFILE_DEPS
|
AC_BAKEFILE_DEPS
|
||||||
AC_BAKEFILE_RES_COMPILERS
|
AC_BAKEFILE_RES_COMPILERS
|
||||||
|
|
||||||
dnl OBJCFLAGS is set by Autoconf, but OBJCXXFLAGS is not:
|
BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
|
||||||
AC_SUBST(OBJCXXFLAGS)
|
|
||||||
|
|
||||||
|
|
||||||
BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
|
|
||||||
|
|
||||||
dnl includes autoconf_inc.m4:
|
dnl includes autoconf_inc.m4:
|
||||||
$1
|
$1
|
||||||
@@ -865,20 +846,24 @@ D='$'
|
|||||||
cat <<EOF >bk-deps
|
cat <<EOF >bk-deps
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# This script is part of Bakefile (http://www.bakefile.org) autoconf
|
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
|
||||||
# script. It is used to track C/C++ files dependencies in portable way.
|
# script. It is used to track C/C++ files dependencies in portable way.
|
||||||
#
|
#
|
||||||
# Permission is given to use this file in any way.
|
# Permission is given to use this file in any way.
|
||||||
|
|
||||||
DEPSMODE=${DEPSMODE}
|
DEPSMODE=${DEPSMODE}
|
||||||
|
DEPSDIR=.deps
|
||||||
DEPSFLAG="${DEPSFLAG}"
|
DEPSFLAG="${DEPSFLAG}"
|
||||||
DEPSDIRBASE=.deps
|
|
||||||
|
mkdir -p ${D}DEPSDIR
|
||||||
|
|
||||||
if test ${D}DEPSMODE = gcc ; then
|
if test ${D}DEPSMODE = gcc ; then
|
||||||
${D}* ${D}{DEPSFLAG}
|
${D}* ${D}{DEPSFLAG}
|
||||||
status=${D}?
|
status=${D}?
|
||||||
|
if test ${D}{status} != 0 ; then
|
||||||
# determine location of created files:
|
exit ${D}{status}
|
||||||
|
fi
|
||||||
|
# move created file to the location we want it in:
|
||||||
while test ${D}# -gt 0; do
|
while test ${D}# -gt 0; do
|
||||||
case "${D}1" in
|
case "${D}1" in
|
||||||
-o )
|
-o )
|
||||||
@@ -893,37 +878,24 @@ if test ${D}DEPSMODE = gcc ; then
|
|||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
objfilebase=\`basename ${D}objfile\`
|
|
||||||
builddir=\`dirname ${D}objfile\`
|
|
||||||
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
|
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
|
||||||
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
|
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
|
||||||
depsdir=${D}builddir/${D}DEPSDIRBASE
|
|
||||||
mkdir -p ${D}depsdir
|
|
||||||
|
|
||||||
# if the compiler failed, we're done:
|
|
||||||
if test ${D}{status} != 0 ; then
|
|
||||||
rm -f ${D}depfile
|
|
||||||
exit ${D}{status}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# move created file to the location we want it in:
|
|
||||||
if test -f ${D}depfile ; then
|
if test -f ${D}depfile ; then
|
||||||
sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
|
sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
|
||||||
rm -f ${D}depfile
|
rm -f ${D}depfile
|
||||||
else
|
else
|
||||||
# "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
|
# "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
|
||||||
depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
|
depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
|
||||||
if test ! -f ${D}depfile ; then
|
if test ! -f ${D}depfile ; then
|
||||||
# "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
|
# "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
|
||||||
depfile="${D}objfile.d"
|
depfile="${D}objfile.d"
|
||||||
fi
|
fi
|
||||||
if test -f ${D}depfile ; then
|
if test -f ${D}depfile ; then
|
||||||
sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
|
sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
|
||||||
rm -f ${D}depfile
|
rm -f ${D}depfile
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
elif test ${D}DEPSMODE = mwcc ; then
|
elif test ${D}DEPSMODE = mwcc ; then
|
||||||
${D}* || exit ${D}?
|
${D}* || exit ${D}?
|
||||||
# Run mwcc again with -MM and redirect into the dep file we want
|
# Run mwcc again with -MM and redirect into the dep file we want
|
||||||
@@ -943,15 +915,8 @@ elif test ${D}DEPSMODE = mwcc ; then
|
|||||||
fi
|
fi
|
||||||
prevarg="${D}arg"
|
prevarg="${D}arg"
|
||||||
done
|
done
|
||||||
|
${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
|
||||||
objfilebase=\`basename ${D}objfile\`
|
|
||||||
builddir=\`dirname ${D}objfile\`
|
|
||||||
depsdir=${D}builddir/${D}DEPSDIRBASE
|
|
||||||
mkdir -p ${D}depsdir
|
|
||||||
|
|
||||||
${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
elif test ${D}DEPSMODE = unixcc; then
|
elif test ${D}DEPSMODE = unixcc; then
|
||||||
${D}* || exit ${D}?
|
${D}* || exit ${D}?
|
||||||
# Run compiler again with deps flag and redirect into the dep file.
|
# Run compiler again with deps flag and redirect into the dep file.
|
||||||
@@ -972,15 +937,8 @@ elif test ${D}DEPSMODE = unixcc; then
|
|||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
|
||||||
objfilebase=\`basename ${D}objfile\`
|
|
||||||
builddir=\`dirname ${D}objfile\`
|
|
||||||
depsdir=${D}builddir/${D}DEPSDIRBASE
|
|
||||||
mkdir -p ${D}depsdir
|
|
||||||
|
|
||||||
eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
else
|
else
|
||||||
${D}*
|
${D}*
|
||||||
exit ${D}?
|
exit ${D}?
|
||||||
@@ -1011,10 +969,6 @@ objects=""
|
|||||||
linking_flag="-dynamiclib"
|
linking_flag="-dynamiclib"
|
||||||
ldargs="-r -keep_private_externs -nostdlib"
|
ldargs="-r -keep_private_externs -nostdlib"
|
||||||
|
|
||||||
if test "x${D}CXX" = "x"; then
|
|
||||||
CXX="c++"
|
|
||||||
fi
|
|
||||||
|
|
||||||
while test ${D}# -gt 0; do
|
while test ${D}# -gt 0; do
|
||||||
case ${D}1 in
|
case ${D}1 in
|
||||||
|
|
||||||
@@ -1027,12 +981,6 @@ while test ${D}# -gt 0; do
|
|||||||
args="${D}{args} ${D}1 ${D}2"
|
args="${D}{args} ${D}1 ${D}2"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-arch|-isysroot)
|
|
||||||
# collect these options and values
|
|
||||||
ldargs="${D}{ldargs} ${D}1 ${D}2"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
|
|
||||||
-s|-Wl,*)
|
-s|-Wl,*)
|
||||||
# collect these load args
|
# collect these load args
|
||||||
@@ -1073,9 +1021,9 @@ status=0
|
|||||||
# Link one module containing all the others
|
# Link one module containing all the others
|
||||||
#
|
#
|
||||||
if test ${D}{verbose} = 1; then
|
if test ${D}{verbose} = 1; then
|
||||||
echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
|
echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
|
||||||
fi
|
fi
|
||||||
${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
|
c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
|
||||||
status=${D}?
|
status=${D}?
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -1084,9 +1032,9 @@ status=${D}?
|
|||||||
#
|
#
|
||||||
if test ${D}{status} = 0; then
|
if test ${D}{status} = 0; then
|
||||||
if test ${D}{verbose} = 1; then
|
if test ${D}{verbose} = 1; then
|
||||||
echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
|
echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
|
||||||
fi
|
fi
|
||||||
${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
|
c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
|
||||||
status=${D}?
|
status=${D}?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1109,7 +1057,7 @@ D='$'
|
|||||||
cat <<EOF >bk-make-pch
|
cat <<EOF >bk-make-pch
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# This script is part of Bakefile (http://www.bakefile.org) autoconf
|
# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
|
||||||
# script. It is used to generated precompiled headers.
|
# script. It is used to generated precompiled headers.
|
||||||
#
|
#
|
||||||
# Permission is given to use this file in any way.
|
# Permission is given to use this file in any way.
|
||||||
@@ -1119,8 +1067,6 @@ header="${D}{2}"
|
|||||||
shift
|
shift
|
||||||
shift
|
shift
|
||||||
|
|
||||||
builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
|
|
||||||
|
|
||||||
compiler=""
|
compiler=""
|
||||||
headerfile=""
|
headerfile=""
|
||||||
|
|
||||||
@@ -1133,7 +1079,7 @@ while test ${D}{#} -gt 0; do
|
|||||||
headerfile="${D}{incdir}/${D}{header}"
|
headerfile="${D}{incdir}/${D}{header}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
-use-pch|-use_pch|-pch-use )
|
-use-pch|-use_pch )
|
||||||
shift
|
shift
|
||||||
add_to_cmdline=0
|
add_to_cmdline=0
|
||||||
;;
|
;;
|
||||||
@@ -1152,8 +1098,8 @@ else
|
|||||||
else
|
else
|
||||||
mkdir -p \`dirname ${D}{outfile}\`
|
mkdir -p \`dirname ${D}{outfile}\`
|
||||||
fi
|
fi
|
||||||
depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
|
depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
|
||||||
mkdir -p ${D}{builddir}/.deps
|
mkdir -p .deps
|
||||||
if test "x${GCC_PCH}" = "x1" ; then
|
if test "x${GCC_PCH}" = "x1" ; then
|
||||||
# can do this because gcc is >= 3.4:
|
# can do this because gcc is >= 3.4:
|
||||||
${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
|
${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
|
||||||
@@ -1165,7 +1111,7 @@ else
|
|||||||
#include "${D}header"
|
#include "${D}header"
|
||||||
EOT
|
EOT
|
||||||
# using -MF icc complains about differing command lines in creation/use
|
# using -MF icc complains about differing command lines in creation/use
|
||||||
${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
|
${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
|
||||||
sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
|
sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
|
||||||
rm -f ${D}file ${D}dfile ${D}{filename}.o
|
rm -f ${D}file ${D}dfile ${D}{filename}.o
|
||||||
fi
|
fi
|
||||||
|
132
build/aclocal/visibility.m4
Normal file
132
build/aclocal/visibility.m4
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
dnl visibility.m4 serial 1 (gettext-0.15)
|
||||||
|
dnl Copyright (C) 2005 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
dnl Modified for use in wxWidgets by Vaclav Slavik:
|
||||||
|
dnl - don't define HAVE_VISIBILITY (=0) if not supported
|
||||||
|
dnl - use -fvisibility-inlines-hidden too
|
||||||
|
dnl - test in C++ mode
|
||||||
|
|
||||||
|
dnl Tests whether the compiler supports the command-line option
|
||||||
|
dnl -fvisibility=hidden and the function and variable attributes
|
||||||
|
dnl __attribute__((__visibility__("hidden"))) and
|
||||||
|
dnl __attribute__((__visibility__("default"))).
|
||||||
|
dnl Does *not* test for __visibility__("protected") - which has tricky
|
||||||
|
dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
|
||||||
|
dnl MacOS X.
|
||||||
|
dnl Does *not* test for __visibility__("internal") - which has processor
|
||||||
|
dnl dependent semantics.
|
||||||
|
dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
|
||||||
|
dnl "really only recommended for legacy code".
|
||||||
|
dnl Set the variable CFLAG_VISIBILITY.
|
||||||
|
dnl Defines and sets the variable HAVE_VISIBILITY.
|
||||||
|
|
||||||
|
AC_DEFUN([WX_VISIBILITY],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
|
if test -n "$GCC"; then
|
||||||
|
CFLAGS_VISIBILITY="-fvisibility=hidden"
|
||||||
|
CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
|
||||||
|
AC_MSG_CHECKING([for symbols visibility support])
|
||||||
|
AC_CACHE_VAL(wx_cv_cc_visibility, [
|
||||||
|
wx_save_CXXFLAGS="$CXXFLAGS"
|
||||||
|
CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
|
||||||
|
AC_LANG_PUSH(C++)
|
||||||
|
AC_TRY_COMPILE(
|
||||||
|
[
|
||||||
|
/* we need gcc >= 4.0, older versions with visibility support
|
||||||
|
didn't have class visibility: */
|
||||||
|
#if defined(__GNUC__) && __GNUC__ < 4
|
||||||
|
error this gcc is too old;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* visibility only makes sense for ELF shared libs: */
|
||||||
|
#if !defined(__ELF__) && !defined(__APPLE__)
|
||||||
|
error this platform has no visibility;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
|
||||||
|
extern __attribute__((__visibility__("default"))) int exportedvar;
|
||||||
|
extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
|
||||||
|
extern __attribute__((__visibility__("default"))) int exportedfunc (void);
|
||||||
|
class __attribute__((__visibility__("default"))) Foo {
|
||||||
|
Foo() {}
|
||||||
|
};
|
||||||
|
],
|
||||||
|
[],
|
||||||
|
wx_cv_cc_visibility=yes,
|
||||||
|
wx_cv_cc_visibility=no)
|
||||||
|
AC_LANG_POP()
|
||||||
|
CXXFLAGS="$wx_save_CXXFLAGS"])
|
||||||
|
AC_MSG_RESULT([$wx_cv_cc_visibility])
|
||||||
|
if test $wx_cv_cc_visibility = yes; then
|
||||||
|
dnl we do have basic visibility support, now check if we can use it:
|
||||||
|
dnl
|
||||||
|
dnl Debian/Ubuntu's gcc 4.1 is affected:
|
||||||
|
dnl https://bugs.launchpad.net/ubuntu/+source/gcc-4.1/+bug/109262
|
||||||
|
AC_MSG_CHECKING([for broken libstdc++ visibility])
|
||||||
|
AC_CACHE_VAL(wx_cv_cc_broken_libstdcxx_visibility, [
|
||||||
|
wx_save_CXXFLAGS="$CXXFLAGS"
|
||||||
|
wx_save_LDFLAGS="$LDFLAGS"
|
||||||
|
CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
|
||||||
|
LDFLAGS="$LDFLAGS -shared -fPIC"
|
||||||
|
AC_LANG_PUSH(C++)
|
||||||
|
AC_TRY_LINK(
|
||||||
|
[
|
||||||
|
#include <string>
|
||||||
|
],
|
||||||
|
[
|
||||||
|
std::string s("hello");
|
||||||
|
return s.length();
|
||||||
|
],
|
||||||
|
wx_cv_cc_broken_libstdcxx_visibility=no,
|
||||||
|
wx_cv_cc_broken_libstdcxx_visibility=yes)
|
||||||
|
AC_LANG_POP()
|
||||||
|
CXXFLAGS="$wx_save_CXXFLAGS"
|
||||||
|
LDFLAGS="$wx_save_LDFLAGS"])
|
||||||
|
AC_MSG_RESULT([$wx_cv_cc_broken_libstdcxx_visibility])
|
||||||
|
|
||||||
|
if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
|
||||||
|
AC_MSG_CHECKING([whether we can work around it])
|
||||||
|
AC_CACHE_VAL(wx_cv_cc_visibility_workaround, [
|
||||||
|
AC_LANG_PUSH(C++)
|
||||||
|
AC_TRY_LINK(
|
||||||
|
[
|
||||||
|
#pragma GCC visibility push(default)
|
||||||
|
#include <string>
|
||||||
|
#pragma GCC visibility pop
|
||||||
|
],
|
||||||
|
[
|
||||||
|
std::string s("hello");
|
||||||
|
return s.length();
|
||||||
|
],
|
||||||
|
wx_cv_cc_visibility_workaround=no,
|
||||||
|
wx_cv_cc_visibility_workaround=yes)
|
||||||
|
AC_LANG_POP()
|
||||||
|
])
|
||||||
|
AC_MSG_RESULT([$wx_cv_cc_visibility_workaround])
|
||||||
|
|
||||||
|
if test $wx_cv_cc_visibility_workaround = no; then
|
||||||
|
dnl we can't use visibility at all then
|
||||||
|
wx_cv_cc_visibility=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test $wx_cv_cc_visibility = yes; then
|
||||||
|
AC_DEFINE([HAVE_VISIBILITY])
|
||||||
|
if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
|
||||||
|
AC_DEFINE([HAVE_BROKEN_LIBSTDCXX_VISIBILITY])
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
CFLAGS_VISIBILITY=""
|
||||||
|
CXXFLAGS_VISIBILITY=""
|
||||||
|
fi
|
||||||
|
AC_SUBST([CFLAGS_VISIBILITY])
|
||||||
|
AC_SUBST([CXXFLAGS_VISIBILITY])
|
||||||
|
fi
|
||||||
|
])
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2048
build/autoconf_prepend-include/autoconf/functions.m4
Normal file
2048
build/autoconf_prepend-include/autoconf/functions.m4
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
|||||||
# This file is part of Autoconf. -*- Autoconf -*-
|
# This file is part of Autoconf. -*- Autoconf -*-
|
||||||
# Checking for libraries.
|
# Checking for libraries.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||||
# 2002 Free Software Foundation, Inc.
|
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -15,8 +15,8 @@
|
|||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
# 02111-1307, USA.
|
# 02110-1301, USA.
|
||||||
|
|
||||||
# As a special exception, the Free Software Foundation gives unlimited
|
# As a special exception, the Free Software Foundation gives unlimited
|
||||||
# permission to copy, distribute and modify the configure scripts that
|
# permission to copy, distribute and modify the configure scripts that
|
||||||
@@ -67,24 +67,29 @@
|
|||||||
# --------------------------------------------------------
|
# --------------------------------------------------------
|
||||||
# Search for a library defining FUNC, if it's not already available.
|
# Search for a library defining FUNC, if it's not already available.
|
||||||
AC_DEFUN([AC_SEARCH_LIBS],
|
AC_DEFUN([AC_SEARCH_LIBS],
|
||||||
[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
|
[AS_VAR_PUSHDEF([ac_Search], [ac_cv_search_$1])dnl
|
||||||
|
AC_CACHE_CHECK([for library containing $1], [ac_Search],
|
||||||
[ac_func_search_save_LIBS=$LIBS
|
[ac_func_search_save_LIBS=$LIBS
|
||||||
ac_cv_search_$1=no
|
AC_LANG_CONFTEST([AC_LANG_CALL([], [$1])])
|
||||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
|
for ac_lib in '' $2; do
|
||||||
[ac_cv_search_$1="none required"])
|
if test -z "$ac_lib"; then
|
||||||
if test "$ac_cv_search_$1" = no; then
|
ac_res="none required"
|
||||||
for ac_lib in $2; do
|
else
|
||||||
|
ac_res=-l$ac_lib
|
||||||
LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
|
LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
|
||||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
|
fi
|
||||||
[ac_cv_search_$1="-l$ac_lib"
|
AC_LINK_IFELSE([], [AS_VAR_SET([ac_Search], [$ac_res])])
|
||||||
break])
|
AS_VAR_SET_IF([ac_Search], [break])dnl
|
||||||
done
|
done
|
||||||
fi
|
AS_VAR_SET_IF([ac_Search], , [AS_VAR_SET([ac_Search], [no])])dnl
|
||||||
|
rm conftest.$ac_ext
|
||||||
LIBS=$ac_func_search_save_LIBS])
|
LIBS=$ac_func_search_save_LIBS])
|
||||||
AS_IF([test "$ac_cv_search_$1" != no],
|
ac_res=AS_VAR_GET([ac_Search])
|
||||||
[test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
|
AS_IF([test "$ac_res" != no],
|
||||||
|
[test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
||||||
$3],
|
$3],
|
||||||
[$4])dnl
|
[$4])dnl
|
||||||
|
AS_VAR_POPDEF([ac_Search])dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
@@ -118,14 +123,14 @@ AC_DEFUN([AC_CHECK_LIB],
|
|||||||
AS_LITERAL_IF([$1],
|
AS_LITERAL_IF([$1],
|
||||||
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
|
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])],
|
||||||
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
|
[AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
|
||||||
AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
|
AC_CACHE_CHECK([for $2 in -l$1], [ac_Lib],
|
||||||
[ac_check_lib_save_LIBS=$LIBS
|
[ac_check_lib_save_LIBS=$LIBS
|
||||||
LIBS="-l$1 $5 $LIBS"
|
LIBS="-l$1 $5 $LIBS"
|
||||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
|
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
|
||||||
[AS_VAR_SET(ac_Lib, yes)],
|
[AS_VAR_SET([ac_Lib], [yes])],
|
||||||
[AS_VAR_SET(ac_Lib, no)])
|
[AS_VAR_SET([ac_Lib], [no])])
|
||||||
LIBS=$ac_check_lib_save_LIBS])
|
LIBS=$ac_check_lib_save_LIBS])
|
||||||
AS_IF([test AS_VAR_GET(ac_Lib) = yes],
|
AS_IF([test AS_VAR_GET([ac_Lib]) = yes],
|
||||||
[m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
|
[m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
|
||||||
LIBS="-l$1 $LIBS"
|
LIBS="-l$1 $LIBS"
|
||||||
])],
|
])],
|
||||||
@@ -137,8 +142,8 @@ AS_VAR_POPDEF([ac_Lib])dnl
|
|||||||
# AH_CHECK_LIB(LIBNAME)
|
# AH_CHECK_LIB(LIBNAME)
|
||||||
# ---------------------
|
# ---------------------
|
||||||
m4_define([AH_CHECK_LIB],
|
m4_define([AH_CHECK_LIB],
|
||||||
[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
|
[AH_TEMPLATE(AS_TR_CPP([HAVE_LIB$1]),
|
||||||
[Define to 1 if you have the `]$1[' library (-l]$1[).])])
|
[Define to 1 if you have the `$1' library (-l$1).])])
|
||||||
|
|
||||||
|
|
||||||
# AC_HAVE_LIBRARY(LIBRARY,
|
# AC_HAVE_LIBRARY(LIBRARY,
|
||||||
@@ -180,21 +185,27 @@ m4_popdef([AC_Lib_Name])dnl
|
|||||||
# Internal subroutine of _AC_PATH_X.
|
# Internal subroutine of _AC_PATH_X.
|
||||||
# Set ac_x_includes and/or ac_x_libraries.
|
# Set ac_x_includes and/or ac_x_libraries.
|
||||||
m4_define([_AC_PATH_X_XMKMF],
|
m4_define([_AC_PATH_X_XMKMF],
|
||||||
[rm -fr conftest.dir
|
[AC_ARG_VAR(XMKMF, [Path to xmkmf, Makefile generator for X Window System])dnl
|
||||||
|
rm -f -r conftest.dir
|
||||||
if mkdir conftest.dir; then
|
if mkdir conftest.dir; then
|
||||||
cd conftest.dir
|
cd conftest.dir
|
||||||
# Make sure to not put "make" in the Imakefile rules, since we grep it out.
|
|
||||||
cat >Imakefile <<'_ACEOF'
|
cat >Imakefile <<'_ACEOF'
|
||||||
acfindx:
|
incroot:
|
||||||
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
|
@echo incroot='${INCROOT}'
|
||||||
|
usrlibdir:
|
||||||
|
@echo usrlibdir='${USRLIBDIR}'
|
||||||
|
libdir:
|
||||||
|
@echo libdir='${LIBDIR}'
|
||||||
_ACEOF
|
_ACEOF
|
||||||
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
|
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
|
||||||
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
|
||||||
eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
|
for ac_var in incroot usrlibdir libdir; do
|
||||||
|
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
|
||||||
|
done
|
||||||
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
|
||||||
for ac_extension in a so sl; do
|
for ac_extension in a so sl; do
|
||||||
if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
|
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
|
||||||
test -f $ac_im_libdir/libX11.$ac_extension; then
|
test -f "$ac_im_libdir/libX11.$ac_extension"; then
|
||||||
ac_im_usrlibdir=$ac_im_libdir; break
|
ac_im_usrlibdir=$ac_im_libdir; break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -202,7 +213,7 @@ _ACEOF
|
|||||||
# bogus both because they are the default anyway, and because
|
# bogus both because they are the default anyway, and because
|
||||||
# using them would break gcc on systems where it needs fixed includes.
|
# using them would break gcc on systems where it needs fixed includes.
|
||||||
case $ac_im_incroot in
|
case $ac_im_incroot in
|
||||||
/usr/include) ;;
|
/usr/include) ac_x_includes= ;;
|
||||||
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
|
||||||
esac
|
esac
|
||||||
case $ac_im_usrlibdir in
|
case $ac_im_usrlibdir in
|
||||||
@@ -211,7 +222,7 @@ _ACEOF
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
cd ..
|
cd ..
|
||||||
rm -fr conftest.dir
|
rm -f -r conftest.dir
|
||||||
fi
|
fi
|
||||||
])# _AC_PATH_X_XMKMF
|
])# _AC_PATH_X_XMKMF
|
||||||
|
|
||||||
@@ -259,7 +270,7 @@ ac_x_header_dirs='
|
|||||||
/usr/openwin/share/include'
|
/usr/openwin/share/include'
|
||||||
|
|
||||||
if test "$ac_x_includes" = no; then
|
if test "$ac_x_includes" = no; then
|
||||||
# Guess where to find include files, by looking for a specified header file.
|
# Guess where to find include files, by looking for Xlib.h.
|
||||||
# First, try using that file with no special directory specified.
|
# First, try using that file with no special directory specified.
|
||||||
AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
|
AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
|
||||||
[# We can compile using X headers with no special include directory.
|
[# We can compile using X headers with no special include directory.
|
||||||
@@ -288,7 +299,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
|||||||
do
|
do
|
||||||
# Don't even attempt the hair of trying to link an X program!
|
# Don't even attempt the hair of trying to link an X program!
|
||||||
for ac_extension in a so sl; do
|
for ac_extension in a so sl; do
|
||||||
if test -r $ac_dir/libX11.$ac_extension; then
|
if test -r "$ac_dir/libX11.$ac_extension"; then
|
||||||
ac_x_libraries=$ac_dir
|
ac_x_libraries=$ac_dir
|
||||||
break 2
|
break 2
|
||||||
fi
|
fi
|
||||||
@@ -307,14 +318,16 @@ AC_DEFUN([_AC_PATH_X],
|
|||||||
ac_x_includes=no ac_x_libraries=no
|
ac_x_includes=no ac_x_libraries=no
|
||||||
_AC_PATH_X_XMKMF
|
_AC_PATH_X_XMKMF
|
||||||
_AC_PATH_X_DIRECT
|
_AC_PATH_X_DIRECT
|
||||||
if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
|
case $ac_x_includes,$ac_x_libraries in #(
|
||||||
# Didn't find X anywhere. Cache the known absence of X.
|
no,* | *,no | *\'*)
|
||||||
ac_cv_have_x="have_x=no"
|
# Didn't find X, or a directory has "'" in its name.
|
||||||
else
|
ac_cv_have_x="have_x=no";; #(
|
||||||
# Record where we found X for the cache.
|
*)
|
||||||
ac_cv_have_x="have_x=yes \
|
# Record where we found X for the cache.
|
||||||
ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
|
ac_cv_have_x="have_x=yes\
|
||||||
fi])dnl
|
ac_x_includes='$ac_x_includes'\
|
||||||
|
ac_x_libraries='$ac_x_libraries'"
|
||||||
|
esac])dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
@@ -331,23 +344,19 @@ m4_divert_once([HELP_BEGIN], [
|
|||||||
X features:
|
X features:
|
||||||
--x-includes=DIR X include files are in DIR
|
--x-includes=DIR X include files are in DIR
|
||||||
--x-libraries=DIR X library files are in DIR])dnl
|
--x-libraries=DIR X library files are in DIR])dnl
|
||||||
|
AC_MSG_CHECKING([for X])
|
||||||
|
|
||||||
if test "x$ac_path_x_has_been_run" != xyes; then
|
|
||||||
AC_MSG_CHECKING([for X])
|
|
||||||
|
|
||||||
ac_path_x_has_been_run=yes
|
|
||||||
AC_ARG_WITH(x, [ --with-x use the X Window System])
|
AC_ARG_WITH(x, [ --with-x use the X Window System])
|
||||||
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
|
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
|
||||||
if test "x$with_x" = xno; then
|
if test "x$with_x" = xno; then
|
||||||
# The user explicitly disabled X.
|
# The user explicitly disabled X.
|
||||||
have_x=disabled
|
have_x=disabled
|
||||||
else
|
else
|
||||||
if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
|
case $x_includes,$x_libraries in #(
|
||||||
# Both variables are already set.
|
*\'*) AC_MSG_ERROR([Cannot use X directory names containing ']);; #(
|
||||||
have_x=yes
|
*,NONE | NONE,*) _AC_PATH_X;; #(
|
||||||
else
|
*) have_x=yes;;
|
||||||
_AC_PATH_X
|
esac
|
||||||
fi
|
|
||||||
eval "$ac_cv_have_x"
|
eval "$ac_cv_have_x"
|
||||||
fi # $with_x != no
|
fi # $with_x != no
|
||||||
|
|
||||||
@@ -359,16 +368,12 @@ else
|
|||||||
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
|
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
|
||||||
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
|
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
|
||||||
# Update the cache value to reflect the command line values.
|
# Update the cache value to reflect the command line values.
|
||||||
ac_cv_have_x="have_x=yes \
|
ac_cv_have_x="have_x=yes\
|
||||||
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
|
ac_x_includes='$x_includes'\
|
||||||
# It might be that x_includes is empty (headers are found in the
|
ac_x_libraries='$x_libraries'"
|
||||||
# standard search path. Then output the corresponding message
|
AC_MSG_RESULT([libraries $x_libraries, headers $x_includes])
|
||||||
ac_out_x_includes=$x_includes
|
|
||||||
test "x$x_includes" = x && ac_out_x_includes="in standard search path"
|
|
||||||
AC_MSG_RESULT([libraries $x_libraries, headers $ac_out_x_includes])
|
|
||||||
fi
|
fi
|
||||||
|
])# AC_PATH_X
|
||||||
fi])# AC_PATH_X
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -390,29 +395,22 @@ else
|
|||||||
# It would also be nice to do this for all -L options, not just this one.
|
# It would also be nice to do this for all -L options, not just this one.
|
||||||
if test -n "$x_libraries"; then
|
if test -n "$x_libraries"; then
|
||||||
X_LIBS="$X_LIBS -L$x_libraries"
|
X_LIBS="$X_LIBS -L$x_libraries"
|
||||||
dnl FIXME: banish uname from this macro!
|
|
||||||
# For Solaris; some versions of Sun CC require a space after -R and
|
# For Solaris; some versions of Sun CC require a space after -R and
|
||||||
# others require no space. Words are not sufficient . . . .
|
# others require no space. Words are not sufficient . . . .
|
||||||
case `(uname -sr) 2>/dev/null` in
|
AC_MSG_CHECKING([whether -R must be followed by a space])
|
||||||
"SunOS 5"*)
|
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
||||||
AC_MSG_CHECKING([whether -R must be followed by a space])
|
ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag
|
||||||
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
|
ac_[]_AC_LANG_ABBREV[]_werror_flag=yes
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_nospace=yes, ac_R_nospace=no)
|
AC_LINK_IFELSE([AC_LANG_PROGRAM()],
|
||||||
if test $ac_R_nospace = yes; then
|
[AC_MSG_RESULT([no])
|
||||||
AC_MSG_RESULT([no])
|
X_LIBS="$X_LIBS -R$x_libraries"],
|
||||||
X_LIBS="$X_LIBS -R$x_libraries"
|
[LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||||
else
|
AC_LINK_IFELSE([AC_LANG_PROGRAM()],
|
||||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
[AC_MSG_RESULT([yes])
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM()], ac_R_space=yes, ac_R_space=no)
|
X_LIBS="$X_LIBS -R $x_libraries"],
|
||||||
if test $ac_R_space = yes; then
|
[AC_MSG_RESULT([neither works])])])
|
||||||
AC_MSG_RESULT([yes])
|
ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag
|
||||||
X_LIBS="$X_LIBS -R $x_libraries"
|
LIBS=$ac_xsave_LIBS
|
||||||
else
|
|
||||||
AC_MSG_RESULT([neither works])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
LIBS=$ac_xsave_LIBS
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for system-dependent libraries X programs must link with.
|
# Check for system-dependent libraries X programs must link with.
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -58,7 +58,8 @@ ACLOCAL_SOURCES = \
|
|||||||
build/aclocal/gtk-2.0.m4 \
|
build/aclocal/gtk-2.0.m4 \
|
||||||
build/aclocal/gtk.m4 \
|
build/aclocal/gtk.m4 \
|
||||||
build/aclocal/pkg.m4 \
|
build/aclocal/pkg.m4 \
|
||||||
build/aclocal/sdl.m4
|
build/aclocal/sdl.m4 \
|
||||||
|
build/aclocal/visibility.m4
|
||||||
|
|
||||||
# Run aclocal whenever acinclude or one of our local m4s is updated.
|
# Run aclocal whenever acinclude or one of our local m4s is updated.
|
||||||
aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
|
aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
|
||||||
|
@@ -1,2 +0,0 @@
|
|||||||
.bakefile_gen.state
|
|
||||||
Bakefiles.local.bkgen
|
|
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<!-- $Id$ -->
|
<!-- $Id$ -->
|
||||||
|
|
||||||
<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
|
<bakefile-gen>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Formats listed here are not generated by default. To enable them, either
|
Formats listed here are not generated by default. To enable them, either
|
||||||
@@ -15,17 +15,11 @@
|
|||||||
|
|
||||||
Reasons why these formats are disabled (and so not in CVS):
|
Reasons why these formats are disabled (and so not in CVS):
|
||||||
|
|
||||||
cbuilderx - Generated projects are too bad to be included in CVS. Please
|
|
||||||
*do not* enable this format until FIXMEs in .bkl files related
|
|
||||||
to cbuilderx are addressed. In particular, the project must
|
|
||||||
be placed into build/msw(?) directory and store object files
|
|
||||||
in its subdirectory and it must copy setup.h as others do.
|
|
||||||
cbx_unix - Doesn't integrate well and won't be used by most Unix people.
|
|
||||||
dmars, dmars_smake, msevc4prj - These are generated at release time and
|
dmars, dmars_smake, msevc4prj - These are generated at release time and
|
||||||
we don't want to clutter the source tree with these files.
|
we don't want to clutter the source tree with these files.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
|
<disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>
|
||||||
|
|
||||||
|
|
||||||
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
|
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
|
||||||
@@ -50,26 +44,26 @@
|
|||||||
|
|
||||||
<!-- List of output formats to generate: -->
|
<!-- List of output formats to generate: -->
|
||||||
<add-formats>
|
<add-formats>
|
||||||
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
|
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom
|
||||||
</add-formats>
|
</add-formats>
|
||||||
|
|
||||||
<del-formats files="../../samples/*.bkl">
|
<del-formats files="../../samples/*.bkl">
|
||||||
autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
autoconf,msvc6prj,msevc4prj,msvs2005prj
|
||||||
</del-formats>
|
</del-formats>
|
||||||
<del-formats files="../../demos/*.bkl">
|
<del-formats files="../../demos/*.bkl">
|
||||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
msvc6prj,msevc4prj,msvs2005prj
|
||||||
</del-formats>
|
</del-formats>
|
||||||
<del-formats files="../../samples/html/html_samples.bkl">
|
<del-formats files="../../samples/html/html_samples.bkl">
|
||||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
msvc6prj,msevc4prj,msvs2005prj
|
||||||
</del-formats>
|
</del-formats>
|
||||||
<del-formats files="../../samples/mobile/mobile_samples.bkl">
|
<del-formats files="../../samples/mobile/mobile_samples.bkl">
|
||||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
msvc6prj,msevc4prj,msvs2005prj
|
||||||
</del-formats>
|
</del-formats>
|
||||||
<del-formats files="../../samples/opengl/opengl_samples.bkl">
|
<del-formats files="../../samples/opengl/opengl_samples.bkl">
|
||||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
msvc6prj,msevc4prj,msvs2005prj
|
||||||
</del-formats>
|
</del-formats>
|
||||||
<del-formats files="../../utils/*.bkl">
|
<del-formats files="../../utils/*.bkl">
|
||||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
msvc6prj,msevc4prj,msvs2005prj
|
||||||
</del-formats>
|
</del-formats>
|
||||||
|
|
||||||
<!-- WinCE can't have console apps: -->
|
<!-- WinCE can't have console apps: -->
|
||||||
@@ -81,7 +75,7 @@
|
|||||||
|
|
||||||
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
|
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
|
||||||
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
|
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
|
||||||
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
|
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
|
||||||
</del-formats>
|
</del-formats>
|
||||||
|
|
||||||
|
|
||||||
@@ -120,19 +114,9 @@
|
|||||||
<add-flags files="wx.bkl" formats="msevc4prj">
|
<add-flags files="wx.bkl" formats="msevc4prj">
|
||||||
-o../wince/wx.vcw
|
-o../wince/wx.vcw
|
||||||
</add-flags>
|
</add-flags>
|
||||||
<add-flags files="wx.bkl" formats="cbuilderx">
|
|
||||||
-o../../wx.cbx
|
|
||||||
</add-flags>
|
|
||||||
<add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
|
<add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
|
||||||
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
|
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
|
||||||
</add-flags>
|
</add-flags>
|
||||||
<add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
|
|
||||||
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
|
|
||||||
</add-flags>
|
|
||||||
<!-- FIXME: don't do this once it is possible (new CBX version) -->
|
|
||||||
<add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
|
|
||||||
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
|
|
||||||
</add-flags>
|
|
||||||
<add-flags files="../../contrib/build/*/*.bkl"
|
<add-flags files="../../contrib/build/*/*.bkl"
|
||||||
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
|
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
|
||||||
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
|
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
the library.
|
the library.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
|
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj'] and
|
||||||
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
|
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
|
||||||
|
|
||||||
<set var="BUILD_CFG_FILE" make_var="1">
|
<set var="BUILD_CFG_FILE" make_var="1">
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
<requires version="0.2.3"/>
|
<requires version="0.2.1"/>
|
||||||
|
|
||||||
<!-- bakefile modules we need: -->
|
<!-- bakefile modules we need: -->
|
||||||
<using module="datafiles"/>
|
<using module="datafiles"/>
|
||||||
@@ -155,6 +155,9 @@
|
|||||||
<set var="WXLIB_RICHTEXT">
|
<set var="WXLIB_RICHTEXT">
|
||||||
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
|
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
|
||||||
</set>
|
</set>
|
||||||
|
<set var="WXLIB_STC">
|
||||||
|
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
<set var="WXLIB_MONO">
|
<set var="WXLIB_MONO">
|
||||||
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
|
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
|
||||||
@@ -180,13 +183,13 @@
|
|||||||
<set var="CFG_NAME_PART">
|
<set var="CFG_NAME_PART">
|
||||||
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
|
<!-- NB: this is make_var so that it can be overriden on command line
|
||||||
|
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
|
||||||
|
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
|
||||||
|
|
||||||
<set var="OBJS" make_var="1">
|
<set var="OBJS" make_var="1">
|
||||||
<if cond="FORMAT!='cbuilderx'">
|
$(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
|
||||||
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
|
|
||||||
</if>
|
|
||||||
<!-- FIXME: waiting for removal after CBX has better ../ dirs
|
|
||||||
support -->
|
|
||||||
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
|
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="BUILDDIR">$(OBJS)</set>
|
<set var="BUILDDIR">$(OBJS)</set>
|
||||||
@@ -202,7 +205,7 @@
|
|||||||
<set var="LIBDIRNAME" make_var="1">
|
<set var="LIBDIRNAME" make_var="1">
|
||||||
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
|
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
|
||||||
<if cond="FORMAT!='autoconf'">
|
<if cond="FORMAT!='autoconf'">
|
||||||
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
|
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
@@ -261,11 +264,6 @@
|
|||||||
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
|
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
|
||||||
<if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
|
<if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
|
||||||
</set>
|
</set>
|
||||||
<set var="NDEBUG_DEFINE">
|
|
||||||
<if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">NDEBUG</if>
|
|
||||||
<if cond="FORMAT!='autoconf' and DEBUG_RUNTIME_LIBS=='0'">NDEBUG</if>
|
|
||||||
</set>
|
|
||||||
|
|
||||||
<!-- does not cover all cases, but better than nothing -->
|
<!-- does not cover all cases, but better than nothing -->
|
||||||
<set var="NO_VC_CRTDBG">
|
<set var="NO_VC_CRTDBG">
|
||||||
<if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
|
<if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
|
||||||
@@ -286,15 +284,7 @@
|
|||||||
<set var="UNICOWS_LIB">
|
<set var="UNICOWS_LIB">
|
||||||
<if cond="MSLU=='1'">unicows</if>
|
<if cond="MSLU=='1'">unicows</if>
|
||||||
</set>
|
</set>
|
||||||
<set var="CAIRO_LIB">
|
|
||||||
<if cond="USE_CAIRO=='1'">cairo</if>
|
|
||||||
</set>
|
|
||||||
<set var="CAIRO_LIBDIR">
|
|
||||||
<if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/lib</if>
|
|
||||||
</set>
|
|
||||||
<set var="CAIRO_INCLUDEDIR">
|
|
||||||
<if cond="USE_CAIRO=='1'">$(DOLLAR)(CAIRO_ROOT)/include/cairo</if>
|
|
||||||
</set>
|
|
||||||
<if cond="FORMAT!='autoconf'">
|
<if cond="FORMAT!='autoconf'">
|
||||||
<set var="GDIPLUS_LIB">
|
<set var="GDIPLUS_LIB">
|
||||||
<if cond="USE_GDIPLUS=='1'">gdiplus</if>
|
<if cond="USE_GDIPLUS=='1'">gdiplus</if>
|
||||||
@@ -459,6 +449,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
|||||||
<include file="tiff.bkl"/>
|
<include file="tiff.bkl"/>
|
||||||
<include file="odbc.bkl"/>
|
<include file="odbc.bkl"/>
|
||||||
<include file="expat.bkl"/>
|
<include file="expat.bkl"/>
|
||||||
|
<include file="scintilla.bkl"/>
|
||||||
|
|
||||||
|
|
||||||
<!-- =============================================================== -->
|
<!-- =============================================================== -->
|
||||||
@@ -490,7 +481,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
|||||||
<define>__WX$(TOOLKIT)__</define>
|
<define>__WX$(TOOLKIT)__</define>
|
||||||
<define>$(WXUNIV_DEFINE)</define>
|
<define>$(WXUNIV_DEFINE)</define>
|
||||||
<define>$(DEBUG_DEFINE)</define>
|
<define>$(DEBUG_DEFINE)</define>
|
||||||
<define>$(NDEBUG_DEFINE)</define>
|
|
||||||
<define>$(EXCEPTIONS_DEFINE)</define>
|
<define>$(EXCEPTIONS_DEFINE)</define>
|
||||||
<define>$(RTTI_DEFINE)</define>
|
<define>$(RTTI_DEFINE)</define>
|
||||||
<define>$(THREAD_DEFINE)</define>
|
<define>$(THREAD_DEFINE)</define>
|
||||||
@@ -499,13 +489,14 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
|||||||
<if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
|
<if cond="FORMAT!='autoconf'"><define>$(GFXCTX_DEFINE)</define></if>
|
||||||
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
|
||||||
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
|
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
|
||||||
<include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
|
|
||||||
<lib-path>$(LIBDIRNAME)</lib-path>
|
<lib-path>$(LIBDIRNAME)</lib-path>
|
||||||
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
|
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
|
||||||
<lib-path>$(MGLLIBPATH)</lib-path>
|
<lib-path>$(MGLLIBPATH)</lib-path>
|
||||||
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
|
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<warnings>max</warnings>
|
<warnings>max</warnings>
|
||||||
|
<cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
|
||||||
<cppflags-watcom>
|
<cppflags-watcom>
|
||||||
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
|
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
|
||||||
-wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
|
-wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
|
||||||
@@ -545,8 +536,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
|||||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
|
||||||
<sys-lib>$(UNICOWS_LIB)</sys-lib>
|
<sys-lib>$(UNICOWS_LIB)</sys-lib>
|
||||||
<sys-lib>$(GDIPLUS_LIB)</sys-lib>
|
<sys-lib>$(GDIPLUS_LIB)</sys-lib>
|
||||||
<sys-lib>$(CAIRO_LIB)</sys-lib>
|
|
||||||
<lib-path>$(CAIRO_LIBDIR)</lib-path>
|
|
||||||
<if cond="FORMAT=='borland'">
|
<if cond="FORMAT=='borland'">
|
||||||
<sys-lib>ole2w32</sys-lib>
|
<sys-lib>ole2w32</sys-lib>
|
||||||
</if>
|
</if>
|
||||||
@@ -672,6 +661,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
|||||||
<depends>wxtiff</depends>
|
<depends>wxtiff</depends>
|
||||||
<depends>wxjpeg</depends>
|
<depends>wxjpeg</depends>
|
||||||
<depends>wxpng</depends>
|
<depends>wxpng</depends>
|
||||||
|
<depends>wxscintilla</depends>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template id="wx_3rdparty_dependencies"
|
<template id="wx_3rdparty_dependencies"
|
||||||
@@ -686,6 +676,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
|||||||
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
|
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
|
||||||
<include>$(DOLLAR)(%SCITECH)/include</include>
|
<include>$(DOLLAR)(%SCITECH)/include</include>
|
||||||
</if>
|
</if>
|
||||||
|
<include>$(INC_TIFF_BUILD)</include>
|
||||||
<include>$(INC_TIFF)</include>
|
<include>$(INC_TIFF)</include>
|
||||||
<include>$(INC_JPEG)</include>
|
<include>$(INC_JPEG)</include>
|
||||||
<include>$(INC_PNG)</include>
|
<include>$(INC_PNG)</include>
|
||||||
|
@@ -49,7 +49,7 @@
|
|||||||
<option name="UNICODE">
|
<option name="UNICODE">
|
||||||
<values>0,1</values>
|
<values>0,1</values>
|
||||||
<values-description>,Unicode</values-description>
|
<values-description>,Unicode</values-description>
|
||||||
<default-value>0</default-value>
|
<default-value>1</default-value>
|
||||||
<description>
|
<description>
|
||||||
Compile Unicode build of wxWidgets?
|
Compile Unicode build of wxWidgets?
|
||||||
</description>
|
</description>
|
||||||
@@ -213,6 +213,14 @@ Acts according to BUILD by default.
|
|||||||
</description>
|
</description>
|
||||||
</option>
|
</option>
|
||||||
|
|
||||||
|
<option name="USE_STC">
|
||||||
|
<values>0,1</values>
|
||||||
|
<default-value>1</default-value>
|
||||||
|
<description>
|
||||||
|
Build wxStyledTextCtrl library (USE_GUI must be 1)?
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
|
||||||
<option name="USE_OPENGL">
|
<option name="USE_OPENGL">
|
||||||
<values>0,1</values>
|
<values>0,1</values>
|
||||||
<default-value>0</default-value>
|
<default-value>0</default-value>
|
||||||
@@ -266,14 +274,6 @@ Acts according to BUILD by default.
|
|||||||
</description>
|
</description>
|
||||||
</option>
|
</option>
|
||||||
|
|
||||||
<option name="USE_CAIRO">
|
|
||||||
<values>0,1</values>
|
|
||||||
<default-value>0</default-value>
|
|
||||||
<description>
|
|
||||||
Enable wxCairoContext for platforms other than Linux/GTK.
|
|
||||||
</description>
|
|
||||||
</option>
|
|
||||||
|
|
||||||
<if cond="FORMAT!='autoconf'">
|
<if cond="FORMAT!='autoconf'">
|
||||||
<option name="USE_GDIPLUS">
|
<option name="USE_GDIPLUS">
|
||||||
<values>0,1</values>
|
<values>0,1</values>
|
||||||
@@ -347,12 +347,12 @@ to run the tests, include CppUnit library here.
|
|||||||
<option name="EXTRALIBS"/>
|
<option name="EXTRALIBS"/>
|
||||||
<option name="EXTRALIBS_XML"/>
|
<option name="EXTRALIBS_XML"/>
|
||||||
<option name="EXTRALIBS_HTML"/>
|
<option name="EXTRALIBS_HTML"/>
|
||||||
<option name="EXTRALIBS_MEDIA"/>
|
|
||||||
<option name="EXTRALIBS_ODBC"/>
|
<option name="EXTRALIBS_ODBC"/>
|
||||||
<option name="EXTRALIBS_GUI"/>
|
<option name="EXTRALIBS_GUI"/>
|
||||||
<option name="EXTRALIBS_OPENGL"/>
|
<option name="EXTRALIBS_OPENGL"/>
|
||||||
<option name="EXTRALIBS_SDL"/>
|
<option name="EXTRALIBS_SDL"/>
|
||||||
<option name="EXTRALIBS_GNOMEPRINT"/>
|
<option name="EXTRALIBS_GNOMEPRINT"/>
|
||||||
|
<option name="CXXWARNINGS"/>
|
||||||
<option name="HOST_SUFFIX"/>
|
<option name="HOST_SUFFIX"/>
|
||||||
<option name="SAMPLES_RPATH_FLAG"/>
|
<option name="SAMPLES_RPATH_FLAG"/>
|
||||||
<option name="SAMPLES_RPATH_POSTLINK"/>
|
<option name="SAMPLES_RPATH_POSTLINK"/>
|
||||||
@@ -399,7 +399,6 @@ it if SHARED=1 unless you know what you are doing.
|
|||||||
<set var="EXTRALIBS"/>
|
<set var="EXTRALIBS"/>
|
||||||
<set var="EXTRALIBS_XML"/>
|
<set var="EXTRALIBS_XML"/>
|
||||||
<set var="EXTRALIBS_HTML"/>
|
<set var="EXTRALIBS_HTML"/>
|
||||||
<set var="EXTRALIBS_MEDIA"/>
|
|
||||||
<set var="EXTRALIBS_ODBC"/>
|
<set var="EXTRALIBS_ODBC"/>
|
||||||
<set var="EXTRALIBS_GUI"/>
|
<set var="EXTRALIBS_GUI"/>
|
||||||
<set var="EXTRALIBS_OPENGL">
|
<set var="EXTRALIBS_OPENGL">
|
||||||
@@ -412,9 +411,10 @@ it if SHARED=1 unless you know what you are doing.
|
|||||||
|
|
||||||
<set var="WITH_PLUGIN_SDL">0</set>
|
<set var="WITH_PLUGIN_SDL">0</set>
|
||||||
|
|
||||||
<if cond="BUILDING_LIB=='1'">
|
<set var="SRCDIR">
|
||||||
<set-srcdir>../..</set-srcdir>
|
<if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
|
||||||
</if>
|
<if cond="BUILDING_LIB=='0'">.</if>
|
||||||
|
</set>
|
||||||
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
|
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
@@ -434,12 +434,6 @@ Set the version of your Mingw installation here.
|
|||||||
<set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
|
<set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<if cond="FORMAT=='cbuilderx'">
|
|
||||||
<set var="EXTRACFLAGS">
|
|
||||||
<if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
|
|
||||||
</set>
|
|
||||||
</if>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ================================================================== -->
|
<!-- ================================================================== -->
|
||||||
<!-- Project files - hardcode some defaults -->
|
<!-- Project files - hardcode some defaults -->
|
||||||
@@ -450,6 +444,7 @@ Set the version of your Mingw installation here.
|
|||||||
<set var="OFFICIAL_BUILD">0</set>
|
<set var="OFFICIAL_BUILD">0</set>
|
||||||
<set var="USE_AUI">1</set>
|
<set var="USE_AUI">1</set>
|
||||||
<set var="USE_RICHTEXT">1</set>
|
<set var="USE_RICHTEXT">1</set>
|
||||||
|
<set var="USE_STC">1</set>
|
||||||
<set var="USE_HTML">1</set>
|
<set var="USE_HTML">1</set>
|
||||||
<set var="USE_MEDIA">1</set>
|
<set var="USE_MEDIA">1</set>
|
||||||
<set var="USE_XRC">1</set>
|
<set var="USE_XRC">1</set>
|
||||||
@@ -461,7 +456,6 @@ Set the version of your Mingw installation here.
|
|||||||
<set var="USE_EXCEPTIONS">1</set>
|
<set var="USE_EXCEPTIONS">1</set>
|
||||||
<set var="USE_RTTI">1</set>
|
<set var="USE_RTTI">1</set>
|
||||||
<set var="USE_THREADS">1</set>
|
<set var="USE_THREADS">1</set>
|
||||||
<set var="USE_CAIRO">0</set>
|
|
||||||
<if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
|
<if cond="FORMAT!='autoconf'"><set var="USE_GDIPLUS">0</set></if>
|
||||||
<set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
|
<set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
|
||||||
<set var="DEBUG_FLAG">default</set>
|
<set var="DEBUG_FLAG">default</set>
|
||||||
@@ -469,19 +463,6 @@ Set the version of your Mingw installation here.
|
|||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
|
||||||
<!-- FIXME:
|
|
||||||
C++BuilderX supports only wxMSW, monolithic (sic!) static build
|
|
||||||
and the project can't be put into build/msw and store objects in
|
|
||||||
build/msw/something. This *must* be fixed! -->
|
|
||||||
<if cond="FORMAT=='cbuilderx'">
|
|
||||||
<set var="WXUNIV">0</set>
|
|
||||||
<set var="MONOLITHIC">1</set>
|
|
||||||
<set var="SRCDIR">.</set>
|
|
||||||
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
|
|
||||||
<set var="SHARED">0</set>
|
|
||||||
</if>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- DigitalMars make is braindead, it doesn't have conditional
|
<!-- DigitalMars make is braindead, it doesn't have conditional
|
||||||
processing: -->
|
processing: -->
|
||||||
<if cond="FORMAT=='dmars'">
|
<if cond="FORMAT=='dmars'">
|
||||||
@@ -489,7 +470,7 @@ Set the version of your Mingw installation here.
|
|||||||
<set var="BUILD">debug</set>
|
<set var="BUILD">debug</set>
|
||||||
<set var="SHARED">0</set>
|
<set var="SHARED">0</set>
|
||||||
<set var="WXUNIV">0</set>
|
<set var="WXUNIV">0</set>
|
||||||
<set var="UNICODE">0</set>
|
<set var="UNICODE">1</set>
|
||||||
<!-- Free version does not distribute OpenGL,
|
<!-- Free version does not distribute OpenGL,
|
||||||
in commercial distribution better use dmars_smake format -->
|
in commercial distribution better use dmars_smake format -->
|
||||||
<set var="USE_OPENGL">0</set>
|
<set var="USE_OPENGL">0</set>
|
||||||
|
@@ -54,22 +54,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<!-- UNIX -->
|
<!-- UNIX -->
|
||||||
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
|
||||||
<set var="BASE_UNIX_SRC" hints="files">
|
<set var="BASE_UNIX_SRC" hints="files">
|
||||||
|
src/common/fdiodispatcher.cpp
|
||||||
|
src/common/selectdispatcher.cpp
|
||||||
|
src/unix/appunix.cpp
|
||||||
src/unix/baseunix.cpp
|
src/unix/baseunix.cpp
|
||||||
src/unix/dir.cpp
|
src/unix/dir.cpp
|
||||||
src/unix/dlunix.cpp
|
src/unix/dlunix.cpp
|
||||||
|
src/unix/epolldispatcher.cpp
|
||||||
|
src/unix/evtloopunix.cpp
|
||||||
src/unix/mimetype.cpp
|
src/unix/mimetype.cpp
|
||||||
src/unix/snglinst.cpp
|
src/unix/snglinst.cpp
|
||||||
src/unix/stackwalk.cpp
|
src/unix/stackwalk.cpp
|
||||||
src/unix/stdpaths.cpp
|
src/unix/stdpaths.cpp
|
||||||
src/unix/threadpsx.cpp
|
src/unix/threadpsx.cpp
|
||||||
|
src/unix/timerunx.cpp
|
||||||
</set>
|
</set>
|
||||||
<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
|
<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
|
||||||
src/unix/utilsunx.cpp
|
src/unix/utilsunx.cpp
|
||||||
</set>
|
</set>
|
||||||
<set var="BASE_UNIX_HDR" hints="files">
|
<set var="BASE_UNIX_HDR" hints="files">
|
||||||
|
wx/private/fdiodispatcher.h
|
||||||
|
wx/private/selectdispatcher.h
|
||||||
|
wx/unix/app.h
|
||||||
wx/unix/apptbase.h
|
wx/unix/apptbase.h
|
||||||
wx/unix/apptrait.h
|
wx/unix/apptrait.h
|
||||||
|
wx/unix/chkconf.h
|
||||||
wx/unix/execute.h
|
wx/unix/execute.h
|
||||||
|
wx/unix/evtloop.h
|
||||||
wx/unix/mimetype.h
|
wx/unix/mimetype.h
|
||||||
wx/unix/pipe.h
|
wx/unix/pipe.h
|
||||||
wx/unix/private.h
|
wx/unix/private.h
|
||||||
@@ -95,10 +106,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/msw/stackwalk.cpp
|
src/msw/stackwalk.cpp
|
||||||
src/msw/stdpaths.cpp
|
src/msw/stdpaths.cpp
|
||||||
src/msw/thread.cpp
|
src/msw/thread.cpp
|
||||||
|
src/msw/timer.cpp
|
||||||
src/msw/utils.cpp
|
src/msw/utils.cpp
|
||||||
src/msw/utilsexc.cpp
|
src/msw/utilsexc.cpp
|
||||||
</set>
|
</set>
|
||||||
<set var="BASE_AND_GUI_WIN32_SRC" hints="files">
|
<set var="BASE_AND_GUI_WIN32_SRC" hints="files">
|
||||||
|
src/msw/evtloop.cpp
|
||||||
src/msw/main.cpp
|
src/msw/main.cpp
|
||||||
src/msw/mslu.cpp
|
src/msw/mslu.cpp
|
||||||
src/msw/volume.cpp
|
src/msw/volume.cpp
|
||||||
@@ -143,14 +156,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<set var="BASE_COREFOUNDATION_SRC" hints="files">
|
<set var="BASE_COREFOUNDATION_SRC" hints="files">
|
||||||
src/mac/corefoundation/cfstring.cpp
|
src/mac/corefoundation/cfstring.cpp
|
||||||
src/mac/corefoundation/stdpaths_cf.cpp
|
src/mac/corefoundation/stdpaths_cf.cpp
|
||||||
|
src/mac/corefoundation/strconv_cf.cpp
|
||||||
src/mac/corefoundation/utilsexc_base.cpp
|
src/mac/corefoundation/utilsexc_base.cpp
|
||||||
</set>
|
</set>
|
||||||
<set var="BASE_COREFOUNDATION_HDR" hints="files">
|
<set var="BASE_COREFOUNDATION_HDR" hints="files">
|
||||||
wx/mac/corefoundation/cfdataref.h
|
|
||||||
wx/mac/corefoundation/cfref.h
|
|
||||||
wx/mac/corefoundation/cfstring.h
|
wx/mac/corefoundation/cfstring.h
|
||||||
wx/mac/corefoundation/hid.h
|
wx/mac/corefoundation/hid.h
|
||||||
wx/mac/corefoundation/stdpaths.h
|
wx/mac/corefoundation/stdpaths.h
|
||||||
|
wx/mac/corefoundation/private/strconv_cf.h
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
|
<!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
|
||||||
@@ -199,15 +212,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<!-- Base files used only by OS X builds (not CarbonLib or Classic) -->
|
<!-- Base files used only by OS X builds (not CarbonLib or Classic) -->
|
||||||
<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
|
<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
|
||||||
$(BASE_MAC_SRC)
|
$(BASE_MAC_SRC)
|
||||||
|
src/common/fdiodispatcher.cpp
|
||||||
|
src/common/selectdispatcher.cpp
|
||||||
|
src/unix/appunix.cpp
|
||||||
src/unix/baseunix.cpp
|
src/unix/baseunix.cpp
|
||||||
|
src/unix/evtloopunix.cpp
|
||||||
src/unix/dlunix.cpp
|
src/unix/dlunix.cpp
|
||||||
src/unix/snglinst.cpp
|
src/unix/snglinst.cpp
|
||||||
src/unix/stdpaths.cpp
|
src/unix/stdpaths.cpp
|
||||||
|
src/unix/timerunx.cpp
|
||||||
</set>
|
</set>
|
||||||
<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
|
<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
|
||||||
$(BASE_MAC_HDR)
|
$(BASE_MAC_HDR)
|
||||||
|
wx/private/fdiodispatcher.h
|
||||||
|
wx/private/selectdispatcher.h
|
||||||
|
wx/unix/app.h
|
||||||
wx/unix/apptbase.h
|
wx/unix/apptbase.h
|
||||||
wx/unix/apptrait.h
|
wx/unix/apptrait.h
|
||||||
|
wx/unix/chkconf.h
|
||||||
|
wx/unix/evtloop.h
|
||||||
|
wx/unix/pipe.h
|
||||||
wx/unix/stdpaths.h
|
wx/unix/stdpaths.h
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
@@ -228,7 +252,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<set var="BASE_OS2_SRC" hints="files">
|
<set var="BASE_OS2_SRC" hints="files">
|
||||||
src/os2/dir.cpp
|
src/os2/dir.cpp
|
||||||
src/os2/mimetype.cpp
|
src/os2/mimetype.cpp
|
||||||
src/os2/snglinst.cpp
|
|
||||||
src/os2/stdpaths.cpp
|
src/os2/stdpaths.cpp
|
||||||
src/os2/thread.cpp
|
src/os2/thread.cpp
|
||||||
src/os2/utils.cpp
|
src/os2/utils.cpp
|
||||||
@@ -296,6 +319,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/arcall.cpp
|
src/common/arcall.cpp
|
||||||
src/common/arcfind.cpp
|
src/common/arcfind.cpp
|
||||||
src/common/archive.cpp
|
src/common/archive.cpp
|
||||||
|
src/common/arrstr.cpp
|
||||||
|
src/common/base64.cpp
|
||||||
src/common/clntdata.cpp
|
src/common/clntdata.cpp
|
||||||
src/common/cmdline.cpp
|
src/common/cmdline.cpp
|
||||||
src/common/config.cpp
|
src/common/config.cpp
|
||||||
@@ -307,6 +332,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/dynlib.cpp
|
src/common/dynlib.cpp
|
||||||
src/common/dynload.cpp
|
src/common/dynload.cpp
|
||||||
src/common/encconv.cpp
|
src/common/encconv.cpp
|
||||||
|
src/common/evtloopcmn.cpp
|
||||||
src/common/extended.c
|
src/common/extended.c
|
||||||
src/common/ffile.cpp
|
src/common/ffile.cpp
|
||||||
src/common/file.cpp
|
src/common/file.cpp
|
||||||
@@ -343,16 +369,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/strconv.cpp
|
src/common/strconv.cpp
|
||||||
src/common/stream.cpp
|
src/common/stream.cpp
|
||||||
src/common/string.cpp
|
src/common/string.cpp
|
||||||
|
src/common/stringimpl.cpp
|
||||||
|
src/common/stringops.cpp
|
||||||
|
src/common/strvararg.cpp
|
||||||
src/common/sysopt.cpp
|
src/common/sysopt.cpp
|
||||||
src/common/tarstrm.cpp
|
src/common/tarstrm.cpp
|
||||||
src/common/textbuf.cpp
|
src/common/textbuf.cpp
|
||||||
src/common/textfile.cpp
|
src/common/textfile.cpp
|
||||||
|
src/common/timercmn.cpp
|
||||||
|
src/common/timerimpl.cpp
|
||||||
src/common/tokenzr.cpp
|
src/common/tokenzr.cpp
|
||||||
src/common/txtstrm.cpp
|
src/common/txtstrm.cpp
|
||||||
|
src/common/unichar.cpp
|
||||||
src/common/uri.cpp
|
src/common/uri.cpp
|
||||||
src/common/variant.cpp
|
src/common/variant.cpp
|
||||||
src/common/wfstream.cpp
|
src/common/wfstream.cpp
|
||||||
src/common/wxchar.cpp
|
src/common/wxcrt.cpp
|
||||||
|
src/common/wxprintf.cpp
|
||||||
src/common/xti.cpp
|
src/common/xti.cpp
|
||||||
src/common/xtistrm.cpp
|
src/common/xtistrm.cpp
|
||||||
src/common/zipstrm.cpp
|
src/common/zipstrm.cpp
|
||||||
@@ -371,9 +404,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/archive.h
|
wx/archive.h
|
||||||
wx/arrimpl.cpp
|
wx/arrimpl.cpp
|
||||||
wx/arrstr.h
|
wx/arrstr.h
|
||||||
|
wx/atomic.h
|
||||||
|
wx/base64.h
|
||||||
wx/beforestd.h
|
wx/beforestd.h
|
||||||
wx/buffer.h
|
wx/buffer.h
|
||||||
wx/build.h
|
wx/build.h
|
||||||
|
wx/chartype.h
|
||||||
wx/chkconf.h
|
wx/chkconf.h
|
||||||
wx/clntdata.h
|
wx/clntdata.h
|
||||||
wx/cmdline.h
|
wx/cmdline.h
|
||||||
@@ -382,6 +418,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/convauto.h
|
wx/convauto.h
|
||||||
wx/containr.h
|
wx/containr.h
|
||||||
wx/cpp.h
|
wx/cpp.h
|
||||||
|
wx/crt.h
|
||||||
wx/datetime.h
|
wx/datetime.h
|
||||||
wx/datstrm.h
|
wx/datstrm.h
|
||||||
wx/dde.h
|
wx/dde.h
|
||||||
@@ -396,6 +433,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/event.h
|
wx/event.h
|
||||||
wx/except.h
|
wx/except.h
|
||||||
wx/features.h
|
wx/features.h
|
||||||
|
wx/flags.h
|
||||||
wx/ffile.h
|
wx/ffile.h
|
||||||
wx/file.h
|
wx/file.h
|
||||||
wx/fileconf.h
|
wx/fileconf.h
|
||||||
@@ -453,6 +491,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/strconv.h
|
wx/strconv.h
|
||||||
wx/stream.h
|
wx/stream.h
|
||||||
wx/string.h
|
wx/string.h
|
||||||
|
wx/stringimpl.h
|
||||||
|
wx/stringops.h
|
||||||
|
wx/strvararg.h
|
||||||
wx/sysopt.h
|
wx/sysopt.h
|
||||||
wx/tarstrm.h
|
wx/tarstrm.h
|
||||||
wx/textbuf.h
|
wx/textbuf.h
|
||||||
@@ -463,6 +504,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/tokenzr.h
|
wx/tokenzr.h
|
||||||
wx/txtstrm.h
|
wx/txtstrm.h
|
||||||
wx/types.h
|
wx/types.h
|
||||||
|
wx/unichar.h
|
||||||
wx/uri.h
|
wx/uri.h
|
||||||
wx/utils.h
|
wx/utils.h
|
||||||
wx/variant.h
|
wx/variant.h
|
||||||
@@ -472,6 +514,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/wfstream.h
|
wx/wfstream.h
|
||||||
wx/wx.h
|
wx/wx.h
|
||||||
wx/wxchar.h
|
wx/wxchar.h
|
||||||
|
wx/wxcrt.h
|
||||||
|
wx/wxcrtbase.h
|
||||||
|
wx/wxcrtvararg.h
|
||||||
wx/wxprec.h
|
wx/wxprec.h
|
||||||
wx/xti.h
|
wx/xti.h
|
||||||
wx/xtistrm.h
|
wx/xtistrm.h
|
||||||
@@ -564,6 +609,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
<set var="GUI_CMN_SRC" hints="files">
|
<set var="GUI_CMN_SRC" hints="files">
|
||||||
|
src/common/accelcmn.cpp
|
||||||
src/common/accesscmn.cpp
|
src/common/accesscmn.cpp
|
||||||
src/common/anidecod.cpp
|
src/common/anidecod.cpp
|
||||||
src/common/appcmn.cpp
|
src/common/appcmn.cpp
|
||||||
@@ -571,6 +617,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/artstd.cpp
|
src/common/artstd.cpp
|
||||||
src/common/bmpbase.cpp
|
src/common/bmpbase.cpp
|
||||||
src/common/bookctrl.cpp
|
src/common/bookctrl.cpp
|
||||||
|
src/common/btncmn.cpp
|
||||||
|
src/common/cairo.cpp
|
||||||
src/common/choiccmn.cpp
|
src/common/choiccmn.cpp
|
||||||
src/common/clipcmn.cpp
|
src/common/clipcmn.cpp
|
||||||
src/common/clrpickercmn.cpp
|
src/common/clrpickercmn.cpp
|
||||||
@@ -586,6 +634,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/dcbase.cpp
|
src/common/dcbase.cpp
|
||||||
src/common/dcbufcmn.cpp
|
src/common/dcbufcmn.cpp
|
||||||
src/common/dcgraph.cpp
|
src/common/dcgraph.cpp
|
||||||
|
src/common/dcsvg.cpp
|
||||||
src/common/dlgcmn.cpp
|
src/common/dlgcmn.cpp
|
||||||
src/common/dndcmn.cpp
|
src/common/dndcmn.cpp
|
||||||
src/common/dobjcmn.cpp
|
src/common/dobjcmn.cpp
|
||||||
@@ -594,14 +643,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/dpycmn.cpp
|
src/common/dpycmn.cpp
|
||||||
src/common/dseldlg.cpp
|
src/common/dseldlg.cpp
|
||||||
src/common/effects.cpp
|
src/common/effects.cpp
|
||||||
src/common/evtloopcmn.cpp
|
|
||||||
src/common/fddlgcmn.cpp
|
src/common/fddlgcmn.cpp
|
||||||
|
src/common/filectrlcmn.cpp
|
||||||
src/common/filepickercmn.cpp
|
src/common/filepickercmn.cpp
|
||||||
src/common/fontpickercmn.cpp
|
src/common/fontpickercmn.cpp
|
||||||
src/common/fldlgcmn.cpp
|
src/common/fldlgcmn.cpp
|
||||||
src/common/fontcmn.cpp
|
src/common/fontcmn.cpp
|
||||||
src/common/fontenumcmn.cpp
|
src/common/fontenumcmn.cpp
|
||||||
src/common/fontmap.cpp
|
src/common/fontmap.cpp
|
||||||
|
src/common/fontutilcmn.cpp
|
||||||
src/common/framecmn.cpp
|
src/common/framecmn.cpp
|
||||||
src/common/gaugecmn.cpp
|
src/common/gaugecmn.cpp
|
||||||
src/common/gbsizer.cpp
|
src/common/gbsizer.cpp
|
||||||
@@ -643,10 +693,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/sizer.cpp
|
src/common/sizer.cpp
|
||||||
src/common/srchcmn.cpp
|
src/common/srchcmn.cpp
|
||||||
src/common/statbar.cpp
|
src/common/statbar.cpp
|
||||||
|
src/common/stattextcmn.cpp
|
||||||
src/common/stockitem.cpp
|
src/common/stockitem.cpp
|
||||||
src/common/tbarbase.cpp
|
src/common/tbarbase.cpp
|
||||||
src/common/textcmn.cpp
|
src/common/textcmn.cpp
|
||||||
src/common/timercmn.cpp
|
src/common/textentrycmn.cpp
|
||||||
src/common/toplvcmn.cpp
|
src/common/toplvcmn.cpp
|
||||||
src/common/treebase.cpp
|
src/common/treebase.cpp
|
||||||
src/common/valgen.cpp
|
src/common/valgen.cpp
|
||||||
@@ -664,9 +715,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/generic/dcpsg.cpp
|
src/generic/dcpsg.cpp
|
||||||
src/generic/dirctrlg.cpp
|
src/generic/dirctrlg.cpp
|
||||||
src/generic/dragimgg.cpp
|
src/generic/dragimgg.cpp
|
||||||
|
src/generic/filectrlg.cpp
|
||||||
src/generic/filepickerg.cpp
|
src/generic/filepickerg.cpp
|
||||||
src/generic/fontpickerg.cpp
|
src/generic/fontpickerg.cpp
|
||||||
src/generic/graphicc.cpp
|
|
||||||
src/generic/listbkg.cpp
|
src/generic/listbkg.cpp
|
||||||
src/generic/logg.cpp
|
src/generic/logg.cpp
|
||||||
src/generic/numdlgg.cpp
|
src/generic/numdlgg.cpp
|
||||||
@@ -691,6 +742,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/bmpbuttn.h
|
wx/bmpbuttn.h
|
||||||
wx/brush.h
|
wx/brush.h
|
||||||
wx/button.h
|
wx/button.h
|
||||||
|
wx/cairo.h
|
||||||
wx/checkbox.h
|
wx/checkbox.h
|
||||||
wx/checklst.h
|
wx/checklst.h
|
||||||
wx/choicdlg.h
|
wx/choicdlg.h
|
||||||
@@ -708,6 +760,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/dcmemory.h
|
wx/dcmemory.h
|
||||||
wx/dcprint.h
|
wx/dcprint.h
|
||||||
wx/dcscreen.h
|
wx/dcscreen.h
|
||||||
|
wx/dcsvg.h
|
||||||
wx/dialog.h
|
wx/dialog.h
|
||||||
wx/dirdlg.h
|
wx/dirdlg.h
|
||||||
wx/dragimag.h
|
wx/dragimag.h
|
||||||
@@ -727,6 +780,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/generic/dcpsg.h
|
wx/generic/dcpsg.h
|
||||||
wx/generic/dirctrlg.h
|
wx/generic/dirctrlg.h
|
||||||
wx/generic/dragimgg.h
|
wx/generic/dragimgg.h
|
||||||
|
wx/generic/filectrlg.h
|
||||||
wx/generic/filedlgg.h
|
wx/generic/filedlgg.h
|
||||||
wx/generic/filepickerg.h
|
wx/generic/filepickerg.h
|
||||||
wx/generic/fontdlgg.h
|
wx/generic/fontdlgg.h
|
||||||
@@ -744,7 +798,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/generic/splitter.h
|
wx/generic/splitter.h
|
||||||
wx/generic/srchctlg.h
|
wx/generic/srchctlg.h
|
||||||
wx/generic/textdlgg.h
|
wx/generic/textdlgg.h
|
||||||
wx/generic/timer.h
|
|
||||||
wx/generic/treectlg.h
|
wx/generic/treectlg.h
|
||||||
wx/graphics.h
|
wx/graphics.h
|
||||||
wx/helphtml.h
|
wx/helphtml.h
|
||||||
@@ -759,6 +812,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/palette.h
|
wx/palette.h
|
||||||
wx/panel.h
|
wx/panel.h
|
||||||
wx/pen.h
|
wx/pen.h
|
||||||
|
wx/position.h
|
||||||
wx/radiobox.h
|
wx/radiobox.h
|
||||||
wx/radiobut.h
|
wx/radiobut.h
|
||||||
wx/renderer.h
|
wx/renderer.h
|
||||||
@@ -775,6 +829,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/statusbr.h
|
wx/statusbr.h
|
||||||
wx/textctrl.h
|
wx/textctrl.h
|
||||||
wx/textdlg.h
|
wx/textdlg.h
|
||||||
|
wx/textentry.h
|
||||||
wx/toolbar.h
|
wx/toolbar.h
|
||||||
wx/validate.h
|
wx/validate.h
|
||||||
wx/valtext.h
|
wx/valtext.h
|
||||||
@@ -810,6 +865,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/effects.h
|
wx/effects.h
|
||||||
wx/evtloop.h
|
wx/evtloop.h
|
||||||
wx/fdrepdlg.h
|
wx/fdrepdlg.h
|
||||||
|
wx/filectrl.h
|
||||||
wx/filepicker.h
|
wx/filepicker.h
|
||||||
wx/fontpicker.h
|
wx/fontpicker.h
|
||||||
wx/fmappriv.h
|
wx/fmappriv.h
|
||||||
@@ -820,7 +876,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gdiobj.h
|
wx/gdiobj.h
|
||||||
wx/geometry.h
|
wx/geometry.h
|
||||||
wx/gifdecod.h
|
wx/gifdecod.h
|
||||||
wx/glcanvas.h
|
|
||||||
wx/help.h
|
wx/help.h
|
||||||
wx/helpbase.h
|
wx/helpbase.h
|
||||||
wx/helpwin.h
|
wx/helpwin.h
|
||||||
@@ -844,6 +899,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/menuitem.h
|
wx/menuitem.h
|
||||||
wx/metafile.h
|
wx/metafile.h
|
||||||
wx/minifram.h
|
wx/minifram.h
|
||||||
|
wx/nonownedwnd.h
|
||||||
wx/notebook.h
|
wx/notebook.h
|
||||||
wx/ownerdrw.h
|
wx/ownerdrw.h
|
||||||
wx/paper.h
|
wx/paper.h
|
||||||
@@ -920,7 +976,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/gtk/clipbrd.cpp
|
src/gtk/clipbrd.cpp
|
||||||
src/gtk/colour.cpp
|
src/gtk/colour.cpp
|
||||||
src/gtk/cursor.cpp
|
src/gtk/cursor.cpp
|
||||||
src/gtk/data.cpp
|
|
||||||
src/gtk/dataobj.cpp
|
src/gtk/dataobj.cpp
|
||||||
src/gtk/dc.cpp
|
src/gtk/dc.cpp
|
||||||
src/gtk/dcclient.cpp
|
src/gtk/dcclient.cpp
|
||||||
@@ -928,9 +983,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/gtk/dcscreen.cpp
|
src/gtk/dcscreen.cpp
|
||||||
src/gtk/dnd.cpp
|
src/gtk/dnd.cpp
|
||||||
src/gtk/evtloop.cpp
|
src/gtk/evtloop.cpp
|
||||||
|
src/gtk/filectrl.cpp
|
||||||
src/gtk/font.cpp
|
src/gtk/font.cpp
|
||||||
src/gtk/gsockgtk.cpp
|
src/gtk/gsockgtk.cpp
|
||||||
src/gtk/main.cpp
|
|
||||||
src/gtk/minifram.cpp
|
src/gtk/minifram.cpp
|
||||||
src/gtk/pen.cpp
|
src/gtk/pen.cpp
|
||||||
src/gtk/popupwin.cpp
|
src/gtk/popupwin.cpp
|
||||||
@@ -968,7 +1023,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gtk/pen.h
|
wx/gtk/pen.h
|
||||||
wx/gtk/popupwin.h
|
wx/gtk/popupwin.h
|
||||||
wx/gtk/region.h
|
wx/gtk/region.h
|
||||||
wx/gtk/timer.h
|
|
||||||
wx/gtk/tooltip.h
|
wx/gtk/tooltip.h
|
||||||
wx/gtk/toplevel.h
|
wx/gtk/toplevel.h
|
||||||
wx/gtk/win_gtk.h
|
wx/gtk/win_gtk.h
|
||||||
@@ -981,6 +1035,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/generic/dirdlgg.cpp
|
src/generic/dirdlgg.cpp
|
||||||
src/generic/fdrepdlg.cpp
|
src/generic/fdrepdlg.cpp
|
||||||
src/generic/filedlgg.cpp
|
src/generic/filedlgg.cpp
|
||||||
|
src/generic/graphicc.cpp
|
||||||
src/generic/listctrl.cpp
|
src/generic/listctrl.cpp
|
||||||
src/generic/msgdlgg.cpp
|
src/generic/msgdlgg.cpp
|
||||||
src/generic/prntdlgg.cpp
|
src/generic/prntdlgg.cpp
|
||||||
@@ -1010,6 +1065,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/gtk/gauge.cpp
|
src/gtk/gauge.cpp
|
||||||
src/gtk/gnome/gprint.cpp
|
src/gtk/gnome/gprint.cpp
|
||||||
src/gtk/gnome/gvfs.cpp
|
src/gtk/gnome/gvfs.cpp
|
||||||
|
src/gtk/print.cpp
|
||||||
src/gtk/listbox.cpp
|
src/gtk/listbox.cpp
|
||||||
src/gtk/mdi.cpp
|
src/gtk/mdi.cpp
|
||||||
src/gtk/menu.cpp
|
src/gtk/menu.cpp
|
||||||
@@ -1028,9 +1084,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/gtk/stattext.cpp
|
src/gtk/stattext.cpp
|
||||||
src/gtk/tbargtk.cpp
|
src/gtk/tbargtk.cpp
|
||||||
src/gtk/textctrl.cpp
|
src/gtk/textctrl.cpp
|
||||||
|
src/gtk/textentry.cpp
|
||||||
src/gtk/tglbtn.cpp
|
src/gtk/tglbtn.cpp
|
||||||
src/gtk/treeentry_gtk.c
|
src/gtk/treeentry_gtk.c
|
||||||
src/gtk/utilsres.cpp
|
|
||||||
</set>
|
</set>
|
||||||
<set var="GTK_HDR" hints="files">
|
<set var="GTK_HDR" hints="files">
|
||||||
wx/generic/colrdlgg.h
|
wx/generic/colrdlgg.h
|
||||||
@@ -1044,6 +1100,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gtk/button.h
|
wx/gtk/button.h
|
||||||
wx/gtk/checkbox.h
|
wx/gtk/checkbox.h
|
||||||
wx/gtk/checklst.h
|
wx/gtk/checklst.h
|
||||||
|
wx/gtk/chkconf.h
|
||||||
wx/gtk/collpane.h
|
wx/gtk/collpane.h
|
||||||
wx/gtk/colordlg.h
|
wx/gtk/colordlg.h
|
||||||
wx/gtk/choice.h
|
wx/gtk/choice.h
|
||||||
@@ -1052,6 +1109,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gtk/clrpicker.h
|
wx/gtk/clrpicker.h
|
||||||
wx/gtk/dialog.h
|
wx/gtk/dialog.h
|
||||||
wx/gtk/dirdlg.h
|
wx/gtk/dirdlg.h
|
||||||
|
wx/gtk/filectrl.h
|
||||||
wx/gtk/filedlg.h
|
wx/gtk/filedlg.h
|
||||||
wx/gtk/fontpicker.h
|
wx/gtk/fontpicker.h
|
||||||
wx/gtk/filepicker.h
|
wx/gtk/filepicker.h
|
||||||
@@ -1060,6 +1118,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gtk/gauge.h
|
wx/gtk/gauge.h
|
||||||
wx/gtk/gnome/gprint.h
|
wx/gtk/gnome/gprint.h
|
||||||
wx/gtk/gnome/gvfs.h
|
wx/gtk/gnome/gvfs.h
|
||||||
|
wx/gtk/print.h
|
||||||
wx/gtk/listbox.h
|
wx/gtk/listbox.h
|
||||||
wx/gtk/mdi.h
|
wx/gtk/mdi.h
|
||||||
wx/gtk/menu.h
|
wx/gtk/menu.h
|
||||||
@@ -1079,6 +1138,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gtk/stattext.h
|
wx/gtk/stattext.h
|
||||||
wx/gtk/tbargtk.h
|
wx/gtk/tbargtk.h
|
||||||
wx/gtk/textctrl.h
|
wx/gtk/textctrl.h
|
||||||
|
wx/gtk/textentry.h
|
||||||
wx/gtk/tglbtn.h
|
wx/gtk/tglbtn.h
|
||||||
wx/gtk/treectrl.h
|
wx/gtk/treectrl.h
|
||||||
wx/gtk/treeentry_gtk.h
|
wx/gtk/treeentry_gtk.h
|
||||||
@@ -1146,7 +1206,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/gtk1/pen.h
|
wx/gtk1/pen.h
|
||||||
wx/gtk1/popupwin.h
|
wx/gtk1/popupwin.h
|
||||||
wx/gtk1/region.h
|
wx/gtk1/region.h
|
||||||
wx/gtk1/timer.h
|
|
||||||
wx/gtk1/tooltip.h
|
wx/gtk1/tooltip.h
|
||||||
wx/gtk1/toplevel.h
|
wx/gtk1/toplevel.h
|
||||||
wx/gtk1/win_gtk.h
|
wx/gtk1/win_gtk.h
|
||||||
@@ -1197,7 +1256,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/gtk1/tbargtk.cpp
|
src/gtk1/tbargtk.cpp
|
||||||
src/gtk1/textctrl.cpp
|
src/gtk1/textctrl.cpp
|
||||||
src/gtk1/tglbtn.cpp
|
src/gtk1/tglbtn.cpp
|
||||||
src/gtk1/utilsres.cpp
|
|
||||||
</set>
|
</set>
|
||||||
<set var="GTK1_HDR" hints="files">
|
<set var="GTK1_HDR" hints="files">
|
||||||
wx/generic/colrdlgg.h
|
wx/generic/colrdlgg.h
|
||||||
@@ -1330,6 +1388,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
</set>
|
</set>
|
||||||
<set var="MOTIF_HDR" hints="files">
|
<set var="MOTIF_HDR" hints="files">
|
||||||
wx/generic/colrdlgg.h
|
wx/generic/colrdlgg.h
|
||||||
|
wx/generic/ctrlsub.h
|
||||||
wx/generic/dirdlgg.h
|
wx/generic/dirdlgg.h
|
||||||
wx/generic/fdrepdlg.h
|
wx/generic/fdrepdlg.h
|
||||||
wx/generic/fontdlgg.h
|
wx/generic/fontdlgg.h
|
||||||
@@ -1352,6 +1411,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/motif/colour.h
|
wx/motif/colour.h
|
||||||
wx/motif/combobox.h
|
wx/motif/combobox.h
|
||||||
wx/motif/control.h
|
wx/motif/control.h
|
||||||
|
wx/motif/ctrlsub.h
|
||||||
wx/motif/cursor.h
|
wx/motif/cursor.h
|
||||||
wx/motif/dataform.h
|
wx/motif/dataform.h
|
||||||
wx/motif/dataobj.h
|
wx/motif/dataobj.h
|
||||||
@@ -1388,7 +1448,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/motif/stattext.h
|
wx/motif/stattext.h
|
||||||
wx/motif/textctrl.h
|
wx/motif/textctrl.h
|
||||||
wx/motif/tglbtn.h
|
wx/motif/tglbtn.h
|
||||||
wx/motif/timer.h
|
|
||||||
wx/motif/toolbar.h
|
wx/motif/toolbar.h
|
||||||
wx/motif/toplevel.h
|
wx/motif/toplevel.h
|
||||||
wx/motif/window.h
|
wx/motif/window.h
|
||||||
@@ -1402,7 +1461,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
|
|
||||||
<set var="X11_LOWLEVEL_SRC" hints="files">
|
<set var="X11_LOWLEVEL_SRC" hints="files">
|
||||||
$(XWIN_LOWLEVEL_SRC)
|
$(XWIN_LOWLEVEL_SRC)
|
||||||
src/common/socketevtdispatch.cpp
|
src/common/gsocketiohandler.cpp
|
||||||
src/generic/icon.cpp
|
src/generic/icon.cpp
|
||||||
src/generic/timer.cpp
|
src/generic/timer.cpp
|
||||||
src/x11/app.cpp
|
src/x11/app.cpp
|
||||||
@@ -1490,12 +1549,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/msw/dib.cpp
|
src/msw/dib.cpp
|
||||||
src/msw/display.cpp
|
src/msw/display.cpp
|
||||||
src/msw/enhmeta.cpp
|
src/msw/enhmeta.cpp
|
||||||
src/msw/evtloop.cpp
|
|
||||||
src/msw/font.cpp
|
src/msw/font.cpp
|
||||||
src/msw/fontenum.cpp
|
src/msw/fontenum.cpp
|
||||||
src/msw/fontutil.cpp
|
src/msw/fontutil.cpp
|
||||||
src/msw/gdiimage.cpp
|
src/msw/gdiimage.cpp
|
||||||
src/msw/gdiobj.cpp
|
src/msw/gdiobj.cpp
|
||||||
|
src/msw/gdiplus.cpp
|
||||||
src/msw/graphics.cpp
|
src/msw/graphics.cpp
|
||||||
src/msw/gsockmsw.cpp
|
src/msw/gsockmsw.cpp
|
||||||
src/msw/icon.cpp
|
src/msw/icon.cpp
|
||||||
@@ -1513,7 +1572,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/msw/region.cpp
|
src/msw/region.cpp
|
||||||
src/msw/renderer.cpp
|
src/msw/renderer.cpp
|
||||||
src/msw/settings.cpp
|
src/msw/settings.cpp
|
||||||
src/msw/timer.cpp
|
|
||||||
src/msw/tooltip.cpp
|
src/msw/tooltip.cpp
|
||||||
src/msw/toplevel.cpp
|
src/msw/toplevel.cpp
|
||||||
src/msw/utilsgui.cpp
|
src/msw/utilsgui.cpp
|
||||||
@@ -1583,6 +1641,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/msw/tabctrl.cpp
|
src/msw/tabctrl.cpp
|
||||||
src/msw/tbar95.cpp
|
src/msw/tbar95.cpp
|
||||||
src/msw/textctrl.cpp
|
src/msw/textctrl.cpp
|
||||||
|
src/msw/textentry.cpp
|
||||||
src/msw/tglbtn.cpp
|
src/msw/tglbtn.cpp
|
||||||
src/msw/treectrl.cpp
|
src/msw/treectrl.cpp
|
||||||
</set>
|
</set>
|
||||||
@@ -1605,6 +1664,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/msw/combo.h
|
wx/msw/combo.h
|
||||||
wx/msw/combobox.h
|
wx/msw/combobox.h
|
||||||
wx/msw/control.h
|
wx/msw/control.h
|
||||||
|
wx/msw/ctrlsub.h
|
||||||
wx/msw/cursor.h
|
wx/msw/cursor.h
|
||||||
wx/msw/dc.h
|
wx/msw/dc.h
|
||||||
wx/msw/dcclient.h
|
wx/msw/dcclient.h
|
||||||
@@ -1664,8 +1724,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/msw/tabctrl.h
|
wx/msw/tabctrl.h
|
||||||
wx/msw/tbar95.h
|
wx/msw/tbar95.h
|
||||||
wx/msw/textctrl.h
|
wx/msw/textctrl.h
|
||||||
|
wx/msw/textentry.h
|
||||||
wx/msw/tglbtn.h
|
wx/msw/tglbtn.h
|
||||||
wx/msw/timer.h
|
|
||||||
wx/msw/tooltip.h
|
wx/msw/tooltip.h
|
||||||
wx/msw/toplevel.h
|
wx/msw/toplevel.h
|
||||||
wx/msw/treectrl.h
|
wx/msw/treectrl.h
|
||||||
@@ -1793,7 +1853,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/generic/icon.h
|
wx/generic/icon.h
|
||||||
wx/generic/imaglist.h
|
wx/generic/imaglist.h
|
||||||
wx/generic/mask.h
|
wx/generic/mask.h
|
||||||
wx/generic/timer.h
|
|
||||||
wx/mgl/app.h
|
wx/mgl/app.h
|
||||||
wx/mgl/bitmap.h
|
wx/mgl/bitmap.h
|
||||||
wx/mgl/brush.h
|
wx/mgl/brush.h
|
||||||
@@ -1821,7 +1880,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
|
|
||||||
<set var="DFB_LOWLEVEL_SRC" hints="files">
|
<set var="DFB_LOWLEVEL_SRC" hints="files">
|
||||||
src/common/fontmgrcmn.cpp
|
src/common/fontmgrcmn.cpp
|
||||||
src/common/socketevtdispatch.cpp
|
src/common/gsocketiohandler.cpp
|
||||||
src/generic/caret.cpp
|
src/generic/caret.cpp
|
||||||
src/generic/colour.cpp
|
src/generic/colour.cpp
|
||||||
src/generic/icon.cpp
|
src/generic/icon.cpp
|
||||||
@@ -1841,6 +1900,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/dfb/font.cpp
|
src/dfb/font.cpp
|
||||||
src/dfb/fontenum.cpp
|
src/dfb/fontenum.cpp
|
||||||
src/dfb/fontmgr.cpp
|
src/dfb/fontmgr.cpp
|
||||||
|
src/dfb/nonownedwnd.cpp
|
||||||
src/dfb/overlay.cpp
|
src/dfb/overlay.cpp
|
||||||
src/dfb/pen.cpp
|
src/dfb/pen.cpp
|
||||||
src/dfb/region.cpp
|
src/dfb/region.cpp
|
||||||
@@ -1856,7 +1916,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/generic/icon.h
|
wx/generic/icon.h
|
||||||
wx/generic/imaglist.h
|
wx/generic/imaglist.h
|
||||||
wx/generic/mask.h
|
wx/generic/mask.h
|
||||||
wx/generic/timer.h
|
|
||||||
wx/dfb/app.h
|
wx/dfb/app.h
|
||||||
wx/dfb/bitmap.h
|
wx/dfb/bitmap.h
|
||||||
wx/dfb/brush.h
|
wx/dfb/brush.h
|
||||||
@@ -1869,7 +1928,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/dfb/dfbptr.h
|
wx/dfb/dfbptr.h
|
||||||
wx/dfb/evtloop.h
|
wx/dfb/evtloop.h
|
||||||
wx/dfb/font.h
|
wx/dfb/font.h
|
||||||
|
wx/dfb/nonownedwnd.h
|
||||||
wx/dfb/pen.h
|
wx/dfb/pen.h
|
||||||
|
wx/dfb/popupwin.h
|
||||||
wx/dfb/private.h
|
wx/dfb/private.h
|
||||||
wx/dfb/region.h
|
wx/dfb/region.h
|
||||||
wx/dfb/toplevel.h
|
wx/dfb/toplevel.h
|
||||||
@@ -2039,7 +2100,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/os2/tabctrl.h
|
wx/os2/tabctrl.h
|
||||||
wx/os2/textctrl.h
|
wx/os2/textctrl.h
|
||||||
wx/os2/tglbtn.h
|
wx/os2/tglbtn.h
|
||||||
wx/os2/timer.h
|
|
||||||
wx/os2/toolbar.h
|
wx/os2/toolbar.h
|
||||||
wx/os2/tooltip.h
|
wx/os2/tooltip.h
|
||||||
wx/os2/toplevel.h
|
wx/os2/toplevel.h
|
||||||
@@ -2054,14 +2114,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
|
|
||||||
<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
|
<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
|
||||||
<!-- Shared wxMac and wxCocoa files -->
|
<!-- Shared wxMac and wxCocoa files -->
|
||||||
src/mac/common/glgrab.c
|
|
||||||
src/mac/corefoundation/gsockosx.cpp
|
src/mac/corefoundation/gsockosx.cpp
|
||||||
src/mac/corefoundation/hid.cpp
|
src/mac/corefoundation/hid.cpp
|
||||||
src/mac/corefoundation/utilsexc_cf.cpp
|
src/mac/corefoundation/utilsexc_cf.cpp
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
|
<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
|
||||||
wx/mac/common/glgrab.h
|
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="MAC_LOWLEVEL_SRC" hints="files">
|
<set var="MAC_LOWLEVEL_SRC" hints="files">
|
||||||
@@ -2078,8 +2136,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<!-- Native color/font dialogs -->
|
<!-- Native color/font dialogs -->
|
||||||
src/mac/carbon/fontdlgosx.mm
|
src/mac/carbon/fontdlgosx.mm
|
||||||
src/mac/carbon/colordlgosx.mm
|
src/mac/carbon/colordlgosx.mm
|
||||||
<!-- cocoa bridge -->
|
|
||||||
src/mac/carbon/utilscocoa.mm
|
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
@@ -2087,6 +2143,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/mac/carbon/accel.cpp
|
src/mac/carbon/accel.cpp
|
||||||
src/mac/carbon/aga.cpp
|
src/mac/carbon/aga.cpp
|
||||||
src/mac/carbon/app.cpp
|
src/mac/carbon/app.cpp
|
||||||
|
src/mac/carbon/artmac.cpp
|
||||||
src/mac/carbon/bitmap.cpp
|
src/mac/carbon/bitmap.cpp
|
||||||
src/mac/carbon/bmpbuttn.cpp
|
src/mac/carbon/bmpbuttn.cpp
|
||||||
src/mac/carbon/brush.cpp
|
src/mac/carbon/brush.cpp
|
||||||
@@ -2207,7 +2264,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/mac/fontdlg.h
|
wx/mac/fontdlg.h
|
||||||
wx/mac/frame.h
|
wx/mac/frame.h
|
||||||
wx/mac/gauge.h
|
wx/mac/gauge.h
|
||||||
wx/mac/glcanvas.h
|
|
||||||
wx/mac/gsockmac.h
|
wx/mac/gsockmac.h
|
||||||
wx/mac/helpxxxx.h
|
wx/mac/helpxxxx.h
|
||||||
wx/mac/icon.h
|
wx/mac/icon.h
|
||||||
@@ -2249,7 +2305,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/mac/tabctrl.h
|
wx/mac/tabctrl.h
|
||||||
wx/mac/taskbarosx.h
|
wx/mac/taskbarosx.h
|
||||||
wx/mac/textctrl.h
|
wx/mac/textctrl.h
|
||||||
wx/mac/timer.h
|
|
||||||
wx/mac/tglbtn.h
|
wx/mac/tglbtn.h
|
||||||
wx/mac/toolbar.h
|
wx/mac/toolbar.h
|
||||||
wx/mac/tooltip.h
|
wx/mac/tooltip.h
|
||||||
@@ -2335,7 +2390,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/mac/carbon/statusbr.h
|
wx/mac/carbon/statusbr.h
|
||||||
wx/mac/carbon/tabctrl.h
|
wx/mac/carbon/tabctrl.h
|
||||||
wx/mac/carbon/textctrl.h
|
wx/mac/carbon/textctrl.h
|
||||||
wx/mac/carbon/timer.h
|
|
||||||
wx/mac/carbon/tglbtn.h
|
wx/mac/carbon/tglbtn.h
|
||||||
wx/mac/carbon/toolbar.h
|
wx/mac/carbon/toolbar.h
|
||||||
wx/mac/carbon/tooltip.h
|
wx/mac/carbon/tooltip.h
|
||||||
@@ -2525,7 +2579,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/cocoa/statline.h
|
wx/cocoa/statline.h
|
||||||
wx/cocoa/stattext.h
|
wx/cocoa/stattext.h
|
||||||
wx/cocoa/textctrl.h
|
wx/cocoa/textctrl.h
|
||||||
wx/cocoa/timer.h
|
|
||||||
wx/cocoa/toolbar.h
|
wx/cocoa/toolbar.h
|
||||||
wx/cocoa/tooltip.h
|
wx/cocoa/tooltip.h
|
||||||
wx/cocoa/toplevel.h
|
wx/cocoa/toplevel.h
|
||||||
@@ -2609,6 +2662,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
</set>
|
</set>
|
||||||
<set var="UNIV_HDR" hints="files">
|
<set var="UNIV_HDR" hints="files">
|
||||||
wx/generic/accel.h
|
wx/generic/accel.h
|
||||||
|
wx/generic/ctrlsub.h
|
||||||
wx/generic/dirdlgg.h
|
wx/generic/dirdlgg.h
|
||||||
wx/generic/fdrepdlg.h
|
wx/generic/fdrepdlg.h
|
||||||
wx/generic/fontdlgg.h
|
wx/generic/fontdlgg.h
|
||||||
@@ -2665,17 +2719,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<set var="ADVANCED_CMN_SRC" hints="files">
|
<set var="ADVANCED_CMN_SRC" hints="files">
|
||||||
src/common/animatecmn.cpp
|
src/common/animatecmn.cpp
|
||||||
src/common/datavcmn.cpp
|
src/common/datavcmn.cpp
|
||||||
|
src/common/hyperlnkcmn.cpp
|
||||||
src/generic/aboutdlgg.cpp
|
src/generic/aboutdlgg.cpp
|
||||||
src/generic/animateg.cpp
|
src/generic/animateg.cpp
|
||||||
src/generic/bmpcboxg.cpp
|
src/generic/bmpcboxg.cpp
|
||||||
src/generic/calctrl.cpp
|
src/generic/calctrl.cpp
|
||||||
src/generic/datavgen.cpp
|
src/generic/datavgen.cpp
|
||||||
src/generic/datectlg.cpp
|
src/generic/datectlg.cpp
|
||||||
|
src/generic/editlbox.cpp
|
||||||
src/generic/grid.cpp
|
src/generic/grid.cpp
|
||||||
src/generic/gridctrl.cpp
|
src/generic/gridctrl.cpp
|
||||||
src/generic/gridsel.cpp
|
src/generic/gridsel.cpp
|
||||||
src/generic/helpext.cpp
|
src/generic/helpext.cpp
|
||||||
src/generic/hyperlink.cpp
|
src/generic/hyperlinkg.cpp
|
||||||
src/generic/laywin.cpp
|
src/generic/laywin.cpp
|
||||||
src/generic/odcombo.cpp
|
src/generic/odcombo.cpp
|
||||||
src/generic/propdlg.cpp
|
src/generic/propdlg.cpp
|
||||||
@@ -2686,15 +2742,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="ADVANCED_CMN_HDR" hints="files">
|
<set var="ADVANCED_CMN_HDR" hints="files">
|
||||||
|
wx/aboutdlg.h
|
||||||
wx/animate.h
|
wx/animate.h
|
||||||
wx/animdecod.h
|
wx/animdecod.h
|
||||||
wx/bmpcbox.h
|
wx/bmpcbox.h
|
||||||
wx/calctrl.h
|
wx/calctrl.h
|
||||||
wx/dataview.h
|
wx/dataview.h
|
||||||
wx/datectrl.h
|
|
||||||
wx/dateevt.h
|
wx/dateevt.h
|
||||||
wx/dcbuffer.h
|
wx/dcbuffer.h
|
||||||
wx/aboutdlg.h
|
wx/editlbox.h
|
||||||
wx/generic/aboutdlgg.h
|
wx/generic/aboutdlgg.h
|
||||||
wx/generic/animate.h
|
wx/generic/animate.h
|
||||||
wx/generic/bmpcbox.h
|
wx/generic/bmpcbox.h
|
||||||
@@ -2705,6 +2761,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/generic/gridctrl.h
|
wx/generic/gridctrl.h
|
||||||
wx/generic/gridsel.h
|
wx/generic/gridsel.h
|
||||||
wx/generic/helpext.h
|
wx/generic/helpext.h
|
||||||
|
wx/generic/hyperlink.h
|
||||||
wx/generic/laywin.h
|
wx/generic/laywin.h
|
||||||
wx/generic/propdlg.h
|
wx/generic/propdlg.h
|
||||||
wx/generic/sashwin.h
|
wx/generic/sashwin.h
|
||||||
@@ -2721,10 +2778,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/splash.h
|
wx/splash.h
|
||||||
wx/taskbar.h
|
wx/taskbar.h
|
||||||
wx/tipdlg.h
|
wx/tipdlg.h
|
||||||
wx/wave.h
|
|
||||||
wx/wizard.h
|
wx/wizard.h
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
|
<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
|
||||||
|
wx/datectrl.h
|
||||||
|
wx/dataview.h
|
||||||
|
</set>
|
||||||
|
|
||||||
<set var="ADVANCED_MSW_SRC" hints="files">
|
<set var="ADVANCED_MSW_SRC" hints="files">
|
||||||
src/common/taskbarcmn.cpp
|
src/common/taskbarcmn.cpp
|
||||||
src/msw/aboutdlg.cpp
|
src/msw/aboutdlg.cpp
|
||||||
@@ -2756,12 +2817,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/common/taskbarcmn.cpp
|
src/common/taskbarcmn.cpp
|
||||||
src/mac/carbon/aboutdlg.cpp
|
src/mac/carbon/aboutdlg.cpp
|
||||||
src/mac/carbon/drawer.cpp
|
src/mac/carbon/drawer.cpp
|
||||||
|
src/mac/carbon/dataview.cpp
|
||||||
|
src/mac/carbon/databrow.cpp
|
||||||
src/mac/carbon/sound.cpp
|
src/mac/carbon/sound.cpp
|
||||||
src/mac/carbon/taskbar.cpp
|
src/mac/carbon/taskbar.cpp
|
||||||
src/mac/corefoundation/hidjoystick.cpp
|
src/mac/corefoundation/hidjoystick.cpp
|
||||||
</set>
|
</set>
|
||||||
<set var="ADVANCED_MAC_HDR" hints="files">
|
<set var="ADVANCED_MAC_HDR" hints="files">
|
||||||
wx/mac/carbon/drawer.h
|
wx/mac/carbon/drawer.h
|
||||||
|
wx/mac/carbon/dataview.h
|
||||||
|
wx/mac/carbon/databrow.h
|
||||||
wx/mac/carbon/sound.h
|
wx/mac/carbon/sound.h
|
||||||
wx/mac/carbon/taskbarosx.h
|
wx/mac/carbon/taskbarosx.h
|
||||||
wx/mac/corefoundation/joystick.h
|
wx/mac/corefoundation/joystick.h
|
||||||
@@ -2802,11 +2867,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/gtk/aboutdlg.cpp
|
src/gtk/aboutdlg.cpp
|
||||||
src/gtk/animate.cpp
|
src/gtk/animate.cpp
|
||||||
src/gtk/dataview.cpp
|
src/gtk/dataview.cpp
|
||||||
|
src/gtk/hyperlink.cpp
|
||||||
src/gtk/taskbar.cpp
|
src/gtk/taskbar.cpp
|
||||||
src/gtk/eggtrayicon.c
|
src/gtk/eggtrayicon.c
|
||||||
</set>
|
</set>
|
||||||
<set var="ADVANCED_GTK_HDR" hints="files">
|
<set var="ADVANCED_GTK_HDR" hints="files">
|
||||||
wx/gtk/animate.h
|
wx/gtk/animate.h
|
||||||
|
wx/gtk/hyperlink.h
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="ADVANCED_GTK1_SRC" hints="files">
|
<set var="ADVANCED_GTK1_SRC" hints="files">
|
||||||
@@ -2990,6 +3057,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/xrc/xh_slidr.cpp
|
src/xrc/xh_slidr.cpp
|
||||||
src/xrc/xh_spin.cpp
|
src/xrc/xh_spin.cpp
|
||||||
src/xrc/xh_split.cpp
|
src/xrc/xh_split.cpp
|
||||||
|
src/xrc/xh_srchctrl.cpp
|
||||||
src/xrc/xh_statbar.cpp
|
src/xrc/xh_statbar.cpp
|
||||||
src/xrc/xh_stbmp.cpp
|
src/xrc/xh_stbmp.cpp
|
||||||
src/xrc/xh_stbox.cpp
|
src/xrc/xh_stbox.cpp
|
||||||
@@ -3050,6 +3118,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/xrc/xh_slidr.h
|
wx/xrc/xh_slidr.h
|
||||||
wx/xrc/xh_spin.h
|
wx/xrc/xh_spin.h
|
||||||
wx/xrc/xh_split.h
|
wx/xrc/xh_split.h
|
||||||
|
wx/xrc/xh_srchctrl.h
|
||||||
wx/xrc/xh_statbar.h
|
wx/xrc/xh_statbar.h
|
||||||
wx/xrc/xh_stbmp.h
|
wx/xrc/xh_stbmp.h
|
||||||
wx/xrc/xh_stbox.h
|
wx/xrc/xh_stbox.h
|
||||||
@@ -3086,30 +3155,51 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<!-- OpenGL canvas -->
|
<!-- OpenGL canvas -->
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
<set var="OPENGL_SRC" hints="files">
|
<set var="OPENGL_SRC_PLATFORM" hints="files">
|
||||||
|
src/common/glcmn.cpp
|
||||||
<if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
|
||||||
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
|
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
|
||||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
|
||||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
|
src/gtk/glcanvas.cpp
|
||||||
|
src/unix/glx11.cpp
|
||||||
|
</if>
|
||||||
|
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
|
||||||
|
src/gtk1/glcanvas.cpp
|
||||||
|
src/unix/glx11.cpp
|
||||||
|
</if>
|
||||||
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
|
||||||
<if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
|
||||||
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
|
||||||
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
|
||||||
<if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
|
<if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="OPENGL_HDR" hints="files">
|
<set var="OPENGL_SRC" hints="files">
|
||||||
<if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
|
src/common/glcmn.cpp
|
||||||
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
|
$(OPENGL_SRC_PLATFORM)
|
||||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
|
|
||||||
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
|
|
||||||
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
|
|
||||||
<if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
|
|
||||||
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
|
|
||||||
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
|
|
||||||
<if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
|
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
|
<set var="OPENGL_HDR_PLATFORM" hints="files">
|
||||||
|
<if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h wx/mac/carbon/glcanvas.h</if>
|
||||||
|
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
|
||||||
|
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
|
||||||
|
wx/gtk/glcanvas.h
|
||||||
|
wx/unix/glx11.h
|
||||||
|
</if>
|
||||||
|
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
|
||||||
|
wx/gtk1/glcanvas.h
|
||||||
|
wx/unix/glx11.h
|
||||||
|
</if>
|
||||||
|
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
|
||||||
|
<if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
|
||||||
|
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
|
||||||
|
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<set var="OPENGL_HDR" hints="files">
|
||||||
|
wx/glcanvas.h
|
||||||
|
$(OPENGL_HDR_PLATFORM)
|
||||||
|
</set>
|
||||||
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
@@ -3152,7 +3242,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
src/aui/floatpane.cpp
|
src/aui/floatpane.cpp
|
||||||
src/aui/auibook.cpp
|
src/aui/auibook.cpp
|
||||||
src/aui/tabmdi.cpp
|
src/aui/tabmdi.cpp
|
||||||
src/aui/auibar.cpp
|
|
||||||
</set>
|
</set>
|
||||||
<set var="AUI_HDR" hints="files">
|
<set var="AUI_HDR" hints="files">
|
||||||
wx/aui/framemanager.h
|
wx/aui/framemanager.h
|
||||||
@@ -3160,7 +3249,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/aui/floatpane.h
|
wx/aui/floatpane.h
|
||||||
wx/aui/auibook.h
|
wx/aui/auibook.h
|
||||||
wx/aui/tabmdi.h
|
wx/aui/tabmdi.h
|
||||||
wx/aui/auibar.h
|
|
||||||
wx/aui/aui.h
|
wx/aui/aui.h
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
@@ -3191,6 +3279,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
wx/richtext/richtextprint.h
|
wx/richtext/richtextprint.h
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
<!-- wxSTC -->
|
||||||
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
|
<set var="STC_SRC" hints="files">
|
||||||
|
src/stc/stc.cpp
|
||||||
|
src/stc/PlatWX.cpp
|
||||||
|
src/stc/ScintillaWX.cpp
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<set var="STC_HDR" hints="files">
|
||||||
|
wx/stc/stc.h
|
||||||
|
</set>
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
<!-- Define sources for specific libraries: -->
|
<!-- Define sources for specific libraries: -->
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
@@ -3386,7 +3489,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
|
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
|
||||||
</set>
|
</set>
|
||||||
<set var="ADVANCED_HDR" hints="files">
|
<set var="ADVANCED_HDR" hints="files">
|
||||||
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
|
<if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
|
||||||
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
|
<if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
@@ -3427,6 +3530,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
|||||||
$(GUI_CORE_HEADERS)
|
$(GUI_CORE_HEADERS)
|
||||||
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
|
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
|
||||||
$(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
|
$(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
|
||||||
|
$(STC_HDR)
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
|
@@ -1,13 +1,6 @@
|
|||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
|
|
||||||
<bakefile-manifest xmlns="http://www.bakefile.org/schema/bakefile-formats">
|
<bakefile-manifest>
|
||||||
|
|
||||||
<format id="wx24dsp">
|
|
||||||
<description>
|
|
||||||
src/wxWindows.dsp which makes same files as 2.4 version
|
|
||||||
</description>
|
|
||||||
<default-filename>wxWindows.dsp</default-filename>
|
|
||||||
</format>
|
|
||||||
|
|
||||||
<format id="rpmspec">
|
<format id="rpmspec">
|
||||||
<description>
|
<description>
|
||||||
@@ -15,14 +8,5 @@
|
|||||||
</description>
|
</description>
|
||||||
<default-filename>xxx.spec</default-filename>
|
<default-filename>xxx.spec</default-filename>
|
||||||
</format>
|
</format>
|
||||||
|
|
||||||
<format id="cbx_unix">
|
|
||||||
<description>
|
|
||||||
C++BuilderX projects for Unix (use configure)
|
|
||||||
</description>
|
|
||||||
<default-filename>
|
|
||||||
$(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
|
|
||||||
</default-filename>
|
|
||||||
</format>
|
|
||||||
|
|
||||||
</bakefile-manifest>
|
</bakefile-manifest>
|
||||||
|
@@ -1,6 +1,4 @@
|
|||||||
|
|
||||||
This directory contains misc Bakefile backends that are wxWidgets-specific:
|
This directory contains misc Bakefile backends that are wxWidgets-specific:
|
||||||
|
|
||||||
wx24dsp - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
|
|
||||||
rpmspec - generates part of .spec files with list of wxBase headers
|
rpmspec - generates part of .spec files with list of wxBase headers
|
||||||
cbx_unix - Borland C++BuilderX project files for configure-based build
|
|
||||||
|
@@ -1,21 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
<!-- $Id$ -->
|
|
||||||
|
|
||||||
<makefile>
|
|
||||||
|
|
||||||
<include file="presets/fake.bkl"/>
|
|
||||||
<set var="COMPILER">vc</set>
|
|
||||||
|
|
||||||
|
|
||||||
<define-tag name="__fake_hook" rules="__fake">
|
|
||||||
<set var="type" overwrite="0">fake</set>
|
|
||||||
</define-tag>
|
|
||||||
|
|
||||||
<define-tag name="__fake_hook" rules="exe">
|
|
||||||
<set var="type">exe</set>
|
|
||||||
</define-tag>
|
|
||||||
|
|
||||||
<output file="$(OUTPUT_FILE)" writer="cbx_unix.empy"/>
|
|
||||||
<set var="FORMAT_OUTPUT_VARIABLES">type</set>
|
|
||||||
|
|
||||||
</makefile>
|
|
@@ -1,77 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!--C++BuilderX Project-->
|
|
||||||
<project>
|
|
||||||
<property category="build.config" name="active" value="0"/>
|
|
||||||
<property category="build.config" name="count" value="1"/>
|
|
||||||
<property category="build.config" name="excludedefaultforzero" value="0"/>
|
|
||||||
<property category="build.config.0" name="builddir" value="Debug"/>
|
|
||||||
<property category="build.config.0" name="key" value="Debug_Build"/>
|
|
||||||
<property category="build.config.0" name="name" value="Debug Build"/>
|
|
||||||
<property category="build.config.0" name="settings.MinGW" value="default;debug"/>
|
|
||||||
<property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
|
|
||||||
<property category="build.config.0" name="settings.intellinia32" value="default;debug"/>
|
|
||||||
<property category="build.config.0" name="settings.mswin32" value="default;debug"/>
|
|
||||||
<property category="build.config.0" name="type" value="Toolset"/>
|
|
||||||
<property category="build.config.1" name="key" value="Release_Build"/>
|
|
||||||
<property category="build.config.1" name="name" value="Release Build"/>
|
|
||||||
<property category="build.config.1" name="settings.MinGW" value="default;release"/>
|
|
||||||
<property category="build.config.1" name="settings.gnuc++" value="default;release"/>
|
|
||||||
<property category="build.config.1" name="settings.intellinia32" value="default;release"/>
|
|
||||||
<property category="build.config.1" name="settings.mswin32" value="default;release"/>
|
|
||||||
<property category="build.config.1" name="type" value="Toolset"/>
|
|
||||||
<property category="build.node" name="type" value="CBMakefileProjectType"/>
|
|
||||||
<property category="build.platform" name="active" value="linux"/>
|
|
||||||
<property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
|
|
||||||
<property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
|
|
||||||
<property category="build.platform" name="linux.default" value="gnuc++"/>
|
|
||||||
<property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
|
|
||||||
<property category="build.platform" name="linux.mswin32.enabled" value="0"/>
|
|
||||||
<property category="build.platform" name="linux.win32b.enabled" value="0"/>
|
|
||||||
<property category="build.platform" name="solaris.default" value="gnuc++"/>
|
|
||||||
<property category="build.platform" name="solaris.enabled" value="0"/>
|
|
||||||
<property category="build.platform" name="win32.default" value="MinGW"/>
|
|
||||||
<property category="build.platform" name="win32.enabled" value="0"/>
|
|
||||||
<property category="cbproject" name="lastnodeid" value="4"/>
|
|
||||||
<property category="cbproject" name="version" value="X.1.0"/>
|
|
||||||
<property category="classbrowser" name="enable" value="0"/>
|
|
||||||
<property category="classbrowser" name="parser.cpp.skip_standard_directories" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="/usr/include"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="/usr/include/g++-3"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
|
|
||||||
<property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
|
|
||||||
<property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
|
|
||||||
<property category="makefileproject" name="makefile.ID.1" value="1"/>
|
|
||||||
<property category="makefileproject" name="makefile.list.1" value="Makefile"/>
|
|
||||||
<property category="makefiletarget" name="makefile.1.params" value="-f Makefile"/>
|
|
||||||
<property category="makefiletarget" name="makefile.1.target.list.1" value="all"/>
|
|
||||||
<property category="makefiletarget" name="makefile.1.target.list.2" value="clean"/>
|
|
||||||
<property category="runtime" name="ConfigurationCount" value="@(len([t for t in targets if t.type=='exe'])-1)"/>
|
|
||||||
@{
|
|
||||||
ALL_EXES = [x for x in targets if x.type=='exe']
|
|
||||||
if len(ALL_EXES) == 1:
|
|
||||||
DEFAULT_EXE = 0
|
|
||||||
else:
|
|
||||||
DEFAULT_EXE = -1
|
|
||||||
}@
|
|
||||||
<property category="runtime" name="DefaultConfiguration" value="@DEFAULT_EXE"/>
|
|
||||||
@[for i in range(0,len(ALL_EXES))]@
|
|
||||||
<property category="runtime.@i" name="BuildTargetOnRun" value="com.borland.cbuilder.build.CBProjectBuilder$ProjectBuildAction;make"/>
|
|
||||||
<property category="runtime.@i" name="ConfigurationName" value="@ALL_EXES[i].id"/>
|
|
||||||
<property category="runtime.@i" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>
|
|
||||||
<property category="runtime.@i" name="native.exec.path" value="./@ALL_EXES[i].id"/>
|
|
||||||
<property category="runtime.@i" name="native.startdir.path" value="."/>
|
|
||||||
<property category="runtime.@i" name="native.target.override" value="1"/>
|
|
||||||
@[end for]@
|
|
||||||
<property category="unique" name="id" value="4"/>
|
|
||||||
<node name="console" type="NavigationDirectory">
|
|
||||||
<property category="directorynode" name="showSubdirectories" value="1"/>
|
|
||||||
<property category="directorynode" name="url" value="."/>
|
|
||||||
<property category="unique" name="id" value="1"/>
|
|
||||||
</node>
|
|
||||||
</project>
|
|
@@ -4,8 +4,6 @@
|
|||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
<include file="presets/fake.bkl"/>
|
<include file="presets/fake.bkl"/>
|
||||||
|
|
||||||
<set var="EOL_STYLE">unix</set>
|
|
||||||
<set var="COMPILER">gcc</set>
|
<set var="COMPILER">gcc</set>
|
||||||
|
|
||||||
<!-- fake.bkl defaults to win32 platform -->
|
<!-- fake.bkl defaults to win32 platform -->
|
||||||
|
@@ -31,9 +31,8 @@
|
|||||||
<if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
|
<if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
|
||||||
<if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
|
<if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<add-target target="$(BUNDLE_TGT)" type="action"
|
<add-target target="$(BUNDLE_TGT)" type="action"/>
|
||||||
cond="target and PLATFORM_MACOSX=='1'"/>
|
|
||||||
<modify-target target="$(BUNDLE_TGT)">
|
<modify-target target="$(BUNDLE_TGT)">
|
||||||
<!-- required data: -->
|
<!-- required data: -->
|
||||||
<depends>$(id)</depends>
|
<depends>$(id)</depends>
|
||||||
@@ -65,7 +64,7 @@
|
|||||||
|
|
||||||
<!-- add pseudo target id_bundle: -->
|
<!-- add pseudo target id_bundle: -->
|
||||||
<add-target target="$(id)_bundle" type="phony"
|
<add-target target="$(id)_bundle" type="phony"
|
||||||
cond="target and PLATFORM_MACOSX=='1'"/>
|
cond="PLATFORM_MACOSX=='1'"/>
|
||||||
<modify-target target="$(id)_bundle">
|
<modify-target target="$(id)_bundle">
|
||||||
<dependency-of>all</dependency-of>
|
<dependency-of>all</dependency-of>
|
||||||
<depends>$(BUNDLE_TGT_REF)</depends>
|
<depends>$(BUNDLE_TGT_REF)</depends>
|
||||||
|
@@ -15,6 +15,7 @@ COMMDIR = $(WXDIR)/src/common
|
|||||||
HTMLDIR = $(WXDIR)/src/html
|
HTMLDIR = $(WXDIR)/src/html
|
||||||
RICHTEXTDIR = $(WXDIR)/src/richtext
|
RICHTEXTDIR = $(WXDIR)/src/richtext
|
||||||
AUIDIR = $(WXDIR)/src/aui
|
AUIDIR = $(WXDIR)/src/aui
|
||||||
|
STCDIR = $(WXDIR)/src/stc
|
||||||
UNIXDIR = $(WXDIR)/src/unix
|
UNIXDIR = $(WXDIR)/src/unix
|
||||||
PNGDIR = $(WXDIR)/src/png
|
PNGDIR = $(WXDIR)/src/png
|
||||||
JPEGDIR = $(WXDIR)/src/jpeg
|
JPEGDIR = $(WXDIR)/src/jpeg
|
||||||
@@ -166,6 +167,7 @@ ALL_GUI_DIST: ALL_DIST
|
|||||||
mkdir $(DISTDIR)/include/wx/html
|
mkdir $(DISTDIR)/include/wx/html
|
||||||
mkdir $(DISTDIR)/include/wx/richtext
|
mkdir $(DISTDIR)/include/wx/richtext
|
||||||
mkdir $(DISTDIR)/include/wx/aui
|
mkdir $(DISTDIR)/include/wx/aui
|
||||||
|
mkdir $(DISTDIR)/include/wx/stc
|
||||||
mkdir $(DISTDIR)/include/wx/protocol
|
mkdir $(DISTDIR)/include/wx/protocol
|
||||||
mkdir $(DISTDIR)/include/wx/unix
|
mkdir $(DISTDIR)/include/wx/unix
|
||||||
mkdir $(DISTDIR)/include/wx/xml
|
mkdir $(DISTDIR)/include/wx/xml
|
||||||
@@ -176,6 +178,7 @@ ALL_GUI_DIST: ALL_DIST
|
|||||||
$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
|
$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
|
||||||
$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
|
$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
|
||||||
$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
|
$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
|
||||||
|
$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
|
||||||
$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
|
$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
|
||||||
$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
|
$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
|
||||||
$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
|
$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
|
||||||
@@ -190,6 +193,7 @@ ALL_GUI_DIST: ALL_DIST
|
|||||||
mkdir $(DISTDIR)/src/html
|
mkdir $(DISTDIR)/src/html
|
||||||
mkdir $(DISTDIR)/src/richtext
|
mkdir $(DISTDIR)/src/richtext
|
||||||
mkdir $(DISTDIR)/src/aui
|
mkdir $(DISTDIR)/src/aui
|
||||||
|
mkdir $(DISTDIR)/src/stc
|
||||||
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
|
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
|
||||||
mkdir $(DISTDIR)/src/png
|
mkdir $(DISTDIR)/src/png
|
||||||
mkdir $(DISTDIR)/src/jpeg
|
mkdir $(DISTDIR)/src/jpeg
|
||||||
@@ -208,6 +212,7 @@ ALL_GUI_DIST: ALL_DIST
|
|||||||
$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
|
$(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
|
||||||
$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
|
$(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
|
||||||
$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
|
$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
|
||||||
|
$(CP_P) $(STCDIR)/*.cpp $(DISTDIR)/src/stc
|
||||||
$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
|
$(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
|
||||||
$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
|
$(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
|
||||||
$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
|
$(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
|
||||||
@@ -235,6 +240,7 @@ BASE_DIST: ALL_DIST INTL_DIST
|
|||||||
mkdir $(DISTDIR)/include/wx/html
|
mkdir $(DISTDIR)/include/wx/html
|
||||||
mkdir $(DISTDIR)/include/wx/richtext
|
mkdir $(DISTDIR)/include/wx/richtext
|
||||||
mkdir $(DISTDIR)/include/wx/aui
|
mkdir $(DISTDIR)/include/wx/aui
|
||||||
|
mkdir $(DISTDIR)/include/wx/stc
|
||||||
mkdir $(DISTDIR)/include/wx/mac
|
mkdir $(DISTDIR)/include/wx/mac
|
||||||
mkdir $(DISTDIR)/include/wx/mac/carbon
|
mkdir $(DISTDIR)/include/wx/mac/carbon
|
||||||
mkdir $(DISTDIR)/include/wx/mac/corefoundation
|
mkdir $(DISTDIR)/include/wx/mac/corefoundation
|
||||||
@@ -251,7 +257,6 @@ BASE_DIST: ALL_DIST INTL_DIST
|
|||||||
mkdir $(DISTDIR)/src/palmos
|
mkdir $(DISTDIR)/src/palmos
|
||||||
$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
|
$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
|
||||||
$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
|
$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
|
||||||
$(CP_P) $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
|
|
||||||
list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
|
list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
|
||||||
$(CP_P) $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
|
$(CP_P) $(WXDIR)/include/$$p $(DISTDIR)/include/$$p; \
|
||||||
done
|
done
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
<set var="MONOLIB_GUI_SRC">
|
<set var="MONOLIB_GUI_SRC">
|
||||||
<if cond="USE_GUI=='1'">
|
<if cond="USE_GUI=='1'">
|
||||||
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
|
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
|
||||||
$(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC)
|
$(DBGRID_SRC) $(XRC_SRC) $(AUI_SRC) $(RICHTEXT_SRC) $(STC_SRC)
|
||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
<set var="MONOLIB_SRC">
|
<set var="MONOLIB_SRC">
|
||||||
@@ -19,10 +19,16 @@
|
|||||||
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
|
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
|
||||||
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
|
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
|
||||||
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
|
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
|
||||||
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
|
|
||||||
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
|
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
|
||||||
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
|
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
|
||||||
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
|
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
|
||||||
|
<!-- STC stuff, should this be conditionalized? -->
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
|
||||||
|
<define>__WX__</define>
|
||||||
|
<define>SCI_LEXER</define>
|
||||||
|
<define>LINK_LEXERS</define>
|
||||||
|
<library>$(wxscintilla_library_link)</library>
|
||||||
</dll>
|
</dll>
|
||||||
|
|
||||||
<lib id="monolib" template="wx_lib"
|
<lib id="monolib" template="wx_lib"
|
||||||
@@ -33,6 +39,12 @@
|
|||||||
<if cond="FORMAT=='watcom'">
|
<if cond="FORMAT=='watcom'">
|
||||||
<set var="LIB_PAGESIZE" overwrite="1">8192</set>
|
<set var="LIB_PAGESIZE" overwrite="1">8192</set>
|
||||||
</if>
|
</if>
|
||||||
|
<!-- STC stuff, should this be conditionalized? -->
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
|
||||||
|
<define>__WX__</define>
|
||||||
|
<define>SCI_LEXER</define>
|
||||||
|
<define>LINK_LEXERS</define>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
|
||||||
|
@@ -3,6 +3,20 @@
|
|||||||
|
|
||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
|
<define-rule name="wxshortcut" extends="phony">
|
||||||
|
<template>
|
||||||
|
<set var="name">$(id.replace('wx',''))</set>
|
||||||
|
<set var="namedll">
|
||||||
|
<if cond="SHARED=='1'">$(name)dll</if>
|
||||||
|
</set>
|
||||||
|
<set var="namelib">
|
||||||
|
<if cond="SHARED=='0'">$(name)lib</if>
|
||||||
|
</set>
|
||||||
|
<depends>$(namedll)</depends>
|
||||||
|
<depends>$(namelib)</depends>
|
||||||
|
</template>
|
||||||
|
</define-rule>
|
||||||
|
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
<!-- wxBase library -->
|
<!-- wxBase library -->
|
||||||
<!-- ================================================================= -->
|
<!-- ================================================================= -->
|
||||||
@@ -22,6 +36,8 @@
|
|||||||
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
|
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxbase" cond="MONOLITHIC=='0'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
|
||||||
|
|
||||||
|
|
||||||
@@ -44,6 +60,8 @@
|
|||||||
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
|
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxnet" cond="MONOLITHIC=='0'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
|
||||||
|
|
||||||
|
|
||||||
@@ -68,6 +86,8 @@
|
|||||||
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
|
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxcore" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
|
||||||
|
|
||||||
|
|
||||||
@@ -92,6 +112,8 @@
|
|||||||
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
|
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxadv" cond="MONOLITHIC=='0' and USE_GUI=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
|
||||||
|
|
||||||
|
|
||||||
@@ -107,7 +129,6 @@
|
|||||||
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
|
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
|
||||||
<library>coredll</library>
|
<library>coredll</library>
|
||||||
<library>basedll</library>
|
<library>basedll</library>
|
||||||
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
|
|
||||||
</dll>
|
</dll>
|
||||||
|
|
||||||
<lib id="medialib" template="wx_lib"
|
<lib id="medialib" template="wx_lib"
|
||||||
@@ -116,6 +137,8 @@
|
|||||||
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
|
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxmedia" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_MEDIA=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
|
||||||
|
|
||||||
|
|
||||||
@@ -139,7 +162,6 @@
|
|||||||
<msvc-headers>$(ODBC_HDR)</msvc-headers>
|
<msvc-headers>$(ODBC_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
|
||||||
<dll id="dbgriddll" template="wx_dll"
|
<dll id="dbgriddll" template="wx_dll"
|
||||||
cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
|
cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
|
||||||
<define>WXUSINGDLL</define>
|
<define>WXUSINGDLL</define>
|
||||||
@@ -158,6 +180,9 @@
|
|||||||
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
|
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<!-- <wxshortcut id="wxodbc" cond="MONOLITHIC=='0' and USE_ODBC=='1'"/> -->
|
||||||
|
<wxshortcut id="wxdbgrid" cond="MONOLITHIC=='0' and USE_GUI=='1' and USE_ODBC=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
|
||||||
|
|
||||||
@@ -177,12 +202,19 @@
|
|||||||
<msvc-headers>$(HTML_HDR)</msvc-headers>
|
<msvc-headers>$(HTML_HDR)</msvc-headers>
|
||||||
</dll>
|
</dll>
|
||||||
|
|
||||||
|
<!-- use this to conditonally link against htmldll with <library>: -->
|
||||||
|
<set var="htmldll_library_link">
|
||||||
|
<if cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">htmldll</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
<lib id="htmllib" template="wx_lib"
|
<lib id="htmllib" template="wx_lib"
|
||||||
cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
|
cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
|
||||||
<sources>$(HTML_SRC)</sources>
|
<sources>$(HTML_SRC)</sources>
|
||||||
<msvc-headers>$(HTML_HDR)</msvc-headers>
|
<msvc-headers>$(HTML_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxhtml" cond="MONOLITHIC=='0' and USE_HTML=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
|
||||||
|
|
||||||
<!-- ================================================================ -->
|
<!-- ================================================================ -->
|
||||||
@@ -215,6 +247,8 @@
|
|||||||
<msvc-headers>$(QA_HDR)</msvc-headers>
|
<msvc-headers>$(QA_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxqa" cond="MONOLITHIC=='0' and USE_QA=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
|
||||||
|
|
||||||
<!-- ================================================================ -->
|
<!-- ================================================================ -->
|
||||||
@@ -237,6 +271,8 @@
|
|||||||
<msvc-headers>$(XML_HDR)</msvc-headers>
|
<msvc-headers>$(XML_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxxml" cond="MONOLITHIC=='0'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
|
||||||
|
|
||||||
<!-- ================================================================ -->
|
<!-- ================================================================ -->
|
||||||
@@ -248,7 +284,7 @@
|
|||||||
<define>WXUSINGDLL</define>
|
<define>WXUSINGDLL</define>
|
||||||
<define>WXMAKINGDLL_XRC</define>
|
<define>WXMAKINGDLL_XRC</define>
|
||||||
<sources>$(XRC_SRC)</sources>
|
<sources>$(XRC_SRC)</sources>
|
||||||
<library>htmldll</library>
|
<library>$(htmldll_library_link)</library>
|
||||||
<library>advdll</library>
|
<library>advdll</library>
|
||||||
<library>coredll</library>
|
<library>coredll</library>
|
||||||
<library>xmldll</library>
|
<library>xmldll</library>
|
||||||
@@ -262,6 +298,8 @@
|
|||||||
<msvc-headers>$(XRC_HDR)</msvc-headers>
|
<msvc-headers>$(XRC_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxxrc" cond="MONOLITHIC=='0' and USE_XRC=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
|
||||||
|
|
||||||
<!-- ================================================================ -->
|
<!-- ================================================================ -->
|
||||||
@@ -284,6 +322,8 @@
|
|||||||
<sources>$(AUI_SRC)</sources>
|
<sources>$(AUI_SRC)</sources>
|
||||||
<msvc-headers>$(AUI_HDR)</msvc-headers>
|
<msvc-headers>$(AUI_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxaui" cond="MONOLITHIC=='0' and USE_AUI=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">aui=auilib+auidll</set>
|
||||||
|
|
||||||
@@ -297,7 +337,7 @@
|
|||||||
<define>WXMAKINGDLL_RICHTEXT</define>
|
<define>WXMAKINGDLL_RICHTEXT</define>
|
||||||
<sources>$(RICHTEXT_SRC)</sources>
|
<sources>$(RICHTEXT_SRC)</sources>
|
||||||
<library>advdll</library>
|
<library>advdll</library>
|
||||||
<library>htmldll</library>
|
<library>$(htmldll_library_link)</library>
|
||||||
<library>xmldll</library>
|
<library>xmldll</library>
|
||||||
<library>coredll</library>
|
<library>coredll</library>
|
||||||
<library>basedll</library>
|
<library>basedll</library>
|
||||||
@@ -309,7 +349,43 @@
|
|||||||
<sources>$(RICHTEXT_SRC)</sources>
|
<sources>$(RICHTEXT_SRC)</sources>
|
||||||
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
|
<msvc-headers>$(RICHTEXT_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxrichtext" cond="MONOLITHIC=='0' and USE_RICHTEXT=='1'"/>
|
||||||
|
|
||||||
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">richtext=richtextlib+richtextdll</set>
|
||||||
|
|
||||||
|
<!-- ================================================================ -->
|
||||||
|
<!-- STC -->
|
||||||
|
<!-- ================================================================ -->
|
||||||
|
|
||||||
|
<template id="stc_base">
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
|
||||||
|
<define>__WX__</define>
|
||||||
|
<define>SCI_LEXER</define>
|
||||||
|
<define>LINK_LEXERS</define>
|
||||||
|
<cppflags-borland>-w-8027</cppflags-borland>
|
||||||
|
<library>wxscintilla</library>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<dll id="stcdll" template="wx_dll,stc_base"
|
||||||
|
cond="SHARED=='1' and USE_STC=='1' and MONOLITHIC=='0'">
|
||||||
|
<define>WXUSINGDLL</define>
|
||||||
|
<define>WXMAKINGDLL_STC</define>
|
||||||
|
<sources>$(STC_SRC)</sources>
|
||||||
|
<library>coredll</library>
|
||||||
|
<library>basedll</library>
|
||||||
|
<msvc-headers>$(STC_HDR)</msvc-headers>
|
||||||
|
</dll>
|
||||||
|
|
||||||
|
<lib id="stclib" template="wx_lib,stc_base"
|
||||||
|
cond="SHARED=='0' and USE_STC=='1' and MONOLITHIC=='0'">
|
||||||
|
<sources>$(STC_SRC)</sources>
|
||||||
|
<msvc-headers>$(STC_HDR)</msvc-headers>
|
||||||
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxstc" cond="MONOLITHIC=='0' and USE_STC=='1'"/>
|
||||||
|
|
||||||
|
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">stc=stclib+stcdll</set>
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
@@ -28,7 +28,6 @@
|
|||||||
<depends>coredll</depends>
|
<depends>coredll</depends>
|
||||||
<!-- link against the wxWin library in monolithic build: -->
|
<!-- link against the wxWin library in monolithic build: -->
|
||||||
<sys-lib>$(WXLIB_MONO)</sys-lib>
|
<sys-lib>$(WXLIB_MONO)</sys-lib>
|
||||||
<depends>monodll</depends>
|
|
||||||
|
|
||||||
<ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
|
<ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
|
||||||
</dll>
|
</dll>
|
||||||
@@ -39,4 +38,6 @@
|
|||||||
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
|
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
<wxshortcut id="wxgl" cond="USE_GUI=='1' and USE_OPENGL=='1'"/>
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
116
build/bakefiles/scintilla.bkl
Normal file
116
build/bakefiles/scintilla.bkl
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<makefile>
|
||||||
|
|
||||||
|
<if cond="FORMAT=='autoconf'">
|
||||||
|
<set var="LIB_SCINTILLA">
|
||||||
|
wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
<if cond="FORMAT!='autoconf'">
|
||||||
|
<set var="LIB_SCINTILLA">
|
||||||
|
wxscintilla$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
<set var="INC_SCINTILLA">
|
||||||
|
$(TOP_SRCDIR)src/stc/scintilla/include
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<lib id="wxscintilla" template="3rdparty_lib"
|
||||||
|
cond="USE_STC=='1' and BUILDING_LIB=='1'">
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
|
||||||
|
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
|
||||||
|
<define>__WX__</define>
|
||||||
|
<define>SCI_LEXER</define>
|
||||||
|
<define>LINK_LEXERS</define>
|
||||||
|
<dirname>$(LIBDIRNAME)</dirname>
|
||||||
|
<sources>
|
||||||
|
src/stc/scintilla/src/AutoComplete.cxx
|
||||||
|
src/stc/scintilla/src/CallTip.cxx
|
||||||
|
src/stc/scintilla/src/CellBuffer.cxx
|
||||||
|
src/stc/scintilla/src/CharClassify.cxx
|
||||||
|
src/stc/scintilla/src/ContractionState.cxx
|
||||||
|
src/stc/scintilla/src/Document.cxx
|
||||||
|
src/stc/scintilla/src/DocumentAccessor.cxx
|
||||||
|
src/stc/scintilla/src/Editor.cxx
|
||||||
|
src/stc/scintilla/src/ExternalLexer.cxx
|
||||||
|
src/stc/scintilla/src/Indicator.cxx
|
||||||
|
src/stc/scintilla/src/KeyMap.cxx
|
||||||
|
src/stc/scintilla/src/KeyWords.cxx
|
||||||
|
src/stc/scintilla/src/LexAPDL.cxx
|
||||||
|
src/stc/scintilla/src/LexAU3.cxx
|
||||||
|
src/stc/scintilla/src/LexAVE.cxx
|
||||||
|
src/stc/scintilla/src/LexAda.cxx
|
||||||
|
src/stc/scintilla/src/LexAsm.cxx
|
||||||
|
src/stc/scintilla/src/LexAsn1.cxx
|
||||||
|
src/stc/scintilla/src/LexBaan.cxx
|
||||||
|
src/stc/scintilla/src/LexBash.cxx
|
||||||
|
src/stc/scintilla/src/LexBasic.cxx
|
||||||
|
src/stc/scintilla/src/LexBullant.cxx
|
||||||
|
src/stc/scintilla/src/LexCLW.cxx
|
||||||
|
src/stc/scintilla/src/LexCPP.cxx
|
||||||
|
src/stc/scintilla/src/LexCSS.cxx
|
||||||
|
src/stc/scintilla/src/LexCaml.cxx
|
||||||
|
src/stc/scintilla/src/LexCsound.cxx
|
||||||
|
src/stc/scintilla/src/LexConf.cxx
|
||||||
|
src/stc/scintilla/src/LexCrontab.cxx
|
||||||
|
src/stc/scintilla/src/LexEScript.cxx
|
||||||
|
src/stc/scintilla/src/LexEiffel.cxx
|
||||||
|
src/stc/scintilla/src/LexErlang.cxx
|
||||||
|
src/stc/scintilla/src/LexFlagship.cxx
|
||||||
|
src/stc/scintilla/src/LexForth.cxx
|
||||||
|
src/stc/scintilla/src/LexFortran.cxx
|
||||||
|
src/stc/scintilla/src/LexGui4Cli.cxx
|
||||||
|
src/stc/scintilla/src/LexHTML.cxx
|
||||||
|
src/stc/scintilla/src/LexHaskell.cxx
|
||||||
|
src/stc/scintilla/src/LexInno.cxx
|
||||||
|
src/stc/scintilla/src/LexKix.cxx
|
||||||
|
src/stc/scintilla/src/LexLisp.cxx
|
||||||
|
src/stc/scintilla/src/LexLout.cxx
|
||||||
|
src/stc/scintilla/src/LexLua.cxx
|
||||||
|
src/stc/scintilla/src/LexMMIXAL.cxx
|
||||||
|
src/stc/scintilla/src/LexMPT.cxx
|
||||||
|
src/stc/scintilla/src/LexMSSQL.cxx
|
||||||
|
src/stc/scintilla/src/LexMatlab.cxx
|
||||||
|
src/stc/scintilla/src/LexMetapost.cxx
|
||||||
|
src/stc/scintilla/src/LexNsis.cxx
|
||||||
|
src/stc/scintilla/src/LexOpal.cxx
|
||||||
|
src/stc/scintilla/src/LexOthers.cxx
|
||||||
|
src/stc/scintilla/src/LexPB.cxx
|
||||||
|
src/stc/scintilla/src/LexPOV.cxx
|
||||||
|
src/stc/scintilla/src/LexPS.cxx
|
||||||
|
src/stc/scintilla/src/LexPascal.cxx
|
||||||
|
src/stc/scintilla/src/LexPerl.cxx
|
||||||
|
src/stc/scintilla/src/LexPython.cxx
|
||||||
|
src/stc/scintilla/src/LexRebol.cxx
|
||||||
|
src/stc/scintilla/src/LexRuby.cxx
|
||||||
|
src/stc/scintilla/src/LexSQL.cxx
|
||||||
|
src/stc/scintilla/src/LexSmalltalk.cxx
|
||||||
|
src/stc/scintilla/src/LexTADS3.cxx
|
||||||
|
src/stc/scintilla/src/LexScriptol.cxx
|
||||||
|
src/stc/scintilla/src/LexSpecman.cxx
|
||||||
|
src/stc/scintilla/src/LexSpice.cxx
|
||||||
|
src/stc/scintilla/src/LexTCL.cxx
|
||||||
|
src/stc/scintilla/src/LexTeX.cxx
|
||||||
|
src/stc/scintilla/src/LexVB.cxx
|
||||||
|
src/stc/scintilla/src/LexVHDL.cxx
|
||||||
|
src/stc/scintilla/src/LexVerilog.cxx
|
||||||
|
src/stc/scintilla/src/LexYAML.cxx
|
||||||
|
src/stc/scintilla/src/LineMarker.cxx
|
||||||
|
src/stc/scintilla/src/PropSet.cxx
|
||||||
|
src/stc/scintilla/src/RESearch.cxx
|
||||||
|
src/stc/scintilla/src/ScintillaBase.cxx
|
||||||
|
src/stc/scintilla/src/Style.cxx
|
||||||
|
src/stc/scintilla/src/StyleContext.cxx
|
||||||
|
src/stc/scintilla/src/UniConversion.cxx
|
||||||
|
src/stc/scintilla/src/ViewStyle.cxx
|
||||||
|
src/stc/scintilla/src/WindowAccessor.cxx
|
||||||
|
src/stc/scintilla/src/XPM.cxx
|
||||||
|
</sources>
|
||||||
|
</lib>
|
||||||
|
|
||||||
|
<!-- use this to conditonally link against wxscintilla with <library>: -->
|
||||||
|
<set var="wxscintilla_library_link">
|
||||||
|
<if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
|
</makefile>
|
@@ -23,18 +23,24 @@
|
|||||||
</if>
|
</if>
|
||||||
</set>
|
</set>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
<set var="INC_TIFF_BUILD"></set>
|
||||||
|
<if cond="FORMAT=='autoconf'">
|
||||||
|
<set var="INC_TIFF_BUILD">
|
||||||
|
<if cond="wxUSE_LIBTIFF=='builtin'">$(wx_top_builddir)/src/tiff/libtiff</if>
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
<set var="INC_TIFF">
|
<set var="INC_TIFF">
|
||||||
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
|
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff/libtiff</if>
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<set var="TIFF_PLATFORM_SRC">
|
<set var="TIFF_PLATFORM_SRC">
|
||||||
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
|
<if cond="PLATFORM_UNIX=='1'">src/tiff/libtiff/tif_unix.c</if>
|
||||||
<if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
|
<if cond="PLATFORM_MACOSX=='1'">src/tiff/libtiff/tif_unix.c</if>
|
||||||
<if cond="PLATFORM_OS2=='1' and FORMAT!='watcom'">src/tiff/tif_unix.c</if>
|
<if cond="PLATFORM_OS2=='1'">src/tiff/libtiff/tif_unix.c</if>
|
||||||
<if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/tif_os2.c</if>
|
<if cond="PLATFORM_WIN32=='1'">src/tiff/libtiff/tif_win32.c</if>
|
||||||
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
|
<if cond="PLATFORM_MACOS=='1'">src/tiff/libtiff/tif_apple.c</if>
|
||||||
<if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
|
<if cond="PLATFORM_MSDOS=='1'">src/tiff/libtiff/tif_msdos.c</if>
|
||||||
<if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
|
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<lib id="wxtiff" template="3rdparty_lib"
|
<lib id="wxtiff" template="3rdparty_lib"
|
||||||
@@ -42,6 +48,8 @@
|
|||||||
<dirname>$(LIBDIRNAME)</dirname>
|
<dirname>$(LIBDIRNAME)</dirname>
|
||||||
<include>$(INC_ZLIB)</include>
|
<include>$(INC_ZLIB)</include>
|
||||||
<include>$(INC_JPEG)</include>
|
<include>$(INC_JPEG)</include>
|
||||||
|
<include>$(INC_TIFF_BUILD)</include>
|
||||||
|
<include>$(INC_TIFF)</include>
|
||||||
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
|
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
|
||||||
<cflags-dmars>-w2</cflags-dmars>
|
<cflags-dmars>-w2</cflags-dmars>
|
||||||
<cflags-watcom>-wcd=124</cflags-watcom>
|
<cflags-watcom>-wcd=124</cflags-watcom>
|
||||||
@@ -49,40 +57,41 @@
|
|||||||
<define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
|
<define cond="PLATFORM_MSDOS=='1' and FORMAT=='watcom'">__MSDOS__</define>
|
||||||
<sources>
|
<sources>
|
||||||
$(TIFF_PLATFORM_SRC)
|
$(TIFF_PLATFORM_SRC)
|
||||||
src/tiff/tif_aux.c
|
src/tiff/libtiff/tif_aux.c
|
||||||
src/tiff/tif_close.c
|
src/tiff/libtiff/tif_close.c
|
||||||
src/tiff/tif_codec.c
|
src/tiff/libtiff/tif_codec.c
|
||||||
src/tiff/tif_color.c
|
src/tiff/libtiff/tif_color.c
|
||||||
src/tiff/tif_compress.c
|
src/tiff/libtiff/tif_compress.c
|
||||||
src/tiff/tif_dir.c
|
src/tiff/libtiff/tif_dir.c
|
||||||
src/tiff/tif_dirinfo.c
|
src/tiff/libtiff/tif_dirinfo.c
|
||||||
src/tiff/tif_dirread.c
|
src/tiff/libtiff/tif_dirread.c
|
||||||
src/tiff/tif_dirwrite.c
|
src/tiff/libtiff/tif_dirwrite.c
|
||||||
src/tiff/tif_dumpmode.c
|
src/tiff/libtiff/tif_dumpmode.c
|
||||||
src/tiff/tif_error.c
|
src/tiff/libtiff/tif_error.c
|
||||||
src/tiff/tif_extension.c
|
src/tiff/libtiff/tif_extension.c
|
||||||
src/tiff/tif_fax3.c
|
src/tiff/libtiff/tif_fax3.c
|
||||||
src/tiff/tif_fax3sm.c
|
src/tiff/libtiff/tif_fax3sm.c
|
||||||
src/tiff/tif_getimage.c
|
src/tiff/libtiff/tif_flush.c
|
||||||
src/tiff/tif_jpeg.c
|
src/tiff/libtiff/tif_getimage.c
|
||||||
src/tiff/tif_flush.c
|
src/tiff/libtiff/tif_jpeg.c
|
||||||
src/tiff/tif_lzw.c
|
src/tiff/libtiff/tif_luv.c
|
||||||
src/tiff/tif_luv.c
|
src/tiff/libtiff/tif_lzw.c
|
||||||
src/tiff/tif_next.c
|
src/tiff/libtiff/tif_next.c
|
||||||
src/tiff/tif_open.c
|
src/tiff/libtiff/tif_ojpeg.c
|
||||||
src/tiff/tif_packbits.c
|
src/tiff/libtiff/tif_open.c
|
||||||
src/tiff/tif_pixarlog.c
|
src/tiff/libtiff/tif_packbits.c
|
||||||
src/tiff/tif_predict.c
|
src/tiff/libtiff/tif_pixarlog.c
|
||||||
src/tiff/tif_print.c
|
src/tiff/libtiff/tif_predict.c
|
||||||
src/tiff/tif_read.c
|
src/tiff/libtiff/tif_print.c
|
||||||
src/tiff/tif_swab.c
|
src/tiff/libtiff/tif_read.c
|
||||||
src/tiff/tif_strip.c
|
src/tiff/libtiff/tif_strip.c
|
||||||
src/tiff/tif_thunder.c
|
src/tiff/libtiff/tif_swab.c
|
||||||
src/tiff/tif_tile.c
|
src/tiff/libtiff/tif_thunder.c
|
||||||
src/tiff/tif_version.c
|
src/tiff/libtiff/tif_tile.c
|
||||||
src/tiff/tif_warning.c
|
src/tiff/libtiff/tif_version.c
|
||||||
src/tiff/tif_write.c
|
src/tiff/libtiff/tif_warning.c
|
||||||
src/tiff/tif_zip.c
|
src/tiff/libtiff/tif_write.c
|
||||||
|
src/tiff/libtiff/tif_zip.c
|
||||||
</sources>
|
</sources>
|
||||||
</lib>
|
</lib>
|
||||||
|
|
||||||
|
@@ -23,9 +23,9 @@
|
|||||||
3. Else, i.e. if there were no changes at all to API but only internal
|
3. Else, i.e. if there were no changes at all to API but only internal
|
||||||
changes, change C:R:A to C:R+1:A
|
changes, change C:R:A to C:R+1:A
|
||||||
-->
|
-->
|
||||||
<set var="WX_CURRENT">7</set>
|
<set var="WX_CURRENT">0</set>
|
||||||
<set var="WX_REVISION">0</set>
|
<set var="WX_REVISION">0</set>
|
||||||
<set var="WX_AGE">7</set>
|
<set var="WX_AGE">0</set>
|
||||||
|
|
||||||
|
|
||||||
<!-- ================================================================== -->
|
<!-- ================================================================== -->
|
||||||
|
@@ -221,7 +221,7 @@
|
|||||||
<depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
|
<depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
|
||||||
|
|
||||||
<command>
|
<command>
|
||||||
$(DOLLAR)(CPP) "$(nativePaths(SRCDIR))\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
$(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||||
</command>
|
</command>
|
||||||
|
|
||||||
</action>
|
</action>
|
||||||
|
@@ -112,7 +112,6 @@ would like to build, separated by commas. Valid values are:
|
|||||||
|
|
||||||
autoconf GNU autoconf Makefile.in files
|
autoconf GNU autoconf Makefile.in files
|
||||||
borland Borland C/C++ makefiles
|
borland Borland C/C++ makefiles
|
||||||
cbuilderx C++ Builder X project files
|
|
||||||
dmars Digital Mars makefiles
|
dmars Digital Mars makefiles
|
||||||
dmars_smake Digital Mars makefiles for SMAKE
|
dmars_smake Digital Mars makefiles for SMAKE
|
||||||
gnu GNU toolchain makefiles (Unix)
|
gnu GNU toolchain makefiles (Unix)
|
||||||
|
64
build/bakefiles/wxpresets/libsample/configure.in
Normal file
64
build/bakefiles/wxpresets/libsample/configure.in
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
|
AC_PREREQ(2.59)
|
||||||
|
AC_INIT([libsample],[1.2.5],[vslavik@fastmail.fm])
|
||||||
|
AC_CONFIG_SRCDIR([libsample.cpp])
|
||||||
|
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl DEFINE CONFIGURE OPTIONS
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
dnl define all the wx-config related options
|
||||||
|
dnl (i.e. --with-wxdir, --with-wx-config, --with-wx-prefix, --with-wx-exec-prefix)
|
||||||
|
WX_CONFIG_OPTIONS
|
||||||
|
|
||||||
|
dnl define all the wxpresets related options
|
||||||
|
WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl CONFIGURE CHECKS
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
dnl these checks are required by bakefile:
|
||||||
|
AC_CANONICAL_SYSTEM
|
||||||
|
AC_PROG_AWK
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_LN_S
|
||||||
|
AC_PROG_RANLIB
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_CXX
|
||||||
|
AC_PROG_CXXCPP
|
||||||
|
|
||||||
|
dnl we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
|
||||||
|
WX_DEBUG=$DEBUG
|
||||||
|
WX_UNICODE=$UNICODE
|
||||||
|
|
||||||
|
dnl the following macros will search for the best matching wxWidgets build
|
||||||
|
dnl (taking in count the values of the --enable-debug|unicode|shared and of
|
||||||
|
dnl the --with-toolkit|wxshared options) and then set appropriately all the
|
||||||
|
dnl WX_* options
|
||||||
|
WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
|
||||||
|
WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[core,base],[$WXCONFIG_FLAGS])
|
||||||
|
WX_DETECT_STANDARD_OPTION_VALUES
|
||||||
|
|
||||||
|
dnl here all WX_* option values are available for your own processing...
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl CONFIGURE END
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
AC_BAKEFILE([m4_include(autoconf_inc.m4)])
|
||||||
|
AC_CONFIG_FILES([Makefile])
|
||||||
|
AC_OUTPUT
|
||||||
|
|
||||||
|
|
||||||
|
dnl show a nice summary of the chosen build settings to the user
|
||||||
|
WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
|
||||||
|
WX_STANDARD_OPTIONS_SUMMARY_MSG_END
|
||||||
|
|
47
build/bakefiles/wxpresets/libsample/libsample.bkl
Normal file
47
build/bakefiles/wxpresets/libsample/libsample.bkl
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?xml version="1.0" ?>
|
||||||
|
<!-- $Id$ -->
|
||||||
|
|
||||||
|
<makefile>
|
||||||
|
|
||||||
|
<!-- a typical nice feature which wxpresets make available to wx-based programs
|
||||||
|
is to allow the user to build with different configurations those programs;
|
||||||
|
this is achieved in few fundamental steps:
|
||||||
|
|
||||||
|
1) set a different BUILDDIR for different build configurations
|
||||||
|
2) set different output dirs for the libraries built with a
|
||||||
|
different shared/static setting
|
||||||
|
3) set different output names for the libraries built with
|
||||||
|
different unicode/ansi and release/debug settings
|
||||||
|
-->
|
||||||
|
<include file="presets/wx.bkl"/>
|
||||||
|
|
||||||
|
<!-- the following line implements step #1: -->
|
||||||
|
<set-wxlike-builddir/>
|
||||||
|
|
||||||
|
<!-- through the use of the 'wx-lib' and 'wxlike' templates, we'll get
|
||||||
|
the ability to compile against any wxWidgets build using, for our
|
||||||
|
program, the same configuration of the selected wxWidgets build.
|
||||||
|
-->
|
||||||
|
<template id="my" template="wx-lib,wxlike">
|
||||||
|
<!-- wxlike-dirname implements step #2 (see initial comment) -->
|
||||||
|
<wxlike-dirname>lib</wxlike-dirname>
|
||||||
|
|
||||||
|
<sources>libsample.cpp</sources>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<lib id="static" template="my" cond="WX_SHARED=='0'">
|
||||||
|
<!-- wxlike-libname implements step #3 (see initial comment) -->
|
||||||
|
<wxlike-libname prefix='sample'>test</wxlike-libname>
|
||||||
|
</lib>
|
||||||
|
|
||||||
|
<dll id="shared" template="my" cond="WX_SHARED=='1'">
|
||||||
|
<!-- wxlike-dllname does step #3 (see initial comment) -->
|
||||||
|
<wxlike-dllname prefix='sample'>test</wxlike-dllname>
|
||||||
|
<define>WXMAKINGDLL_LIBSAMPLE</define>
|
||||||
|
|
||||||
|
<wx-lib>core</wx-lib>
|
||||||
|
<wx-lib>base</wx-lib>
|
||||||
|
</dll>
|
||||||
|
|
||||||
|
</makefile>
|
41
build/bakefiles/wxpresets/libsample/libsample.cpp
Normal file
41
build/bakefiles/wxpresets/libsample/libsample.cpp
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Name: libsample.cpp
|
||||||
|
// Purpose: The source of a dummy sample wx-based library
|
||||||
|
// Author: Francesco Montorsi
|
||||||
|
// Modified by:
|
||||||
|
// Created: 26/11/06
|
||||||
|
// RCS-ID: $Id$
|
||||||
|
// Copyright: (c) Francesco Montorsi
|
||||||
|
// Licence: wxWindows licence
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// declarations
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// headers
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
|
#ifdef __BORLANDC__
|
||||||
|
#pragma hdrstop
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// for all others, include the necessary headers (this file is usually all you
|
||||||
|
// need because it includes almost all "standard" wxWindows headers)
|
||||||
|
#ifndef WX_PRECOMP
|
||||||
|
#include "wx/wx.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// implementation
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
void MyUtilityFunction()
|
||||||
|
{
|
||||||
|
wxPrintf(wxT("Hello world!\n"));
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
@@ -4,25 +4,133 @@
|
|||||||
<!--
|
<!--
|
||||||
Presets for building wxWidgets applications.
|
Presets for building wxWidgets applications.
|
||||||
|
|
||||||
FIXME: docs
|
These presets provide the following "public" interface:
|
||||||
|
|
||||||
|
OPTIONS:
|
||||||
|
|
||||||
|
- WX_* : used to let the user of the generated makefile choose a wxWidgets
|
||||||
|
build among those available; you can use them in your project to
|
||||||
|
e.g. build a target only if WX_DEBUG is 0 or if WX_PORT is "msw".
|
||||||
|
|
||||||
|
|
||||||
|
VARIABLES:
|
||||||
|
|
||||||
|
- WXLIBPOSTFIX: contains the [u][d] string which is typically useful when
|
||||||
|
defining names of directories/files which should coexist
|
||||||
|
with other builds using different wxWidgets configurations.
|
||||||
|
|
||||||
|
|
||||||
|
TEMPLATES:
|
||||||
|
|
||||||
|
- wx, wx-lib: templates to be used respectively for <dll>/<exe> and <lib>
|
||||||
|
targets; they add all the wxWidgets-related settings (e.g. the
|
||||||
|
include and library search paths, the __WXDEBUG__ symbol, etc)
|
||||||
|
|
||||||
|
- wxconsole: to be used when building console-only libraries or apps
|
||||||
|
(adds the wxUSE_GUI=0 define).
|
||||||
|
|
||||||
|
- wxlike: this template should be combined with "wx" or "wx-lib" and will
|
||||||
|
make your project build with the same Unicode, debug & shared
|
||||||
|
config as the wxWidgets build selected using the WX_* options.
|
||||||
|
|
||||||
|
|
||||||
|
TARGET TAGS:
|
||||||
|
|
||||||
|
- <wx-lib>: to define which wxWidgets libraries to link with;
|
||||||
|
please note that you should use them in the right order or
|
||||||
|
linking under Unix would result in errors, e.g.
|
||||||
|
|
||||||
|
<wx-lib>core</wx-lib>
|
||||||
|
<wx-lib>base</wx-lib>
|
||||||
|
|
||||||
|
is correct, but the reverse is not (if lib A depends on lib B, then
|
||||||
|
lib A must be listed before B). So <wx-lib>base</wx-lib>
|
||||||
|
(which must always be present) should be the last wx-lib tag.
|
||||||
|
|
||||||
|
- <wxlike-libname>,
|
||||||
|
<wxlike-dllname>: useful if you want to have a build logic similar to the
|
||||||
|
wxWidgets build logic which allows different builds to
|
||||||
|
coexist without conflicts. These tags helps you to name
|
||||||
|
libraries using the same wxWidgets rules and thus avoid
|
||||||
|
conflicts between libraries compiled in e.g. Unicode,
|
||||||
|
shared mode and those compiled in ANSI, shared mode &c.
|
||||||
|
|
||||||
|
- <wxlike-lib>: if your library/application needs to link with both
|
||||||
|
wxWidgets and some other wx-based library, which in turn
|
||||||
|
follows the wxWidgets naming conventions, then this tag is
|
||||||
|
what you need to reference the wx-based additional library.
|
||||||
|
|
||||||
|
- <wxlike-dirname>: sets the output directory for the current target to $(value)
|
||||||
|
when on Unix and to e.g. $(value)/vc_lib when on Windows,
|
||||||
|
i.e. acts like <dirname> just following wxWidgets naming rules.
|
||||||
|
Useful to allow multiple builds of the
|
||||||
|
|
||||||
|
- <wxlike-paths>: if your library/application needs to compile & link with both
|
||||||
|
wxWidgets and some other wx-based library, which in turn
|
||||||
|
follows the wxWidgets naming conventions, then this tag is
|
||||||
|
what you need to add to the compiler and linker flags the paths
|
||||||
|
of the "include" and "lib" folders of the wx-based additional library.
|
||||||
|
|
||||||
|
|
||||||
|
GLOBAL TAGS:
|
||||||
|
|
||||||
|
- <set-wxlike-builddir>: sets BUILDDIR using wxWidgets naming rules to help
|
||||||
|
to keep object files compiled with different
|
||||||
|
settings separate.
|
||||||
|
|
||||||
|
- <set-wxlike>: sets a variable with the name of a library named with the same
|
||||||
|
wxWidgets rules.
|
||||||
|
|
||||||
|
|
||||||
|
NOTE: as a reference here is a list of all wxWidgets libraries satisfying
|
||||||
|
the dependency constraints mentioned in <wx-lib> description:
|
||||||
|
|
||||||
|
<wx-lib>richtext</wx-lib>
|
||||||
|
<wx-lib>aui</wx-lib>
|
||||||
|
<wx-lib>stc</wx-lib>
|
||||||
|
<wx-lib>qa</wx-lib>
|
||||||
|
<wx-lib>dbgrid</wx-lib>
|
||||||
|
<wx-lib>gl</wx-lib>
|
||||||
|
<wx-lib>odbc</wx-lib>
|
||||||
|
<wx-lib>xrc</wx-lib>
|
||||||
|
<wx-lib>html</wx-lib>
|
||||||
|
<wx-lib>media</wx-lib>
|
||||||
|
<wx-lib>adv</wx-lib>
|
||||||
|
<wx-lib>net</wx-lib>
|
||||||
|
<wx-lib>xml</wx-lib>
|
||||||
|
<wx-lib>core</wx-lib>
|
||||||
|
<wx-lib>base</wx-lib>
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|
||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
<!-- this variable identifies the version of the wx presets.
|
<requires version="0.2.2"/>
|
||||||
this is changed only when major changes to wxpresets take place. -->
|
|
||||||
<set var="WX_PRESETS_VERSION">3</set>
|
|
||||||
|
|
||||||
<!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl -->
|
|
||||||
<set var="LIB_LIST">
|
<!-- this variable identifies the version of the wx presets.
|
||||||
base core net xml odbc xrc html adv media gl dbgrid qa aui richtext
|
this is changed only when major changes to wxpresets take place.
|
||||||
|
-->
|
||||||
|
<set var="WX_PRESETS_VERSION">4</set>
|
||||||
|
|
||||||
|
<!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl
|
||||||
|
VERY IMPORTANT: when updating this list also update the <wx-lib> and <wx-all-libs>
|
||||||
|
tag definitions.
|
||||||
|
-->
|
||||||
|
<set var="WX_LIB_LIST">
|
||||||
|
base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
|
||||||
</set>
|
</set>
|
||||||
|
|
||||||
<!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
|
<!-- if you define this variable to 0 before including wx presets, the
|
||||||
(which is already in LIB_LIST) -->
|
"test_for_selected_wxbuild" target which is added by default in win32 and GNU
|
||||||
<set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set>
|
makefiles, won't be added.
|
||||||
<set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set>
|
This is useful when e.g. you want to have wxWidgets as an optional
|
||||||
|
dependency and thus you don't want to perform that check unconditionally.
|
||||||
|
-->
|
||||||
|
<set var="WX_TEST_FOR_SELECTED_WXBUILD" overwrite="0">
|
||||||
|
1
|
||||||
|
</set>
|
||||||
|
|
||||||
<!-- this is a temporary variable until there is non general -->
|
<!-- this is a temporary variable until there is non general -->
|
||||||
<!-- function in bakefiles for returning native markup for -->
|
<!-- function in bakefiles for returning native markup for -->
|
||||||
@@ -33,6 +141,109 @@
|
|||||||
</set>
|
</set>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- OPTIONS -->
|
||||||
|
<!-- -->
|
||||||
|
<!-- These are essentially the configurations you -->
|
||||||
|
<!-- want in bakefile. -->
|
||||||
|
<!-- -->
|
||||||
|
<!-- In MSVC these are the different build -->
|
||||||
|
<!-- configurations you can have (in the build menu), -->
|
||||||
|
<!-- and in autoconf is enabled with enable-xxx=xx. -->
|
||||||
|
<!-- For other compilers a separate configuration -->
|
||||||
|
<!-- file is created (such as config.gcc on gcc) -->
|
||||||
|
<!-- which has several options a user can modify. -->
|
||||||
|
<!-- -->
|
||||||
|
<!-- Note that the above only happens if an option -->
|
||||||
|
<!-- is not constant, i.e. if it cannot be determined -->
|
||||||
|
<!-- by bakefile itself. -->
|
||||||
|
<!-- Also note that for 'autoconf' format these options -->
|
||||||
|
<!-- are only useful when used together with wxpresets.m4 -->
|
||||||
|
<!-- macro file which contains macros for detecting the -->
|
||||||
|
<!-- option values for wx-based projects. See wxpresets.m4 -->
|
||||||
|
<!-- comments for more info. -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Presets for limited dmars make.exe format: -->
|
||||||
|
<if cond="FORMAT=='dmars'">
|
||||||
|
<set var="WX_UNICODE">0</set>
|
||||||
|
<set var="WX_DEBUG">1</set>
|
||||||
|
<set var="WX_SHARED">0</set>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
|
||||||
|
<if cond="FORMAT=='gnu'">
|
||||||
|
<set var="WX_UNICODE"/>
|
||||||
|
<set var="WX_DEBUG"/>
|
||||||
|
<set var="WX_SHARED"/>
|
||||||
|
<set var="WX_PORT"/>
|
||||||
|
<set var="WX_VERSION"/>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- This is a standard option that determines -->
|
||||||
|
<!-- whether the user wants to build this library as -->
|
||||||
|
<!-- a dll or as a static library. -->
|
||||||
|
<if cond="not isdefined('WX_SHARED')">
|
||||||
|
<set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
|
||||||
|
<option name="WX_SHARED">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>Static,DLL</values-description>
|
||||||
|
<default-value>$(WX_SHARED_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Use DLL build of wx library?
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<!-- Configuration for building the bakefile with -->
|
||||||
|
<!-- unicode strings or not (unicode or ansi). -->
|
||||||
|
<if cond="not isdefined('WX_UNICODE')">
|
||||||
|
<set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
|
||||||
|
<option name="WX_UNICODE">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>ANSI,Unicode</values-description>
|
||||||
|
<default-value>$(WX_UNICODE_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Use Unicode build of wxWidgets?
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if cond="not isdefined('WX_DEBUG')">
|
||||||
|
<set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
|
||||||
|
<option name="WX_DEBUG">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>Release,Debug</values-description>
|
||||||
|
<default-value>$(WX_DEBUG_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Use debug build of wxWidgets (define __WXDEBUG__)?
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if cond="not isdefined('WX_VERSION')">
|
||||||
|
<set var="WX_VERSION_DEFAULT" overwrite="0">29</set>
|
||||||
|
<option name="WX_VERSION">
|
||||||
|
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Version of the wx library to build against.
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if cond="not isdefined('WX_MONOLITHIC')">
|
||||||
|
<set var="WX_MONOLITHIC_DEFAULT" overwrite="0">0</set>
|
||||||
|
<option name="WX_MONOLITHIC">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>Multilib,Monolithic</values-description>
|
||||||
|
<default-value>$(WX_MONOLITHIC_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Use monolithic build of wxWidgets?
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
</if>
|
||||||
|
|
||||||
<!-- The directory where wxWidgets is installed: -->
|
<!-- The directory where wxWidgets is installed: -->
|
||||||
<if cond="not isdefined('WX_DIR')">
|
<if cond="not isdefined('WX_DIR')">
|
||||||
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
|
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
|
||||||
@@ -46,6 +257,21 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- HELPER VARIABLES -->
|
||||||
|
<!-- -->
|
||||||
|
|
||||||
|
<!-- These are handy ways of dealing with the -->
|
||||||
|
<!-- extensions in the library names of the -->
|
||||||
|
<!-- wxWindows library. -->
|
||||||
|
<set var="WXLIBPOSTFIX">
|
||||||
|
<if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
|
||||||
|
<if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
|
||||||
|
<if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- this is just a wrapper that includes the real implementation: -->
|
<!-- this is just a wrapper that includes the real implementation: -->
|
||||||
|
|
||||||
<set var="__wx_included_impl">0</set>
|
<set var="__wx_included_impl">0</set>
|
||||||
@@ -64,4 +290,239 @@
|
|||||||
<error>This format is not (yet) supported by wx preset.</error>
|
<error>This format is not (yet) supported by wx preset.</error>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- HIGH-LEVEL TEMPLATE -->
|
||||||
|
<!-- -->
|
||||||
|
|
||||||
|
<!-- Combine 'wxlike' with 'wx' or 'wx-lib' templates to have your
|
||||||
|
project build in the same configuration used by the selected
|
||||||
|
wxWidgets build -->
|
||||||
|
<template id="wxlike">
|
||||||
|
<!-- WX_DEBUG-dependent -->
|
||||||
|
<set var="_OPT">
|
||||||
|
<if cond="WX_DEBUG=='1'">off</if>
|
||||||
|
<if cond="WX_DEBUG=='0'">speed</if>
|
||||||
|
</set>
|
||||||
|
<set var="_DEBUGINFO">
|
||||||
|
<if cond="WX_DEBUG=='1'">on</if>
|
||||||
|
<if cond="WX_DEBUG=='0'">off</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<if cond="FORMAT!='autoconf'">
|
||||||
|
<optimize>$(_OPT)</optimize>
|
||||||
|
<debug-info>$(_DEBUGINFO)</debug-info>
|
||||||
|
</if>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Template for building wx-based console applications -->
|
||||||
|
<template id="wxconsole" template="wx">
|
||||||
|
<define>wxUSE_GUI=0</define>
|
||||||
|
<app-type>console</app-type>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- UTILITY TAGS -->
|
||||||
|
<!-- -->
|
||||||
|
|
||||||
|
<!-- private helper tag: does the same thing as for <set-wxlike> except that:
|
||||||
|
- the variable created is always named "__temp"
|
||||||
|
- can be used (only) inside targets as this is a non-global tag
|
||||||
|
-->
|
||||||
|
<define-tag name="__setlibname" rules="lib,dll,module,exe">
|
||||||
|
<set var="__temp">
|
||||||
|
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
|
||||||
|
$(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
|
||||||
|
</if>
|
||||||
|
<if cond="FORMAT=='autoconf' or FORMAT=='gnu'">
|
||||||
|
$(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
|
||||||
|
</if>
|
||||||
|
</set>
|
||||||
|
</define-tag>
|
||||||
|
|
||||||
|
<!-- A simple tag which helps you to define a library name using the same rules used
|
||||||
|
by wxWidgets. Use the 'prefix' attribute to add your lib's prefix.
|
||||||
|
E.g.:
|
||||||
|
<wxlike-libname prefix='mylib'>module1</wxlike-libname>
|
||||||
|
<wxlike-libname prefix='mylib'>module2</wxlike-libname>
|
||||||
|
-->
|
||||||
|
<define-tag name="wxlike-libname" rules="lib">
|
||||||
|
<__setlibname prefix="$(attributes['prefix'])">$(value)</__setlibname>
|
||||||
|
<libname>$(__temp)</libname>
|
||||||
|
</define-tag>
|
||||||
|
|
||||||
|
<!-- exactly like <wxlike-libname> but this one sets the DLL name (and the DLL lib import name)
|
||||||
|
and thus must be used only inside a <dll> target...
|
||||||
|
-->
|
||||||
|
<define-tag name="wxlike-dllname" rules="dll,module">
|
||||||
|
<__setlibname prefix="$(attributes['prefix'])">$(value)</__setlibname>
|
||||||
|
<libname>$(__temp)</libname>
|
||||||
|
<dllname>$(__temp)</dllname>
|
||||||
|
</define-tag>
|
||||||
|
|
||||||
|
<!-- Links against a library which uses the same wxWidgets conventions.
|
||||||
|
-->
|
||||||
|
<define-tag name="wxlike-lib" rules="exe,lib,dll,module">
|
||||||
|
<__setlibname prefix="$(attributes['prefix'])">$(value)</__setlibname>
|
||||||
|
<sys-lib>$(__temp)</sys-lib>
|
||||||
|
</define-tag>
|
||||||
|
|
||||||
|
<!-- Sets as output folder for the current target a directory
|
||||||
|
called "$(value)/$(COMPILER)_lib|dll", just like wxWidgets does.
|
||||||
|
This makes it possible to keep separed the libraries/exes compiled with
|
||||||
|
different compilers and with a different value for WX_SHARED.
|
||||||
|
-->
|
||||||
|
<define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
|
||||||
|
<if cond="FORMAT!='autoconf'">
|
||||||
|
<set var="_DIRNAME_SHARED_SUFFIX">
|
||||||
|
<if cond="WX_SHARED=='0'">lib</if>
|
||||||
|
<if cond="WX_SHARED=='1'">dll</if>
|
||||||
|
</set>
|
||||||
|
<set var="_DIRNAME">
|
||||||
|
$(value)/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX)
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<dirname>$(_DIRNAME)</dirname>
|
||||||
|
|
||||||
|
<if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
|
||||||
|
<set var="__mkdir_tgt">make_dir_$(id)</set>
|
||||||
|
|
||||||
|
<add-target target="$(__mkdir_tgt)" type="action"/>
|
||||||
|
<modify-target target="$(__mkdir_tgt)">
|
||||||
|
<command cond="TOOLSET=='unix'">
|
||||||
|
@mkdir -p $(_DIRNAME)
|
||||||
|
</command>
|
||||||
|
<command cond="TOOLSET in ['win32','os2','dos']">
|
||||||
|
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
|
||||||
|
</command>
|
||||||
|
</modify-target>
|
||||||
|
|
||||||
|
<!-- the following code is mostly equivalent to a:
|
||||||
|
<dependency-of>$(id)</dependency-of>
|
||||||
|
put into the __mkdir_tgt target, except that it does _prepend_
|
||||||
|
the __mkdir_tgt dependency instead of appending it.
|
||||||
|
|
||||||
|
This is required because some compilers (e.g. MSVC) need to store in the
|
||||||
|
output folder some files (e.g. the PDB file) while compiling and thus
|
||||||
|
the library output folder must have been created before _any_ source file
|
||||||
|
is compiled, not just before the library is linked.
|
||||||
|
-->
|
||||||
|
<modify-target target="$(id)">
|
||||||
|
<set var="__deps" prepend="1">
|
||||||
|
$(substitute(__mkdir_tgt, lambda x: ref('__depname', x), 'DEP'))
|
||||||
|
</set>
|
||||||
|
</modify-target>
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
|
<if cond="FORMAT=='autoconf'">
|
||||||
|
<set var="_DIRNAME">$(value)</set>
|
||||||
|
<dirname>$(_DIRNAME)</dirname>
|
||||||
|
</if>
|
||||||
|
</define-tag>
|
||||||
|
|
||||||
|
<!-- Adds to the compiler & linker flags the path for the "include" and the
|
||||||
|
"lib" folders of a library following wxWidgets conventions which is
|
||||||
|
located in $(value).
|
||||||
|
-->
|
||||||
|
<define-tag name="wxlike-paths" rules="exe,lib,dll,module">
|
||||||
|
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
|
||||||
|
<!-- WXLIBPATH is a path like "/lib/vc_lib"
|
||||||
|
NOTE: even if this template is going to be used for a "lib"
|
||||||
|
target (which does not uses lib-paths at all), we can still
|
||||||
|
use the <lib-path> target: it will just be discarded
|
||||||
|
-->
|
||||||
|
<lib-path>$(value)$(WXLIBPATH)</lib-path>
|
||||||
|
|
||||||
|
<!-- no special include paths for a lib following wxWidgets naming
|
||||||
|
conventions -->
|
||||||
|
<include>$(value)/include</include>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<!-- for autoconf format the user should use CPPFLAGS and LDFLAGS to
|
||||||
|
specify non-system paths since the wx-based library should have
|
||||||
|
been installed in standard paths
|
||||||
|
-->
|
||||||
|
</define-tag>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- UTILITY GLOBAL TAGS -->
|
||||||
|
<!-- -->
|
||||||
|
|
||||||
|
<!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
|
||||||
|
This makes it possible to keep separed the object files compiled with
|
||||||
|
different configuration settings.
|
||||||
|
-->
|
||||||
|
<define-global-tag name="set-wxlike-builddir">
|
||||||
|
<!-- note that the builddir for autoconf should always be '.' -->
|
||||||
|
<if cond="FORMAT!='autoconf'">
|
||||||
|
<set var="_BUILDDIR_SHARED_SUFFIX">
|
||||||
|
<if cond="WX_SHARED=='0'"></if>
|
||||||
|
<if cond="WX_SHARED=='1'">_dll</if>
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<set var="BUILDDIR">
|
||||||
|
$(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
</define-global-tag>
|
||||||
|
|
||||||
|
<!-- Sets a variable with the name of the 'var' attribute value using the
|
||||||
|
same rules used for wxWidgets library naming.
|
||||||
|
E.g.
|
||||||
|
|
||||||
|
<set-wxlike var='MYMODULE_LIBNAME' prefix='mylib'>
|
||||||
|
mymodule
|
||||||
|
</set-wxlike>
|
||||||
|
|
||||||
|
This tag also supports a 'cond' attribute making it very powerful
|
||||||
|
for conditional linking a wx-based library:
|
||||||
|
|
||||||
|
<option name="USE_MYMODULE">
|
||||||
|
<values>0,1</values>
|
||||||
|
</option>
|
||||||
|
<set-wxlike var='MYMODULE_DEP'
|
||||||
|
prefix='mylib'
|
||||||
|
cond="USE_MYMODULE=='1'">
|
||||||
|
mymodule
|
||||||
|
</set-wxlike>
|
||||||
|
...
|
||||||
|
<exe id="myexe">
|
||||||
|
<sys-lib>$(MYMODULE_DEP)</sys-lib>
|
||||||
|
</exe>
|
||||||
|
-->
|
||||||
|
<define-global-tag name="set-wxlike">
|
||||||
|
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
|
||||||
|
<if cond="'cond' not in attributes">
|
||||||
|
<set var="$(attributes['var'])">
|
||||||
|
$(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
<if cond="'cond' in attributes">
|
||||||
|
<set var="$(attributes['var'])">
|
||||||
|
<if cond="$(attributes['cond'])">
|
||||||
|
$(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
|
||||||
|
</if>
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if cond="FORMAT=='autoconf' or FORMAT=='gnu'">
|
||||||
|
<if cond="'cond' not in attributes">
|
||||||
|
<set var="$(attributes['var'])">
|
||||||
|
$(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
<if cond="'cond' in attributes">
|
||||||
|
<set var="$(attributes['var'])">
|
||||||
|
<if cond="$(attributes['cond'])">
|
||||||
|
$(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
|
||||||
|
</if>
|
||||||
|
</set>
|
||||||
|
</if>
|
||||||
|
</if>
|
||||||
|
</define-global-tag>
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
@@ -5,64 +5,217 @@
|
|||||||
Presents for building wxWidgets applications using Autoconf or GNU toosets.
|
Presents for building wxWidgets applications using Autoconf or GNU toosets.
|
||||||
See wx.bkl for platform-independent notes.
|
See wx.bkl for platform-independent notes.
|
||||||
|
|
||||||
Usage:
|
|
||||||
Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
|
|
||||||
|
|
||||||
|
|
||||||
Format-specific notes:
|
Format-specific notes:
|
||||||
|
|
||||||
* autoconf:
|
* autoconf:
|
||||||
Beware that you have to use AM_OPTIONS_WXCONFIG and
|
Beware that you have to use AM_OPTIONS_WXCONFIG and
|
||||||
AM_PATH_WXCONFIG in your configure.in!
|
AM_PATH_WXCONFIG in your configure.in to get at least the
|
||||||
|
WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
|
||||||
|
To detect the WX_* option values typically you also want to use
|
||||||
|
the AM_WXPRESETS_OPTIONS and AM_WXPRESETS_CHECKS macros
|
||||||
|
(see wxpresets.m4 for more info).
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|
||||||
<makefile>
|
<makefile>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ============================================================== -->
|
<!-- ============================================================== -->
|
||||||
<!-- Autoconf -->
|
<!-- Autoconf -->
|
||||||
<!-- ============================================================== -->
|
<!-- ============================================================== -->
|
||||||
|
|
||||||
<if cond="FORMAT=='autoconf'">
|
<if cond="FORMAT=='autoconf'">
|
||||||
<!-- Autoconf backend is simplicity itself thanks to wx-config... -->
|
|
||||||
<option name="WX_CFLAGS"/>
|
<option name="WX_CFLAGS"/>
|
||||||
<option name="WX_CXXFLAGS"/>
|
<option name="WX_CXXFLAGS"/>
|
||||||
<option name="WX_CPPFLAGS"/>
|
<option name="WX_CPPFLAGS"/>
|
||||||
<option name="WX_LIBS"/>
|
<option name="WX_LIBS"/>
|
||||||
<option name="WX_RESCOMP"/>
|
<option name="WX_RESCOMP"/>
|
||||||
|
<option name="WX_VERSION_MAJOR"/>
|
||||||
|
<option name="WX_VERSION_MINOR"/>
|
||||||
|
<option name="WX_PORT"/>
|
||||||
|
|
||||||
|
<!-- wxwin.m4 macros will detect all WX_* options defined above -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
|
||||||
|
in all your bakefiles !!
|
||||||
|
-->
|
||||||
|
<define-tag name="wx-lib" rules="exe,dll,module">
|
||||||
|
<if cond="value=='base'">
|
||||||
|
<!-- all wx-dependent libraries should have been already listed
|
||||||
|
thus we can now add WX_LIBS to the linker line -->
|
||||||
|
<ldlibs>$(WX_LIBS)</ldlibs>
|
||||||
|
</if>
|
||||||
|
<if cond="value not in WX_LIB_LIST.split()">
|
||||||
|
<error>Unknown wxWidgets library given in the wx-lib tag</error>
|
||||||
|
</if>
|
||||||
|
</define-tag>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
|
||||||
<!-- ============================================================== -->
|
<!-- ============================================================== -->
|
||||||
<!-- GNU makefiles for Unix -->
|
<!-- GNU makefiles for Unix -->
|
||||||
<!-- ============================================================== -->
|
<!-- ============================================================== -->
|
||||||
|
|
||||||
<if cond="FORMAT=='gnu'">
|
<if cond="FORMAT=='gnu'">
|
||||||
|
|
||||||
|
<!-- remove those WX_* vars which were created just to avoid the definition
|
||||||
|
of the WX_* options in wx.bkl -->
|
||||||
|
<unset var="WX_SHARED"/>
|
||||||
|
<unset var="WX_UNICODE"/>
|
||||||
|
<unset var="WX_DEBUG"/>
|
||||||
|
<unset var="WX_PORT"/>
|
||||||
|
<unset var="WX_VERSION"/>
|
||||||
|
|
||||||
<set var="WX_CONFIG_DEFAULT" overwrite="0">wx-config</set>
|
<set var="WX_CONFIG_DEFAULT" overwrite="0">wx-config</set>
|
||||||
<option name="WX_CONFIG">
|
<option name="WX_CONFIG">
|
||||||
<default-value>$(WX_CONFIG_DEFAULT)</default-value>
|
<default-value>$(WX_CONFIG_DEFAULT)</default-value>
|
||||||
<description>Location and arguments of wx-config script</description>
|
<description>Location and arguments of wx-config script</description>
|
||||||
</option>
|
</option>
|
||||||
<option name="WX_CFLAGS">
|
|
||||||
<default-value>`$(DOLLAR)(WX_CONFIG) --cflags`</default-value>
|
<set var="WX_PORT_DEFAULT" overwrite="0">
|
||||||
<description>C flags to use with wxWidgets code</description>
|
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
|
||||||
|
</set>
|
||||||
|
<option name="WX_PORT">
|
||||||
|
<values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
|
||||||
|
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Port of the wx library to build against
|
||||||
|
</description>
|
||||||
</option>
|
</option>
|
||||||
<option name="WX_CXXFLAGS">
|
|
||||||
<default-value>`$(DOLLAR)(WX_CONFIG) --cxxflags`</default-value>
|
<set var="WX_SHARED_DEFAULT" overwrite="0">
|
||||||
<description>C++ flags to use with wxWidgets code</description>
|
$(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
|
||||||
|
</set>
|
||||||
|
<option name="WX_SHARED">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>Static,DLL</values-description>
|
||||||
|
<default-value force="1">$(WX_SHARED_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Use DLL build of wx library to use?
|
||||||
|
</description>
|
||||||
</option>
|
</option>
|
||||||
<option name="WX_CPPFLAGS">
|
|
||||||
<default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
|
<set var="WX_UNICODE_DEFAULT" overwrite="0">
|
||||||
<description>C preprocessor flags to use with wxWidgets code</description>
|
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
|
||||||
|
</set>
|
||||||
|
<option name="WX_UNICODE">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>ANSI,Unicode</values-description>
|
||||||
|
<default-value force="1">$(WX_UNICODE_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Compile Unicode build of wxWidgets?
|
||||||
|
</description>
|
||||||
</option>
|
</option>
|
||||||
<option name="WX_RESCOMP">
|
|
||||||
<default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
|
<set var="WX_DEBUG_DEFAULT" overwrite="0">
|
||||||
<description>wxWidgets resource compiler and flags</description>
|
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
|
||||||
|
</set>
|
||||||
|
<option name="WX_DEBUG">
|
||||||
|
<values>0,1</values>
|
||||||
|
<values-description>Release,Debug</values-description>
|
||||||
|
<default-value force="1">$(WX_DEBUG_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Use debug build of wxWidgets (define __WXDEBUG__)?
|
||||||
|
</description>
|
||||||
</option>
|
</option>
|
||||||
|
|
||||||
|
<set var="WX_VERSION_DEFAULT" overwrite="0">
|
||||||
|
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
|
||||||
|
</set>
|
||||||
|
<option name="WX_VERSION">
|
||||||
|
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
||||||
|
<description>
|
||||||
|
Version of the wx library to build against.
|
||||||
|
</description>
|
||||||
|
</option>
|
||||||
|
|
||||||
|
<!-- Get MAJOR and MINOR version numbers -->
|
||||||
|
<set var="WX_VERSION_MAJOR" make_var="1">
|
||||||
|
$(DOLLAR)(shell echo $(DOLLAR)(WX_VERSION) | cut -c1,1)
|
||||||
|
</set>
|
||||||
|
<set var="WX_VERSION_MINOR" make_var="1">
|
||||||
|
$(DOLLAR)(shell echo $(DOLLAR)(WX_VERSION) | cut -c2,2)
|
||||||
|
</set>
|
||||||
|
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Using the GNU format creates a configurable makefile just like
|
||||||
|
a win32 makefile: i.e. a makefile where you can select the wanted
|
||||||
|
wxWidgets build using the WX_* options.
|
||||||
|
|
||||||
|
The difference with win32 makefiles is that WX_DEBUG, WX_UNICODE and
|
||||||
|
WX_SHARED options have a smart default value which is created using
|
||||||
|
the installed wx-config or the wx-config given using WX_CONFIG option
|
||||||
|
-->
|
||||||
|
<set var="WX_CONFIG_DEBUG_FLAG">
|
||||||
|
<if cond="WX_DEBUG=='0'">--debug=no</if>
|
||||||
|
<if cond="WX_DEBUG=='1'">--debug=yes</if>
|
||||||
|
</set>
|
||||||
|
<set var="WX_CONFIG_UNICODE_FLAG">
|
||||||
|
<if cond="WX_UNICODE=='0'">--unicode=no</if>
|
||||||
|
<if cond="WX_UNICODE=='1'">--unicode=yes</if>
|
||||||
|
</set>
|
||||||
|
<set var="WX_CONFIG_SHARED_FLAG">
|
||||||
|
<if cond="WX_SHARED=='0'">--static=yes</if>
|
||||||
|
<if cond="WX_SHARED=='1'">--static=no</if>
|
||||||
|
</set>
|
||||||
|
<set var="WX_CONFIG_PORT_FLAG">
|
||||||
|
--toolkit=$(WX_PORT)
|
||||||
|
</set>
|
||||||
|
<set var="WX_CONFIG_VERSION_FLAG">
|
||||||
|
--version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<set var="WX_CONFIG_FLAGS" make_var="1">
|
||||||
|
$(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG)
|
||||||
|
$(WX_CONFIG_PORT_FLAG) $(WX_CONFIG_VERSION_FLAG)
|
||||||
|
</set>
|
||||||
|
|
||||||
|
<set var="WX_CFLAGS">`$(DOLLAR)(WX_CONFIG) --cflags $(WX_CONFIG_FLAGS)`</set>
|
||||||
|
<set var="WX_CXXFLAGS">`$(DOLLAR)(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)`</set>
|
||||||
|
<set var="WX_CPPFLAGS">`$(DOLLAR)(WX_CONFIG) --cppflags $(WX_CONFIG_FLAGS)`</set>
|
||||||
|
<set var="WX_RESCOMP">`$(DOLLAR)(WX_CONFIG) --rescomp $(WX_CONFIG_FLAGS)`</set>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
VERY IMPORTANT: before starting to build all targets of the generated makefile,
|
||||||
|
we need to check if the selected wxWidgets build exists; we do
|
||||||
|
that simply creating the following target; if it fails the make
|
||||||
|
program will halt with the wx-config error message...
|
||||||
|
-->
|
||||||
|
<if cond="WX_TEST_FOR_SELECTED_WXBUILD=='1'">
|
||||||
|
<action id="test_for_selected_wxbuild">
|
||||||
|
<dependency-of>all</dependency-of>
|
||||||
|
|
||||||
|
<!-- Use @ to hide to the user that we're running wx-config... -->
|
||||||
|
<command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
|
||||||
|
</action>
|
||||||
|
</if>
|
||||||
|
|
||||||
<!-- we need this but the trick used in default-values above
|
<!-- we need this but the trick used in default-values above
|
||||||
prevents bakefile from detecting it: -->
|
prevents bakefile from detecting it: -->
|
||||||
<set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
|
<set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG WX_VERSION</set>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
|
||||||
|
in all your bakefiles !!
|
||||||
|
-->
|
||||||
|
<define-tag name="wx-lib" rules="exe,dll,module">
|
||||||
|
<if cond="value=='base'">
|
||||||
|
<!-- all wx libraries should have been already specified, thus
|
||||||
|
$(__liblist) should contain the full list... -->
|
||||||
|
<set var="__liblist" append="1">base</set>
|
||||||
|
<ldlibs>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldlibs>
|
||||||
|
</if>
|
||||||
|
<if cond="value!='base'">
|
||||||
|
<set var="__liblist" append="1">$(value)</set>
|
||||||
|
</if>
|
||||||
|
<if cond="value not in WX_LIB_LIST.split()">
|
||||||
|
<error>Unknown wxWidgets library given in the wx-lib tag</error>
|
||||||
|
</if>
|
||||||
|
</define-tag>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<!-- ============================================================== -->
|
<!-- ============================================================== -->
|
||||||
@@ -110,27 +263,4 @@ Format-specific notes:
|
|||||||
-->
|
-->
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
|
|
||||||
in all your bakefiles !!
|
|
||||||
-->
|
|
||||||
<define-tag name="wx-lib" rules="exe,dll,module">
|
|
||||||
<if cond="FORMAT=='autoconf' and value=='base'">
|
|
||||||
<!-- all wx-dependent libraries should have been already listed
|
|
||||||
thus we can now add WX_LIBS to the linker line -->
|
|
||||||
<ldflags>$(WX_LIBS)</ldflags>
|
|
||||||
</if>
|
|
||||||
<if cond="FORMAT=='gnu' and value=='base'">
|
|
||||||
<!-- all wx libraries should have been already specified, thus
|
|
||||||
$(__liblist) should contain the full list... -->
|
|
||||||
<set var="__liblist" append="1">base</set>
|
|
||||||
<ldflags>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldflags>
|
|
||||||
</if>
|
|
||||||
<if cond="FORMAT=='gnu' and value!='base'">
|
|
||||||
<set var="__liblist" append="1">$(value)</set>
|
|
||||||
</if>
|
|
||||||
<if cond="value not in ALLLIB_LIST.split()">
|
|
||||||
<error>Unknown wxWidgets library given in the wx-lib tag</error>
|
|
||||||
</if>
|
|
||||||
</define-tag>
|
|
||||||
|
|
||||||
</makefile>
|
</makefile>
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user