Files
@ r2989:c7c58e254010
Branch filter:
Location: cpp/openttd-patchpack/source/Makefile - annotation
r2989:c7c58e254010
26.3 KiB
text/x-makefile
(svn r3564) Several smaller changes:
- Don't treat non-booleans as booleans
- Reduce variable scope
- Bracing
- Use DeMorgan's law to make conditionals easier to read
- if cascade -> switch
- Replace some magic numbers by symbolic names
- Avoid assignments within other statements
- Don't treat non-booleans as booleans
- Reduce variable scope
- Bracing
- Use DeMorgan's law to make conditionals easier to read
- if cascade -> switch
- Replace some magic numbers by symbolic names
- Avoid assignments within other statements
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 | r2185:83c584e8be30 r2185:83c584e8be30 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r563:033512da2e7c r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r421:77dc580bc98f r446:92ad12b6a093 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2736:03cd6438b59f r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r222:4409829eb08f r1584:b5fd953db0ea r1584:b5fd953db0ea r2197:2448467991a5 r804:81c280372bbc r804:81c280372bbc r2672:0f51e63b0069 r2672:0f51e63b0069 r2672:0f51e63b0069 r0:d63b455452f6 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r543:efdb197f91ad r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r1865:fea489734e13 r1865:fea489734e13 r1865:fea489734e13 r1865:fea489734e13 r2901:7137930b7071 r2901:7137930b7071 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r561:f113dc55d8ed r1251:a4d83c3eafd5 r561:f113dc55d8ed r561:f113dc55d8ed r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r1476:60383d08b0e8 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1411:55167fab025c r1411:55167fab025c r1692:55fc5c138610 r1692:55fc5c138610 r2834:75f4fbf2be07 r2834:75f4fbf2be07 r2834:75f4fbf2be07 r2834:75f4fbf2be07 r2713:674640c7ae09 r2719:d2987c332ad1 r2719:d2987c332ad1 r2719:d2987c332ad1 r2719:d2987c332ad1 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1148:ffb2551cd7b8 r180:f8588315108d r1492:c060ce0a900a r2672:0f51e63b0069 r180:f8588315108d r1146:25780ad952e8 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1955:8717d5fffb28 r1955:8717d5fffb28 r1955:8717d5fffb28 r1955:8717d5fffb28 r1492:c060ce0a900a r180:f8588315108d r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r189:ac3ab29a08af r1693:7b556be75007 r1693:7b556be75007 r1693:7b556be75007 r1693:7b556be75007 r1693:7b556be75007 r0:d63b455452f6 r0:d63b455452f6 r1492:c060ce0a900a r0:d63b455452f6 r285:2ffed63dd1d5 r543:efdb197f91ad r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r180:f8588315108d r180:f8588315108d r180:f8588315108d r180:f8588315108d r2722:03de2e98e9a2 r2722:03de2e98e9a2 r2722:03de2e98e9a2 r2722:03de2e98e9a2 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1492:c060ce0a900a r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r549:23078af645f9 r549:23078af645f9 r549:23078af645f9 r549:23078af645f9 r0:d63b455452f6 r2736:03cd6438b59f r549:23078af645f9 r1029:ea38d27e1d01 r1029:ea38d27e1d01 r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2298:c0b10574400b r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2779:e39a46c0e9d3 r2298:c0b10574400b r2779:e39a46c0e9d3 r2300:bf4d7cb16c9c r2779:e39a46c0e9d3 r2300:bf4d7cb16c9c r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r32:dbfc54b77821 r157:a0ba33830082 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r450:ea254382a614 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1289:cbe7dfef35b9 r0:d63b455452f6 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r0:d63b455452f6 r0:d63b455452f6 r1069:72cdacf7c6d0 r1052:46aee5dbb098 r1052:46aee5dbb098 r1052:46aee5dbb098 r2240:e0133cfb0bd6 r2751:bebf33ce4f8a r1324:74eb67e35f31 r1052:46aee5dbb098 r2240:e0133cfb0bd6 r1052:46aee5dbb098 r1052:46aee5dbb098 r2240:e0133cfb0bd6 r1093:18f56ef2d029 r1052:46aee5dbb098 r1052:46aee5dbb098 r1240:6e42bb0997d9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1479:dd86e6e397f9 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r0:d63b455452f6 r0:d63b455452f6 r1240:6e42bb0997d9 r1240:6e42bb0997d9 r0:d63b455452f6 r0:d63b455452f6 r1810:48efaaf44514 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1810:48efaaf44514 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2713:674640c7ae09 r0:d63b455452f6 r0:d63b455452f6 r2356:2594bb8a80c9 r1291:996914c5686f r0:d63b455452f6 r1169:d0c97a2939a2 r0:d63b455452f6 r0:d63b455452f6 r1810:48efaaf44514 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1810:48efaaf44514 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r798:8f4c67e9f072 r0:d63b455452f6 r798:8f4c67e9f072 r798:8f4c67e9f072 r798:8f4c67e9f072 r798:8f4c67e9f072 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r421:77dc580bc98f r421:77dc580bc98f r2497:4f8fde59a2e8 r421:77dc580bc98f r421:77dc580bc98f r1051:a98935952e20 r2497:4f8fde59a2e8 r1051:a98935952e20 r2497:4f8fde59a2e8 r1051:a98935952e20 r421:77dc580bc98f r421:77dc580bc98f r421:77dc580bc98f r421:77dc580bc98f r1164:fd63d4650504 r1291:996914c5686f r1291:996914c5686f r1164:fd63d4650504 r1164:fd63d4650504 r446:92ad12b6a093 r446:92ad12b6a093 r446:92ad12b6a093 r446:92ad12b6a093 r446:92ad12b6a093 r446:92ad12b6a093 r446:92ad12b6a093 r2500:4297cb3c6bc0 r2500:4297cb3c6bc0 r2500:4297cb3c6bc0 r2500:4297cb3c6bc0 r2500:4297cb3c6bc0 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1254:dfaaa8616a9e r0:d63b455452f6 r1254:dfaaa8616a9e r0:d63b455452f6 r1254:dfaaa8616a9e r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1492:c060ce0a900a r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2315:3fb92a7dc405 r551:16385f106ebc r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r583:1dde32138cf2 r583:1dde32138cf2 r1955:8717d5fffb28 r583:1dde32138cf2 r1955:8717d5fffb28 r583:1dde32138cf2 r0:d63b455452f6 r1955:8717d5fffb28 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r347:8bb4a69db4b6 r348:030d384601d9 r348:030d384601d9 r348:030d384601d9 r348:030d384601d9 r348:030d384601d9 r348:030d384601d9 r347:8bb4a69db4b6 r347:8bb4a69db4b6 r347:8bb4a69db4b6 r348:030d384601d9 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2555:1472393f4e19 r0:d63b455452f6 r2719:d2987c332ad1 r2719:d2987c332ad1 r2719:d2987c332ad1 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2555:1472393f4e19 r2500:4297cb3c6bc0 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2672:0f51e63b0069 r2672:0f51e63b0069 r2672:0f51e63b0069 r2672:0f51e63b0069 r0:d63b455452f6 r0:d63b455452f6 r543:efdb197f91ad r543:efdb197f91ad r543:efdb197f91ad r0:d63b455452f6 r0:d63b455452f6 r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r561:f113dc55d8ed r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r1692:55fc5c138610 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1476:60383d08b0e8 r1476:60383d08b0e8 r1476:60383d08b0e8 r1476:60383d08b0e8 r0:d63b455452f6 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r2901:7137930b7071 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r2901:7137930b7071 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r0:d63b455452f6 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2713:674640c7ae09 r2735:75c50e403144 r2713:674640c7ae09 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2962:16f2ef02fde1 r2963:056135abdc92 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r677:d13be2994716 r2395:937c6aa12746 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2188:6f92a4485e32 r1829:3dfbdb5a9e01 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r1829:3dfbdb5a9e01 r1829:3dfbdb5a9e01 r0:d63b455452f6 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r2735:75c50e403144 r0:d63b455452f6 r2735:75c50e403144 r2735:75c50e403144 r0:d63b455452f6 r0:d63b455452f6 r2188:6f92a4485e32 r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2736:03cd6438b59f r2500:4297cb3c6bc0 r2188:6f92a4485e32 r421:77dc580bc98f r2735:75c50e403144 r421:77dc580bc98f r0:d63b455452f6 r0:d63b455452f6 r2742:44092434c31d r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2735:75c50e403144 r0:d63b455452f6 r0:d63b455452f6 r2735:75c50e403144 r1170:75ec701d5273 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r162:ec2ca33c7bbb r0:d63b455452f6 r0:d63b455452f6 r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r2369:4ee567125c49 r2369:4ee567125c49 r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2713:674640c7ae09 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2576:7fd8df558d87 r0:d63b455452f6 r2714:0ce897ce4efd r2714:0ce897ce4efd r2714:0ce897ce4efd r2714:0ce897ce4efd r1721:cc1286b87d09 r1721:cc1286b87d09 r1721:cc1286b87d09 r1721:cc1286b87d09 r1721:cc1286b87d09 r1721:cc1286b87d09 r1692:55fc5c138610 r157:a0ba33830082 r157:a0ba33830082 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r222:4409829eb08f r0:d63b455452f6 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r0:d63b455452f6 r1721:cc1286b87d09 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r0:d63b455452f6 r474:e82d890d81d2 r1118:740a170a3f79 r1413:f37f7f2a638c r222:4409829eb08f r476:8f47f7b7f3dc r1118:740a170a3f79 r2106:c87c9f2f4751 r0:d63b455452f6 r770:be3f6b12cf89 r770:be3f6b12cf89 r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r1413:f37f7f2a638c r770:be3f6b12cf89 r770:be3f6b12cf89 r1251:a4d83c3eafd5 r770:be3f6b12cf89 r770:be3f6b12cf89 r0:d63b455452f6 r0:d63b455452f6 r615:1c624382958c r0:d63b455452f6 r0:d63b455452f6 r2378:3d447fbbc61a r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1118:740a170a3f79 r1721:cc1286b87d09 r1721:cc1286b87d09 r0:d63b455452f6 r0:d63b455452f6 r1413:f37f7f2a638c r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r1492:c060ce0a900a r0:d63b455452f6 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r543:efdb197f91ad r1492:c060ce0a900a r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r1492:c060ce0a900a r285:2ffed63dd1d5 r285:2ffed63dd1d5 r1492:c060ce0a900a r285:2ffed63dd1d5 r285:2ffed63dd1d5 r285:2ffed63dd1d5 r1491:406b8bee61df r1491:406b8bee61df r1491:406b8bee61df r2948:e894a7a52a1d r1491:406b8bee61df r1865:fea489734e13 r1865:fea489734e13 r1865:fea489734e13 r1865:fea489734e13 r1865:fea489734e13 r1491:406b8bee61df r1491:406b8bee61df r1491:406b8bee61df r1491:406b8bee61df r2901:7137930b7071 r2901:7137930b7071 r1865:fea489734e13 r1160:3032cf1fc825 r1865:fea489734e13 r1865:fea489734e13 r1865:fea489734e13 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2576:7fd8df558d87 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r222:4409829eb08f r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1413:f37f7f2a638c r1413:f37f7f2a638c r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2792:0462813fcc44 r2792:0462813fcc44 r2792:0462813fcc44 r2792:0462813fcc44 r0:d63b455452f6 r0:d63b455452f6 r2792:0462813fcc44 r1167:21a98999a172 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2792:0462813fcc44 r2792:0462813fcc44 r2792:0462813fcc44 r0:d63b455452f6 r2327:3eb17a585c21 r2792:0462813fcc44 r2800:344e8a20c34b r162:ec2ca33c7bbb r2327:3eb17a585c21 r2792:0462813fcc44 r2918:964bc0b551d8 r0:d63b455452f6 r2327:3eb17a585c21 r2792:0462813fcc44 r2800:344e8a20c34b r2315:3fb92a7dc405 r1170:75ec701d5273 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2188:6f92a4485e32 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2315:3fb92a7dc405 r2317:8a2013629cdb r1163:d8572c1748d6 r2742:44092434c31d r2742:44092434c31d r2742:44092434c31d r2742:44092434c31d r1163:d8572c1748d6 r1163:d8572c1748d6 r1435:92a0e0ee3557 r1163:d8572c1748d6 r1163:d8572c1748d6 r2327:3eb17a585c21 | # $Id$
##############################################################################
#
# Usage
#
# Synopsis:
#
# make WITH_ZLIB=1 UNIX=1 MANUAL_CONFIG=1
#
# (See below for the list of possible options.)
#
# Alternately, you can run make without the MANUAL_CONFIG part. It then
# generates Makefile.config, where you can customize all the options.
# However beware that for all subsequent calls the option values from
# Makefile.config take precedence to the commandline options.
#
# (That means that you probably want to either specify the options on command
# line together with MANUAL_CONFIG=1 or you want to specify no commandline
# options at all.)
# Targets:
#
# Defaults to building binary
# clean: remove intermediate build files
# mrproper: remove intermediate files and makefile configuration
# upgradeconf: add new options to old Makefile.config
# osx: OS X application
# release: used by OSX to make a dmg file ready to release
# Options:
#
# Summary of OS choice defines
# WIN32: building on Windows
# UNIX: building on *nix derivate (Linux, FreeBSD)
# OSX: building on Mac OS X
# MORPHOS: building on MorphOS
# BEOS: building on BeOS
# SUNOS: building on SunOS (Solaris)
#
# Summary of library choice defines
# WITH_ZLIB: savegames using zlib
# WITH_PNG: screenshots using PNG
# WITH_SDL: SDL video driver support
# WITH_COCOA: Cocoa video driver support
#
# Summary of other defines:
# MANUAL_CONFIG: do not use Makefile.config, config options set manually
# DEBUG: build in debug mode
# PROFILE: build in profile mode, disables -s and -fomit-frame-pointer
# TRANSLATOR: build in translator mode (untranslated strings are prepended by
# a <TODO> mark)
# RELEASE: this will be the released version number. It replaces all places
# where it normally would print the revision number
# MIDI: if set, it will use it as custom path to midi player.
# If unset, it will use the hardcoded path in the c code
# This can still be overriden by the music.extmidi openttd.cfg option.
# WITH_DIRECTMUSIC: enable DirectMusic MIDI support
# WITH_NETWORK: enable networking
# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
# MAX_NUM_AUTOSAVES: sets the number of autosaves the games will make before starting
# to overwrite the old ones. If not set, the game will use 16.
# NOTE: assign a number, not a string of a number
#
# Paths:
# INSTALL: If not set, the game uses the directory of the binary to
# store everything (lang, data, gm, save and openttd.cfg), this is the `old' behaviour.
# In this case, none of the following paths are used, you also should _not_
# use `make install', but copy the required stuff yourself (or just play out
# of you source directory, which should work fine).
# If you want to use `make install' to install the game globally, you should
# define it _before_ you build the game. If you only define INSTALL when you
# do `make install', the game won't be able to find it's files (so you should
# also define all the following paths before building).
#
# So, the following paths should be defined if INSTALL is defined.
# None of these paths have to end with /
# PREFIX: Normally /usr/local
# BINARY_DIR: The location of the binary, normally games. (Will be prefixed
# with $PREFIX)
# DATA_DIR: The location of the data (lang, data, gm and scenario), normally
# share/games/openttd. (Will be prefixed with $PREFIX) Note that scenarios
# are only put here if USE_HOMEDIR is true, otherwise they are placed in
# PERSONAL_DIR/scenario
# ICON_DIR: The location of the openttd icon. (Will be prefixed with
# $PREFIX).
# PERSONAL_DIR: The directory where openttd.cfg and the save folder will be
# stored. You cannot use ~ here, define USE_HOMEDIR for that.
# USE_HOMEDIR: If this variable is set, PERSONAL_DIR will be prefixed with
# ~/ at runtime (the user's homedir)
# SECOND_DATA_PATH Use this data dir if a file is not found in the data dir in the data path
# CUSTOM_LANG_PATH If this is set, it will use the path given to search for lng files
# instead of the lang dir in the data path
# NOTE: both SECOND_DATA_PATH and CUSTOM_LANG_PATH uses paths relative to where OTTD is opened
#
# DEST_DIR: make install will use this directory instead of the filesystem
# root to install its files. This should normally not be used by
# ordinary users, currently it is only used for the debian
# packaging. This value should only be set when calling `make
# install' and is not saved in Makefile.config
# (Note that DESTDIR is checked if DEST_DIR is not set.)
#
# STATIC: link statically
# CYGWIN: build in Cygwin environment
# MINGW: build with MingW compiler, link with MingW libraries
#
# VERBOSE: show full compiler invocations instead of brief progress messages
#
# Special for crosscompiling there are some commands available:
#
# FAT_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs. Only works with GCC 4 or newer
#
# JAGUAR: Crosscompiling for OSX 1.2.8 (codenamed Jaguar). Only works if OSX is defined too. Only works with GCC 4 or newer
# This can be changed to any PPC version of OSX by changing the ppc flags in Makefile.config
#
# ENDIAN_FORCE: forces the endian-check to give a certain result. Can be BE, LE or PREPROCESSOR.
# PREPROCESSOR is always used on all OSX targets and will make the preprocessor pick the right endian.
# this means that you don't have to think about endianess when compiling for OSX.
# Very useful for universal binaries and crosscompilers. Not sure if it works on non OSX targets
# WINDRES: the location of your windres
# CC_HOST: the gcc of your localhost if you are making a target that produces incompatible executables
# CFLAGS_HOST: cflags used for CC_HOST. Make it something if you are getting errors when you try to compi
# windows executables on linux. (just: CFLAGS_HOST:='-I' or something)
##############################################################################
#
# Configuration
#
# Makefile version tag
# it checks if the version tag in Makefile.config is the same and force update outdated config files
MAKEFILE_VERSION:=8
# CONFIG_WRITER has to be found even for manual configuration
CONFIG_WRITER=makefiledir/Makefile.config_writer
ifndef MANUAL_CONFIG
# Automatic configuration
MAKE_CONFIG:=Makefile.config
MAKEFILE:=Makefile
LIB_DETECTION=makefiledir/Makefile.libdetection
CONFIG_WRITER=makefiledir/Makefile.config_writer
# Apply automatic configuration
# See target section for how this is built, suppress errors
# since first time it isn't found but make reads this twice
-include $(MAKE_CONFIG)
else
CONFIG_INCLUDED:=1
endif
ifndef LIBPNG-CONFIG
LIBPNG-CONFIG :=libpng-config
endif
# updates Makefile.config if it's outdated
ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
ifndef MANUAL_CONFIG # manual config should not check this
UPDATECONFIG:=upgradeconf
CONFIG_INCLUDED:=
else
# this should define SDL-CONFIG for manual configuration
ifeq ($(shell uname),FreeBSD)
SDL-CONFIG:=sdl11-config
else
SDL-CONFIG:=sdl-config
endif
endif
endif
ifndef SDL-CONFIG
UPDATECONFIG:=upgradeconf
CONFIG_INCLUDED:=
endif
# this is used if there aren't any Makefile.config
ifndef CONFIG_INCLUDED
# sets network on by default if there aren't any config file
ENABLE_NETWORK:=1
# paths for make install
# disabled as they would break it for some (many?) people if they were default
#PREFIX:=/usr/local
#DATA_DIR:=share/games/openttd
#BINARY_DIR:=games
#PERSONAL_DIR:=.openttd
#USE_HOMEDIR:=1
-include $(LIB_DETECTION)
endif
ifdef SUPRESS_LANG_ERRORS
LANG_ERRORS = >/dev/null 2>&1
endif
ifdef OSX
-include os/MacOSX/Makefile.setup
endif
ifdef STATIC
ifndef WIN32
ifndef OSX
ifndef MORPHOS
ifndef SKIP_STATIC_CHECK
$(error Static is only known to work on MorphOS and MacOSX!!! --- Check Makefile.config for more info and howto bypass this check)
endif
endif
endif
endif
endif
ifdef WITH_COCOA
ifdef WITH_SDL
$(error You can not use both the SDL video driver and the Cocoa video driver at the same time)
endif
ifdef DEDICATED
$(error You can not use the Cocoa video driver in a dedicated server)
endif
else
# Force SDL on UNIX platforms
ifndef WITH_SDL
ifdef UNIX
ifndef DEDICATED
$(error You need to have SDL installed in order to run OpenTTD on UNIX. Use DEDICATED if you want to compile a CLI based server)
endif
endif
endif
endif
# remove the dependancy for sdl if DEDICALTED is used
ifdef DEDICATED
WITH_SDL:=
endif
# add -lpthread to LDFLAGS
ifndef WIN32
ifndef MORPHOS
ifndef OSX
LDFLAGS+=-lpthread
endif
endif
endif
ifdef OSX
LDFLAGS+=-framework Cocoa
endif
##############################################################################
#
# Compiler configuration
#
# Executable file extension
ifdef WIN32
EXE=.exe
else
EXE=
endif
# Set output executable names
TTD=openttd$(EXE)
ENDIAN_CHECK=endian_check$(EXE)
STRGEN=strgen/strgen$(EXE)
OSXAPP="OpenTTD.app"
ifdef RELEASE
REV:=$(RELEASE)
else
REV := $(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi)
endif
# MorphOS needs builddate
BUILDDATE=`date +%d.%m.%y`
# Check if there is a windres override
ifndef WINDRES
WINDRES = windres
endif
# Check if we have a new target
ifdef CC_TARGET
CC = $(CC_TARGET)
endif
# Check if CC_HOST is defined. If not, it is CC
ifndef CC_HOST
CC_HOST = $(CC)
endif
ifndef CFLAGS_HOST
CFLAGS_HOST = $(BASECFLAGS)
endif
CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3)
# GNU make can only test for (in)equality
# this is a workaround to test for >=
ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes -Wundef
CFLAGS += -Wwrite-strings -Wpointer-arith
endif
ifeq ($(shell expr $(CC_VERSION) \>= 30), 1)
CFLAGS += -W -Wno-unused-parameter
endif
ifeq ($(shell expr $(CC_VERSION) \>= 34), 1)
CFLAGS += -Wdeclaration-after-statement -Wold-style-definition
endif
ifdef DEBUG
ifeq ($(shell expr $(DEBUG) \>= 1), 1)
CFLAGS += -g -D_DEBUG
endif
ifeq ($(shell expr $(DEBUG) \>= 2), 1)
CFLAGS += -fno-inline
endif
ifeq ($(shell expr $(DEBUG) \>= 3), 1)
CFLAGS += -O0
endif
endif
ifdef PROFILE
CFLAGS += -pg
LDFLAGS += -pg
endif
CDEFS=-DWITH_REV
ifndef DEBUG
ifndef PROFILE
# Release mode
ifndef MORPHOS
ifndef IRIX
# automatical strip breaks under morphos
BASECFLAGS += -s
LDFLAGS += -s
endif
endif
endif
ifdef OSX
# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic
else
ifdef MORPHOS
BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
else
BASECFLAGS += -O2
endif
ifndef PROFILE
ifndef IRIX
BASECFLAGS += -fomit-frame-pointer
endif
endif
endif
endif
ifdef STATIC
ifndef OSX # OSX can't build static if -static flag is used
LDFLAGS += -static
endif
endif
# If building on MingW don't link with Cygwin libs
ifdef WIN32
ifdef CYGWIN
BASECFLAGS += -mwin32
LDFLAGS += -mwin32
endif
ifdef MINGW
BASECFLAGS += -mno-cygwin
LDFLAGS += -mno-cygwin
endif
endif
CFLAGS += $(BASECFLAGS)
ifdef UNIX
CDEFS += -DUNIX
endif
ifdef BEOS
CDEFS += -DBEOS
LDFLAGS += -lmidi -lbe -lpthread
ifdef WITH_NETWORK
ifdef BEOS_NET_SERVER
CDEFS += -DBEOS_NET_SERVER
LDFLAGS += -lnet
else
# BONE needs a few more libraries than R5
LDFLAGS += -lbind -lsocket
endif
endif
endif
ifdef MORPHOS
# -Wstrict-prototypes generates much noise because of system headers
CFLAGS += -Wno-strict-prototypes
endif
ifdef SUNOS
CDEFS += -DSUNOS
ifdef WITH_NETWORK
LDFLAGS += -lnsl -lsocket
endif
endif
# tell the source that we are building a dedicated server
ifdef DEDICATED
CDEFS += -DDEDICATED
endif
# SDL config
ifdef WITH_SDL
CDEFS += -DWITH_SDL
CFLAGS += $(shell $(SDL-CONFIG) --cflags)
ifdef STATIC
LIBS += $(shell $(SDL-CONFIG) --static-libs)
else
LIBS += $(shell $(SDL-CONFIG) --libs)
endif
endif
# zlib config
ifdef WITH_ZLIB
CDEFS += -DWITH_ZLIB
ifdef STATIC
ifdef OSX
# zlib is default on OSX, so everybody have it. No need for static linking
LIBS += -lz
else
ifndef STATIC_ZLIB_PATH
ifndef MANUAL_CONFIG
# updates Makefile.config with the zlib path
UPDATECONFIG:=upgradeconf
endif
TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
ifdef TEMP
STATIC_ZLIB_PATH:=/lib/$(TEMP)
else
TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
ifdef TEMP
STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
else
TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
ifdef TEMP
STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
endif
endif
endif
endif
LIBS += $(STATIC_ZLIB_PATH)
endif
else
LIBS += -lz
endif
endif
# libpng config
ifdef WITH_PNG
CDEFS += -DWITH_PNG
CFLAGS += $(shell $(LIBPNG-CONFIG) --cppflags --I_opts)
# seems like older libpng versions are broken and need this
PNGCONFIG_FLAGS = --ldflags --libs
ifdef STATIC
ifdef OSX
# Seems like we need a tiny hack for OSX static to work
LIBS += $(shell $(LIBPNG-CONFIG) --prefix)/lib/libpng.a
else
LIBS += $(shell $(LIBPNG-CONFIG) --static $(PNGCONFIG_FLAGS))
endif
else
LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS))
endif
endif
# enables/disables assert()
ifdef DISABLE_ASSERTS
CFLAGS += -DNDEBUG
endif
# automatically disables asserts for release
ifdef RELEASE
ifndef ENABLE_ASSERTS
CFLAGS += -DNDEBUG
endif
endif
ifdef TRANSLATOR
STRGEN_FLAGS=-t
else
STRGEN_FLAGS=
endif
# OSX specific setup
ifdef OSX
# set the endian flag for OSX, that can't fail
ENDIAN_FORCE:=PREPROCESSOR
ifndef DEDICATED
LIBS += -framework QuickTime
endif
ifdef WITH_COCOA
CDEFS += -DWITH_COCOA
LIBS += -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit
endif
# OSX path setup
ifndef SECOND_DATA_PATH
SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/"
endif
ifndef CUSTOM_LANG_DIR
ifndef DEDICATED
CUSTOM_LANG_DIR:="$(OSXAPP)/Contents/Lang/"
endif
endif
endif
ifdef MIDI
CDEFS += -DEXTERNAL_PLAYER=\"$(MIDI)\"
ifdef MIDI_ARG
CDEFS += -DMIDI_ARG=\"$(MIDI_ARG)\"
endif
endif
ifdef MAX_NUM_AUTOSAVES
CDEFS += -DMAX_NUM_AUTOSAVES=$(MAX_NUM_AUTOSAVES)
endif
ifdef WITH_NETWORK
CDEFS += -DENABLE_NETWORK
ifdef QNX
LIBS += -lsocket
endif
endif
ifdef SECOND_DATA_PATH
CDEFS += -DSECOND_DATA_DIR=\"$(SECOND_DATA_PATH)/\"
endif
ifdef CUSTOM_LANG_DIR
CDEFS += -DCUSTOM_LANG_DIR=\"$(CUSTOM_LANG_DIR)/\"
endif
ifdef WITH_DIRECTMUSIC
CDEFS += -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT
endif
ifdef WIN32
LIBS += -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32
ifdef WITH_DIRECTMUSIC
LIBS += -lstdc++
endif
TTDLDFLAGS += -Wl,--subsystem,windows
endif
ifndef DEST_DIR
DEST_DIR = $(DESTDIR)
endif
# sets up the paths for use for make install
ifdef INSTALL
# We use _PREFIXED vars here, so the paths are recalculated every time, and
# the prefix is not prepended in the makefile config
BINARY_DIR_PREFIXED:=$(PREFIX)/$(BINARY_DIR)
DATA_DIR_PREFIXED:=$(PREFIX)/$(DATA_DIR)
ICON_DIR_PREFIXED:=$(PREFIX)/$(ICON_DIR)
# We use _INSTALL vars here, these vars are the locations where the files will
# be installed
DATA_DIR_INSTALL=$(DEST_DIR)/$(DATA_DIR_PREFIXED)
BINARY_DIR_INSTALL=$(DEST_DIR)/$(BINARY_DIR_PREFIXED)
ICON_DIR_INSTALL=$(DEST_DIR)/$(ICON_DIR_PREFIXED)
# Let the code know where to find stuff
ifdef DATA_DIR_PREFIXED
CDEFS += -DGAME_DATA_DIR=\"$(DATA_DIR_PREFIXED)/\"
endif
ifdef PERSONAL_DIR
CDEFS += -DPERSONAL_DIR=\"$(PERSONAL_DIR)/\"
endif
ifdef USE_HOMEDIR
CDEFS += -DUSE_HOMEDIR
endif
endif
##############################################################################
#
# What to compile
# (users do not want to modify anything below)
#
### Sources
# clean up C_SOURCES first. Needed since building universal binaries on OSX calls the makefile recursively (just one time)
SRCS :=
SRCS += aircraft_cmd.c
SRCS += aircraft_gui.c
SRCS += airport.c
SRCS += airport_gui.c
SRCS += aystar.c
SRCS += bridge_gui.c
SRCS += callback_table.c
SRCS += clear_cmd.c
SRCS += command.c
SRCS += console.c
SRCS += console_cmds.c
SRCS += currency.c
SRCS += debug.c
SRCS += dedicated.c
SRCS += depot.c
SRCS += disaster_cmd.c
SRCS += dock_gui.c
SRCS += driver.c
SRCS += dummy_land.c
SRCS += economy.c
SRCS += engine.c
SRCS += engine_gui.c
SRCS += fileio.c
SRCS += gfx.c
SRCS += gfxinit.c
SRCS += graph_gui.c
SRCS += industry_cmd.c
SRCS += industry_gui.c
SRCS += intro_gui.c
SRCS += landscape.c
SRCS += main_gui.c
SRCS += map.c
SRCS += md5.c
SRCS += mersenne.c
SRCS += minilzo.c
SRCS += misc.c
SRCS += misc_cmd.c
SRCS += misc_gui.c
SRCS += mixer.c
SRCS += music_gui.c
SRCS += namegen.c
SRCS += network.c
SRCS += network_client.c
SRCS += network_data.c
SRCS += network_gamelist.c
SRCS += network_gui.c
SRCS += network_server.c
SRCS += network_udp.c
SRCS += newgrf.c
SRCS += newgrf_engine.c
SRCS += newgrf_station.c
SRCS += news_gui.c
SRCS += npf.c
SRCS += oldloader.c
SRCS += openttd.c
SRCS += order_cmd.c
SRCS += order_gui.c
SRCS += pathfind.c
SRCS += player_gui.c
SRCS += players.c
SRCS += pool.c
SRCS += queue.c
SRCS += rail.c
SRCS += rail_cmd.c
SRCS += rail_gui.c
SRCS += rev.c
SRCS += road_cmd.c
SRCS += road_gui.c
SRCS += roadveh_cmd.c
SRCS += roadveh_gui.c
SRCS += saveload.c
SRCS += screenshot.c
SRCS += settings.c
SRCS += settings_gui.c
SRCS += ship_cmd.c
SRCS += ship_gui.c
SRCS += signs.c
SRCS += smallmap_gui.c
SRCS += sound.c
SRCS += sprite.c
SRCS += spritecache.c
SRCS += station_cmd.c
SRCS += station_gui.c
SRCS += string.c
SRCS += strings.c
SRCS += subsidy_gui.c
SRCS += terraform_gui.c
SRCS += texteff.c
SRCS += thread.c
SRCS += tile.c
SRCS += town_cmd.c
SRCS += town_gui.c
SRCS += train_cmd.c
SRCS += train_gui.c
SRCS += tree_cmd.c
SRCS += tunnelbridge_cmd.c
SRCS += unmovable_cmd.c
SRCS += vehicle.c
SRCS += vehicle_gui.c
SRCS += viewport.c
SRCS += water_cmd.c
SRCS += waypoint.c
SRCS += widget.c
SRCS += window.c
SRCS += music/null_m.c
SRCS += sound/null_s.c
SRCS += video/dedicated_v.c
SRCS += video/null_v.c
# AI related files
SRCS += ai/ai.c
SRCS += ai/default/default.c
SRCS += ai/trolly/build.c
SRCS += ai/trolly/pathfinder.c
SRCS += ai/trolly/shared.c
SRCS += ai/trolly/trolly.c
ifdef WITH_SDL
SRCS += sdl.c
SRCS += sound/sdl_s.c
SRCS += video/sdl_v.c
endif
ifdef WIN32
SRCS += win32.c
SRCS += music/win32_m.c
SRCS += sound/win32_s.c
SRCS += video/win32_v.c
else
SRCS += unix.c
SRCS += music/extmidi.c
endif
ifdef OSX
SRCS += os/macosx/macos.m
ifndef DEDICATED
SRCS += music/qtmidi.c
endif
ifdef WITH_COCOA
SRCS += video/cocoa_v.m
SRCS += sound/cocoa_s.c
SRCS += os/macosx/splash.c
endif
endif
ifdef BEOS
SRCS += music/bemidi.cpp
endif
ifdef WIN32
SRCS += ottdres.rc
endif
ifdef WITH_DIRECTMUSIC
SRCS += music/dmusic.cpp
endif
OBJS += $(filter %.o, $(SRCS:%.cpp=%.o) $(SRCS:%.m=%.o) $(SRCS:%.c=%.o) $(SRCS:%.rc=%.o))
DEPS = $(OBJS:%.o=.deps/%.d)
LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt))
LANGS = $(LANG_TXT:%.txt=%.lng)
##############################################################################
#
# Build commands
#
# If we are verbose, we will show commands prefixed by $(Q).
# The $(Q)s get replaced by @ in non-verbose mode.
# Inspired by the Linux kernel build system.
ifdef VERBOSE
Q =
else
Q = @
endif
##############################################################################
#
# Targets
#
### Normal build rules
ifdef OSX
# needs to be before all
OSX:=OSX
endif
all: endian_target.h endian_host.h $(UPDATECONFIG) $(LANGS) $(TTD) $(OSX)
ifdef OSX
-include os/macosx/Makefile
endif
endian_host.h: $(ENDIAN_CHECK)
@echo '===> Testing endianness for host'
$(Q)./$(ENDIAN_CHECK) > $@
endian_target.h: $(ENDIAN_CHECK)
@echo '===> Testing endianness for target'
$(Q)./$(ENDIAN_CHECK) $(ENDIAN_FORCE) > $@
$(ENDIAN_CHECK): endian_check.c
@echo '===> Compiling and Linking $@'
$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
$(TTD): $(OBJS) $(MAKE_CONFIG)
@echo '===> Linking $@'
$(Q)$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
$(STRGEN): strgen/strgen.c endian_host.h
@echo '===> Compiling and Linking $@'
$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
table/strings.h: lang/english.txt $(STRGEN)
@echo '===> Generating $@'
$(Q)$(STRGEN)
lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt
@echo '===> Compiling language $(*F)'
$(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@
ifdef MORPHOS
release: all
$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
$(Q)mkdir -p "/t/"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/docs"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario"
$(Q)cp -R $(TTD) "/t/openttd-$(RELEASE)-morphos/"
$(Q)cp data/* "/t/openttd-$(RELEASE)-morphos/data/"
$(Q)cp lang/*.lng "/t/openttd-$(RELEASE)-morphos/lang/"
$(Q)cp scenario/* "/t/openttd-$(RELEASE)-morphos/scenario/"
$(Q)cp readme.txt "/t/openttd-$(RELEASE)-morphos/docs/ReadMe"
$(Q)cp docs/console.txt "/t/openttd-$(RELEASE)-morphos/docs/Console"
$(Q)cp COPYING "/t/openttd-$(RELEASE)-morphos/docs/"
$(Q)cp changelog.txt "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog"
$(Q)cp known-bugs.txt "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
$(Q)cp os/morphos/icons/openttd.info "/t/openttd-$(RELEASE)-morphos/$(TTD).info"
$(Q)cp os/morphos/icons/docs.info "/t/openttd-$(RELEASE)-morphos/docs.info"
$(Q)cp os/morphos/icons/drawer.info "/t/openttd-$(RELEASE)-morphos.info"
$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/ReadMe.info"
$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/Console.info"
$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/COPYING.info"
$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog.info"
$(Q)strip --strip-all --strip-unneeded --remove-section .comment "/t/openttd-$(RELEASE)-morphos/$(TTD)"
$(Q)lha a -r "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos"
$(Q)lha a "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos.info"
$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos"
$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.info"
@echo "Release archive can be found in RAM:t/ now."
.PHONY: release
endif
rev.c: FORCE
@# setting the revision number in a place, there the binary can read it
@echo 'const char _openttd_revision[] = "$(REV)";' >>rev.c.new
@# some additions for MorphOS versions tag
@echo '#ifdef __MORPHOS__' >>rev.c.new
@echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD $(REV) ('${BUILDDATE}') © OpenTTD Team [MorphOS, PowerPC]";' >>rev.c.new
@echo '#endif' >>rev.c.new
@# Only update the real rev.c if it actually changed, to prevent
@# useless rebuilds.
@cmp -s rev.c rev.c.new 2>/dev/null || mv rev.c.new rev.c
@rm -f rev.c.new
FORCE:
clean:
@echo '===> Cleaning up'
# endian.h is out-dated and no longer in use, so it can be removed soon
$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) $(OSX_MIDI_PLAYER_FILE) endian.h endian_host.h endian_target.h $(ENDIAN_CHECK)
mrproper: clean
$(Q)rm -rf $(MAKE_CONFIG)
ifndef OSX
ifndef MORPHOS
install:
ifeq ($(INSTALL),)
$(error make install is highly experimental at his state and not\
tested very much - use at your own risk - to use run \"make install INSTALL:=1\" - make sure Makefile.config\
is set correctly up - run \"make upgradeconf\")
endif
ifeq ($(PREFIX), )
$(error no prefix set - check Makefile.config)
endif
# We compare against the non prefixed version here, so we won't install
# if only the prefix has been set
ifeq ($(DATA_DIR),)
$(error no data path set - check Makefile.config)
endif
ifeq ($(BINARY_DIR),)
$(error no binary path set - check Makefile.config)
endif
# We'll install in $DEST_DIR instead of root if it is set (we don't
# care about extra /'s
install -d $(DATA_DIR_INSTALL)/lang \
$(DATA_DIR_INSTALL)/data \
$(DATA_DIR_INSTALL)/gm \
$(ICON_DIR_INSTALL) \
$(BINARY_DIR_INSTALL)
ifndef USE_HOMEDIR
mkdir -p $(PERSONAL_DIR)/scenario
else
mkdir -p $(DATA_DIR_INSTALL)/scenario
endif
install $(TTD) $(BINARY_DIR_INSTALL)
install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang
install -m 644 data/*.grf $(DATA_DIR_INSTALL)/data
install -m 644 data/opntitle.dat $(DATA_DIR_INSTALL)/data
install -m 644 media/openttd.64.png $(ICON_DIR_INSTALL)
install -m 644 media/openttd.32.xpm $(ICON_DIR_INSTALL)
ifndef USE_HOMEDIR
cp scenario/* $(PERSONAL_DIR)/scenario/
else
cp scenario/* $(DATA_DIR_INSTALL)/scenario/
endif
else #MorphOS
install:
$(error make install is not supported on MorphOS)
endif
else # OSX
install:
$(error make install is not supported on MacOSX)
endif
love:
@echo "YES! I thought you would never ask. We will have a great time. You can keep me turned on all night"
.PHONY: clean all $(OSX) install love
### Automatic configuration
-include $(CONFIG_WRITER)
# Export all variables set to subprocesses (a bit dirty)
.EXPORT_ALL_VARIABLES:
upgradeconf: $(MAKE_CONFIG)
$(Q)rm $(MAKE_CONFIG)
$(Q)$(MAKE) $(MAKE_CONFIG)
.PHONY: upgradeconf
### Internal build rules
# This makes sure the .deps dir is always around.
DEPS_MAGIC := $(shell mkdir -p $(sort $(dir $(DEPS))))
depend:
@true # The include handles this automagically
# Introduce the dependencies
ifeq ($(findstring $(MAKECMDGOALS), clean info),)
-include $(DEPS)
endif
# Silence stale header dependency errors
%.h:
@true
.deps/%.d: %.c $(MAKE_CONFIG) table/strings.h endian_target.h
@echo '===> DEP $<'
$(Q)$(CC) $(CFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
.deps/%.d: %.cpp $(MAKE_CONFIG) table/strings.h endian_target.h
@echo '===> DEP $<'
$(Q)$(CXX) $(CFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
.deps/%.d: %.m $(MAKE_CONFIG) table/strings.h endian_target.h
@echo '===> DEP $<'
$(Q)$(CC) $(OBJCFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
%.o: %.c $(MAKE_CONFIG)
@echo '===> Compiling $<'
$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
%.o: %.cpp $(MAKE_CONFIG)
@echo '===> Compiling $<'
$(Q)$(CXX) $(CFLAGS) $(CDEFS) -c -o $@ $<
%.o: %.m $(MAKE_CONFIG)
@echo '===> Compiling $<'
$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
%.o: %.rc
@echo '===> Compiling resource $<'
$(Q)$(WINDRES) -o $@ $<
info:
@echo 'CFLAGS = $(CFLAGS)'
@echo 'LDFLAGS = $(LDFLAGS)'
@echo 'LIBS = $(LIBS)'
@echo 'CDEFS = $(CDEFS)'
|