Commit d3c8e064a5587e924f83913e5eae38586b50840c
2000-12-04T22:53:55
- updating the header inclusion scheme to use <ft2build.h> by default.. - created "builds/devel" to hold developer builds options for both Win32 and Unix - fixed a bug in the winfonts driver, where the glyph image format wasn't set correctly..
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 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268
diff --git a/CHANGES b/CHANGES
index ca80f47..0da6c9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+LATEST CHANGES
+
+ - changed the library header files inclusion scheme. Right now,
+ a client application can do something like this:
+
+ #include <ft2build.h> -- include build and setup configuration file
+ #include FT_FREETYPE_H -- main API file
+ #include FT_GLYPH_H -- abstract glyph image handling, etc..
+
+=========================================================================
LATEST CHANGES BETWEEN 2.0.1 and 2.0:
2.0.1 introduces a few changes:
diff --git a/ChangeLog b/ChangeLog
index 5cc9860..b8320de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2000-12-04 David Turner <david.turner@freetype.org>
+
+ * builds/unix/install.mk, builds/unix/ft2unix.h: the file "ft2unix.h"
+ is now installed as <ft2build.h> for Unix systems. Note that we still
+ use the "freetype2/freetype" installation path for now..
+
+ * many files: now using <ft2build.h> as the default build and setup
+ configuration file in all public headers. Internal source files still
+ need some changes though..
+
+ * builds/devel/ft2build.h, builds/devel/ftoption.h: created a new
+ directory to hold all development options for both the Unix and
+ Win32 developer builds..
+
+ * builds/win32/detect.mk, builds/win32/w32-bccd.mk,
+ builds/win32/w32-dev.mk: changed the developer build targets to
+ "devel-gcc" and "devel-bcc" in order to be able to develop with
+ the Borland C++ compiler.
+
2000-12-01 David Turner <david.turner@freetype.org>
* Version 2.0.1 released.
diff --git a/builds/compiler/bcc-dev.mk b/builds/compiler/bcc-dev.mk
index e9b2eea..b603ed9 100644
--- a/builds/compiler/bcc-dev.mk
+++ b/builds/compiler/bcc-dev.mk
@@ -61,7 +61,7 @@ T := -o
# ANSI compliance.
#
ifndef CFLAGS
- CFLAGS := -c -y -d -v -Od -w-par -w-ccc -w-rch -w-pro -w-aus
+ CFLAGS := -q -c -y -d -v -Od -w-par -w-ccc -w-rch -w-pro -w-aus
endif
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 67489ff..c3fe68d 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -91,6 +91,15 @@ SRC := $(TOP)$(SEP)src
#
BASE_DIR := $(SRC)$(SEP)base
+# The build header file used to define all public header file names
+# as macro
+#
+ifndef FT_BUILD_H
+FT_BUILD_H := $(TOP)$(SEP)include$(SEP)ft2build.h
+FTBUILD_CMD :=
+else
+FTBUILD_CMD = $DFT_BUILD_H=$(FT_BUILD_H)
+endif
# A few short-cuts in order to avoid typing $(SEP) all the time for the
# directory separator.
diff --git a/builds/unix/devel/freetype/config/ftoption.h b/builds/unix/devel/freetype/config/ftoption.h
deleted file mode 100644
index bfc6ad7..0000000
--- a/builds/unix/devel/freetype/config/ftoption.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/***************************************************************************/
-/* */
-/* ftoption.h */
-/* */
-/* User-selectable configuration macros (specification only). */
-/* */
-/* Copyright 1996-2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __FTOPTION_H__
-#define __FTOPTION_H__
-
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-
- /*************************************************************************/
- /* */
- /* USER-SELECTABLE CONFIGURATION MACROS */
- /* */
- /* These macros can be toggled by developers to enable or disable */
- /* certain aspects of FreeType. This is a default file, where all major */
- /* options are enabled. */
- /* */
- /* Note that if some modifications are required for your build, we */
- /* advise you to put a modified copy of this file in your build */
- /* directory, rather than modifying it in-place. */
- /* */
- /* The build directory is normally `freetype/builds/<system>' and */
- /* contains build or system-specific files that are included in */
- /* priority when building the library. */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** G E N E R A L F R E E T Y P E 2 C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* Convenience functions support */
- /* */
- /* Some functions of the FreeType 2 API are provided as a convenience */
- /* for client applications and developers. However, they are not */
- /* required to build and run the library itself. */
- /* */
- /* By defining this configuration macro, you'll disable the */
- /* compilation of these functions at build time. This can be useful */
- /* to reduce the library's code size when you don't need any of */
- /* these functions. */
- /* */
- /* All convenience functions are declared as such in their */
- /* documentation. */
- /* */
-#undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-
-
- /*************************************************************************/
- /* */
- /* Alternate Glyph Image Format support */
- /* */
- /* By default, the glyph images returned by the FreeType glyph loader */
- /* can either be a pixmap or a vectorial outline defined through */
- /* Bezier control points. When defining the following configuration */
- /* macro, some font drivers will be able to register alternate */
- /* glyph image formats. */
- /* */
- /* Unset this macro if you are sure that you will never use a font */
- /* driver with an alternate glyph format; this will reduce the size of */
- /* the base layer code. */
- /* */
- /* Note that a few Type 1 fonts, as well as Windows `vector' fonts */
- /* use a vector `plotter' format that isn't supported when this */
- /* macro is undefined. */
- /* */
-#define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-
-
- /*************************************************************************/
- /* */
- /* Glyph Postscript Names handling */
- /* */
- /* By default, FreeType 2 is compiled with the `PSNames' module. This */
- /* This module is in charge of converting a glyph name string into a */
- /* Unicode value, or return a Macintosh standard glyph name for the */
- /* use with the TrueType `post' table. */
- /* */
- /* Undefine this macro if you do not want `PSNames' compiled in your */
- /* build of FreeType. This has the following effects: */
- /* */
- /* - The TrueType driver will provide its own set of glyph names, */
- /* if you build it to support postscript names in the TrueType */
- /* `post' table. */
- /* */
- /* - The Type 1 driver will not be able to synthetize a Unicode */
- /* charmap out of the glyphs found in the fonts. */
- /* */
- /* You would normally undefine this configuration macro when building */
- /* a version of FreeType that doesn't contain a Type 1 or CFF driver. */
- /* */
-#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
- /*************************************************************************/
- /* */
- /* Postscript Names to Unicode Values support */
- /* */
- /* By default, FreeType 2 is built with the `PSNames' module compiled */
- /* in. Among other things, the module is used to convert a glyph name */
- /* into a Unicode value. This is especially useful in order to */
- /* synthetize on the fly a Unicode charmap from the CFF/Type 1 driver */
- /* through a big table named the `Adobe Glyph List' (AGL). */
- /* */
- /* Undefine this macro if you do not want the Adobe Glyph List */
- /* compiled in your `PSNames' module. The Type 1 driver will not be */
- /* able to synthetize a Unicode charmap out of the glyphs found in the */
- /* fonts. */
- /* */
-#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-
-
- /*************************************************************************/
- /* */
- /* Many compilers provide the non-ANSI `long long' 64-bit type. You can */
- /* activate it by defining the FTCALC_USE_LONG_LONG macro. Note that */
- /* this will produce many -ansi warnings during library compilation, and */
- /* that in many cases the generated code will not be smaller or faster! */
- /* */
-#undef FTCALC_USE_LONG_LONG
-
-
- /*************************************************************************/
- /* */
- /* DLL export compilation */
- /* */
- /* When compiling FreeType as a DLL, some systems/compilers need a */
- /* special keyword in front OR after the return type of function */
- /* declarations. */
- /* */
- /* Two macros are used within the FreeType source code to define */
- /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
- /* */
- /* FT_EXPORT( return_type ) */
- /* */
- /* is used in a function declaration, as in */
- /* */
- /* FT_EXPORT( FT_Error ) */
- /* FT_Init_FreeType( FT_Library* alibrary ); */
- /* */
- /* */
- /* FT_EXPORT_DEF( return_type ) */
- /* */
- /* is used in a function definition, as in */
- /* */
- /* FT_EXPORT_DEF( FT_Error ) */
- /* FT_Init_FreeType( FT_Library* alibrary ) */
- /* { */
- /* ... some code ... */
- /* return FT_Err_Ok; */
- /* } */
- /* */
- /* You can provide your own implementation of FT_EXPORT and */
- /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
- /* will be later automatically defined as `extern return_type' to */
- /* allow normal compilation. */
- /* */
-#undef FT_EXPORT
-#undef FT_EXPORT_DEF
-
-
- /*************************************************************************/
- /* */
- /* Debug level */
- /* */
- /* FreeType can be compiled in debug or trace mode. In debug mode, */
- /* errors are reported through the `ftdebug' component. In trace */
- /* mode, additional messages are sent to the standard output during */
- /* execution. */
- /* */
- /* Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode. */
- /* Define FT_DEBUG_LEVEL_TRACE to build it in trace mode. */
- /* */
- /* Don't define any of these macros to compile in `release' mode! */
- /* */
-#define FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_TRACE
-
-
- /*************************************************************************/
- /* */
- /* Computation Algorithms */
- /* */
- /* Used for debugging, this configuration macro should disappear */
- /* soon. */
- /* */
-#define FT_CONFIG_OPTION_OLD_CALCS
-
-
- /*************************************************************************/
- /* */
- /* The size in bytes of the render pool used by the scan-line converter */
- /* to do all of its work. */
- /* */
- /* This must be greater than 4kByte. */
- /* */
-#define FT_RENDER_POOL_SIZE 16384
-
-
- /*************************************************************************/
- /* */
- /* FT_MAX_MODULES */
- /* */
- /* The maximum number of modules that can be registered in a single */
- /* FreeType library object. 16 is the default. */
- /* */
-#define FT_MAX_MODULES 16
-
-
- /*************************************************************************/
- /* */
- /* FT_MAX_EXTENSIONS */
- /* */
- /* The maximum number of extensions that can be registered in a single */
- /* font driver. 8 is the default. */
- /* */
- /* If you don't know what this means, you certainly do not need to */
- /* change this value. */
- /* */
-#define FT_MAX_EXTENSIONS 8
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** S F N T D R I V E R C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */
- /* embedded bitmaps in all formats using the SFNT module (namely */
- /* TrueType & OpenType). */
- /* */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
- /* load and enumerate the glyph Postscript names in a TrueType or */
- /* OpenType file. */
- /* */
- /* Note that when you do not compile the `PSNames' module by undefining */
- /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will */
- /* contain additional code used to read the PS Names table from a font. */
- /* */
- /* (By default, the module uses `PSNames' to extract glyph names.) */
- /* */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to */
- /* access the internal name table in a SFNT-based format like TrueType */
- /* or OpenType. The name table contains various strings used to */
- /* describe the font, like family name, copyright, version, etc. It */
- /* does not contain any glyph name though. */
- /* */
- /* Accessing SFNT names is done through the functions declared in */
- /* `freetype/ftnames.h'. */
- /* */
-#define TT_CONFIG_OPTION_SFNT_NAMES
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** T R U E T Y P E D R I V E R C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile */
- /* a bytecode interpreter in the TrueType driver. Note that there are */
- /* important patent issues related to the use of the interpreter. */
- /* */
- /* By undefining this, you will only compile the code necessary to load */
- /* TrueType glyphs without hinting. */
- /* */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
- /* bytecode interpreter with a huge switch statement, rather than a call */
- /* table. This results in smaller and faster code for a number of */
- /* architectures. */
- /* */
- /* Note however that on some compiler/processor combinations, undefining */
- /* this macro will generate faster, though larger, code. */
- /* */
-#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** T Y P E 1 D R I V E R C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */
- /* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */
- /* required. */
- /* */
-#define T1_MAX_DICT_DEPTH 5
-
-
- /*************************************************************************/
- /* */
- /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
- /* calls during glyph loading. */
- /* */
-#define T1_MAX_SUBRS_CALLS 16
-
-
- /*************************************************************************/
- /* */
- /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
- /* minimum of 16 is required. */
- /* */
- /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
- /* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 256
-
-
- /*************************************************************************/
- /* */
- /* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate a */
- /* driver with no hinter. This can be useful to debug the parser. */
- /* */
-#undef T1_CONFIG_OPTION_DISABLE_HINTER
-
-
- /*************************************************************************/
- /* */
- /* Define this configuration macro if you want to prevent the */
- /* compilation of `t1afm', which is in charge of reading Type 1 AFM */
- /* files into an existing face. Note that if set, the T1 driver will be */
- /* unable to produce kerning distances. */
- /* */
-#undef T1_CONFIG_OPTION_NO_AFM
-
-
- /*************************************************************************/
- /* */
- /* Define this configuration macro if you want to prevent the */
- /* compilation of the Multiple Masters font support in the Type 1 */
- /* driver. */
- /* */
-#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-
-
-#ifdef __cplusplus
- }
-#endif
-
-
-#endif /* __FTOPTION_H__ */
-
-
-/* END */
diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h
new file mode 100644
index 0000000..364df57
--- /dev/null
+++ b/builds/unix/ft2unix.h
@@ -0,0 +1,34 @@
+/***************************************************************************/
+/* */
+/* ft2build.h */
+/* */
+/* Build macros of the FreeType 2 library. */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/* */
+/* This is a Unix-specific version of <ft2build.h> that should be */
+/* used exclusively _once_ the library has been installed on the */
+/* system. */
+/* */
+/* currently, the FreeType 2 root is at "freetype2/freetype", though */
+/* it will change to a simple "freetype2" in the near future.. */
+/* */
+/***************************************************************************/
+
+#ifndef __FT2_BUILD_UNIX_H__
+#define __FT2_BUILD_UNIX_H__
+
+#define FT2_ROOT freetype2/freetype
+#include <FT2_ROOT/config/ft2build.h>
+
+#endif /* __FT2_BUILD_UNIX_H__ */
+
+/* END */
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 0b07072..16403f6 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -33,6 +33,7 @@ install: $(PROJECT_LIBRARY)
-for P in $(CACHE_H) ; do \
$(INSTALL_DATA) $$P $(includedir)/freetype2/freetype/cache ; \
done
+ $(INSTALL_DATA) $(BUILD)/ft2unix.h $(includedir)/ft2build.h
$(INSTALL_SCRIPT) -m 755 $(BUILD)/freetype-config \
$(bindir)/freetype-config
diff --git a/builds/unix/unix-dev.mk b/builds/unix/unix-dev.mk
index 1dcd9ee..7d5d459 100644
--- a/builds/unix/unix-dev.mk
+++ b/builds/unix/unix-dev.mk
@@ -17,6 +17,8 @@
include $(TOP)/builds/unix/unixddef.mk
+BUILD := $(TOP)/builds/devel
+
include $(TOP)/builds/compiler/gcc-dev.mk
include $(TOP)/builds/link_std.mk
diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk
index 0ddc6c5..e1e92df 100644
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -22,8 +22,10 @@ TOP := $(shell cd $(TOP); pwd)
DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
+
# we use a special devel ftoption.h
-BUILD := $(TOP)/builds/unix/devel
+BUILD := $(TOP)/builds/devel
+
# do not set the platform to `unix', or libtool will trick you
PLATFORM := unixdev
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 6e4624c..9c87470 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -96,7 +96,14 @@ ifeq ($(PLATFORM),ansi)
bcc32: setup
endif
- ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target
+ ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
+ CONFIG_FILE := w32-bccd.mk
+ CC := bcc32
+ SEP := /
+ devel: setup
+ endif
+
+ ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-dev.mk
CC := gcc
SEP := /
diff --git a/builds/win32/devel/freetype/config/ftoption.h b/builds/win32/devel/freetype/config/ftoption.h
deleted file mode 100644
index bfc6ad7..0000000
--- a/builds/win32/devel/freetype/config/ftoption.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/***************************************************************************/
-/* */
-/* ftoption.h */
-/* */
-/* User-selectable configuration macros (specification only). */
-/* */
-/* Copyright 1996-2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __FTOPTION_H__
-#define __FTOPTION_H__
-
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-
- /*************************************************************************/
- /* */
- /* USER-SELECTABLE CONFIGURATION MACROS */
- /* */
- /* These macros can be toggled by developers to enable or disable */
- /* certain aspects of FreeType. This is a default file, where all major */
- /* options are enabled. */
- /* */
- /* Note that if some modifications are required for your build, we */
- /* advise you to put a modified copy of this file in your build */
- /* directory, rather than modifying it in-place. */
- /* */
- /* The build directory is normally `freetype/builds/<system>' and */
- /* contains build or system-specific files that are included in */
- /* priority when building the library. */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** G E N E R A L F R E E T Y P E 2 C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* Convenience functions support */
- /* */
- /* Some functions of the FreeType 2 API are provided as a convenience */
- /* for client applications and developers. However, they are not */
- /* required to build and run the library itself. */
- /* */
- /* By defining this configuration macro, you'll disable the */
- /* compilation of these functions at build time. This can be useful */
- /* to reduce the library's code size when you don't need any of */
- /* these functions. */
- /* */
- /* All convenience functions are declared as such in their */
- /* documentation. */
- /* */
-#undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS
-
-
- /*************************************************************************/
- /* */
- /* Alternate Glyph Image Format support */
- /* */
- /* By default, the glyph images returned by the FreeType glyph loader */
- /* can either be a pixmap or a vectorial outline defined through */
- /* Bezier control points. When defining the following configuration */
- /* macro, some font drivers will be able to register alternate */
- /* glyph image formats. */
- /* */
- /* Unset this macro if you are sure that you will never use a font */
- /* driver with an alternate glyph format; this will reduce the size of */
- /* the base layer code. */
- /* */
- /* Note that a few Type 1 fonts, as well as Windows `vector' fonts */
- /* use a vector `plotter' format that isn't supported when this */
- /* macro is undefined. */
- /* */
-#define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS
-
-
- /*************************************************************************/
- /* */
- /* Glyph Postscript Names handling */
- /* */
- /* By default, FreeType 2 is compiled with the `PSNames' module. This */
- /* This module is in charge of converting a glyph name string into a */
- /* Unicode value, or return a Macintosh standard glyph name for the */
- /* use with the TrueType `post' table. */
- /* */
- /* Undefine this macro if you do not want `PSNames' compiled in your */
- /* build of FreeType. This has the following effects: */
- /* */
- /* - The TrueType driver will provide its own set of glyph names, */
- /* if you build it to support postscript names in the TrueType */
- /* `post' table. */
- /* */
- /* - The Type 1 driver will not be able to synthetize a Unicode */
- /* charmap out of the glyphs found in the fonts. */
- /* */
- /* You would normally undefine this configuration macro when building */
- /* a version of FreeType that doesn't contain a Type 1 or CFF driver. */
- /* */
-#define FT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
- /*************************************************************************/
- /* */
- /* Postscript Names to Unicode Values support */
- /* */
- /* By default, FreeType 2 is built with the `PSNames' module compiled */
- /* in. Among other things, the module is used to convert a glyph name */
- /* into a Unicode value. This is especially useful in order to */
- /* synthetize on the fly a Unicode charmap from the CFF/Type 1 driver */
- /* through a big table named the `Adobe Glyph List' (AGL). */
- /* */
- /* Undefine this macro if you do not want the Adobe Glyph List */
- /* compiled in your `PSNames' module. The Type 1 driver will not be */
- /* able to synthetize a Unicode charmap out of the glyphs found in the */
- /* fonts. */
- /* */
-#define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
-
-
- /*************************************************************************/
- /* */
- /* Many compilers provide the non-ANSI `long long' 64-bit type. You can */
- /* activate it by defining the FTCALC_USE_LONG_LONG macro. Note that */
- /* this will produce many -ansi warnings during library compilation, and */
- /* that in many cases the generated code will not be smaller or faster! */
- /* */
-#undef FTCALC_USE_LONG_LONG
-
-
- /*************************************************************************/
- /* */
- /* DLL export compilation */
- /* */
- /* When compiling FreeType as a DLL, some systems/compilers need a */
- /* special keyword in front OR after the return type of function */
- /* declarations. */
- /* */
- /* Two macros are used within the FreeType source code to define */
- /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */
- /* */
- /* FT_EXPORT( return_type ) */
- /* */
- /* is used in a function declaration, as in */
- /* */
- /* FT_EXPORT( FT_Error ) */
- /* FT_Init_FreeType( FT_Library* alibrary ); */
- /* */
- /* */
- /* FT_EXPORT_DEF( return_type ) */
- /* */
- /* is used in a function definition, as in */
- /* */
- /* FT_EXPORT_DEF( FT_Error ) */
- /* FT_Init_FreeType( FT_Library* alibrary ) */
- /* { */
- /* ... some code ... */
- /* return FT_Err_Ok; */
- /* } */
- /* */
- /* You can provide your own implementation of FT_EXPORT and */
- /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */
- /* will be later automatically defined as `extern return_type' to */
- /* allow normal compilation. */
- /* */
-#undef FT_EXPORT
-#undef FT_EXPORT_DEF
-
-
- /*************************************************************************/
- /* */
- /* Debug level */
- /* */
- /* FreeType can be compiled in debug or trace mode. In debug mode, */
- /* errors are reported through the `ftdebug' component. In trace */
- /* mode, additional messages are sent to the standard output during */
- /* execution. */
- /* */
- /* Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode. */
- /* Define FT_DEBUG_LEVEL_TRACE to build it in trace mode. */
- /* */
- /* Don't define any of these macros to compile in `release' mode! */
- /* */
-#define FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_TRACE
-
-
- /*************************************************************************/
- /* */
- /* Computation Algorithms */
- /* */
- /* Used for debugging, this configuration macro should disappear */
- /* soon. */
- /* */
-#define FT_CONFIG_OPTION_OLD_CALCS
-
-
- /*************************************************************************/
- /* */
- /* The size in bytes of the render pool used by the scan-line converter */
- /* to do all of its work. */
- /* */
- /* This must be greater than 4kByte. */
- /* */
-#define FT_RENDER_POOL_SIZE 16384
-
-
- /*************************************************************************/
- /* */
- /* FT_MAX_MODULES */
- /* */
- /* The maximum number of modules that can be registered in a single */
- /* FreeType library object. 16 is the default. */
- /* */
-#define FT_MAX_MODULES 16
-
-
- /*************************************************************************/
- /* */
- /* FT_MAX_EXTENSIONS */
- /* */
- /* The maximum number of extensions that can be registered in a single */
- /* font driver. 8 is the default. */
- /* */
- /* If you don't know what this means, you certainly do not need to */
- /* change this value. */
- /* */
-#define FT_MAX_EXTENSIONS 8
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** S F N T D R I V E R C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */
- /* embedded bitmaps in all formats using the SFNT module (namely */
- /* TrueType & OpenType). */
- /* */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to */
- /* load and enumerate the glyph Postscript names in a TrueType or */
- /* OpenType file. */
- /* */
- /* Note that when you do not compile the `PSNames' module by undefining */
- /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will */
- /* contain additional code used to read the PS Names table from a font. */
- /* */
- /* (By default, the module uses `PSNames' to extract glyph names.) */
- /* */
-#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_SFNT_NAMES if your applications need to */
- /* access the internal name table in a SFNT-based format like TrueType */
- /* or OpenType. The name table contains various strings used to */
- /* describe the font, like family name, copyright, version, etc. It */
- /* does not contain any glyph name though. */
- /* */
- /* Accessing SFNT names is done through the functions declared in */
- /* `freetype/ftnames.h'. */
- /* */
-#define TT_CONFIG_OPTION_SFNT_NAMES
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** T R U E T Y P E D R I V E R C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile */
- /* a bytecode interpreter in the TrueType driver. Note that there are */
- /* important patent issues related to the use of the interpreter. */
- /* */
- /* By undefining this, you will only compile the code necessary to load */
- /* TrueType glyphs without hinting. */
- /* */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-
-
- /*************************************************************************/
- /* */
- /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
- /* bytecode interpreter with a huge switch statement, rather than a call */
- /* table. This results in smaller and faster code for a number of */
- /* architectures. */
- /* */
- /* Note however that on some compiler/processor combinations, undefining */
- /* this macro will generate faster, though larger, code. */
- /* */
-#define TT_CONFIG_OPTION_INTERPRETER_SWITCH
-
-
- /*************************************************************************/
- /*************************************************************************/
- /**** ****/
- /**** T Y P E 1 D R I V E R C O N F I G U R A T I O N ****/
- /**** ****/
- /*************************************************************************/
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */
- /* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */
- /* required. */
- /* */
-#define T1_MAX_DICT_DEPTH 5
-
-
- /*************************************************************************/
- /* */
- /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */
- /* calls during glyph loading. */
- /* */
-#define T1_MAX_SUBRS_CALLS 16
-
-
- /*************************************************************************/
- /* */
- /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. A */
- /* minimum of 16 is required. */
- /* */
- /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
- /* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 256
-
-
- /*************************************************************************/
- /* */
- /* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate a */
- /* driver with no hinter. This can be useful to debug the parser. */
- /* */
-#undef T1_CONFIG_OPTION_DISABLE_HINTER
-
-
- /*************************************************************************/
- /* */
- /* Define this configuration macro if you want to prevent the */
- /* compilation of `t1afm', which is in charge of reading Type 1 AFM */
- /* files into an existing face. Note that if set, the T1 driver will be */
- /* unable to produce kerning distances. */
- /* */
-#undef T1_CONFIG_OPTION_NO_AFM
-
-
- /*************************************************************************/
- /* */
- /* Define this configuration macro if you want to prevent the */
- /* compilation of the Multiple Masters font support in the Type 1 */
- /* driver. */
- /* */
-#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
-
-
-#ifdef __cplusplus
- }
-#endif
-
-
-#endif /* __FTOPTION_H__ */
-
-
-/* END */
diff --git a/builds/win32/w32-bccd.mk b/builds/win32/w32-bccd.mk
index 943f72c..3c56d5d 100644
--- a/builds/win32/w32-bccd.mk
+++ b/builds/win32/w32-bccd.mk
@@ -13,8 +13,11 @@
# fully.
-SEP := /
+SEP := /
+
include $(TOP)/builds/win32/win32-def.mk
+BUILD := $(TOP)/builds/devel
+
include $(TOP)/builds/compiler/bcc-dev.mk
# include linking instructions
diff --git a/builds/win32/w32-dev.mk b/builds/win32/w32-dev.mk
index 28146d8..42932d0 100644
--- a/builds/win32/w32-dev.mk
+++ b/builds/win32/w32-dev.mk
@@ -24,12 +24,15 @@ ifndef TOP
endif
SEP := /
-BUILD := $(TOP)/builds/win32/devel
include $(TOP)/builds/win32/win32-def.mk
+BUILD := $(TOP)/builds/devel
+
include $(TOP)/builds/compiler/gcc-dev.mk
# include linking instructions
include $(TOP)/builds/link_dos.mk
+
+
# EOF
diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h
index 50e06da..99c3431 100644
--- a/include/freetype/cache/ftcchunk.h
+++ b/include/freetype/cache/ftcchunk.h
@@ -45,12 +45,9 @@
#ifndef __FTCCHUNK_H__
#define __FTCCHUNK_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
-#include FT_CACHE_H
-#include FT_CACHE_MANAGER_H
+#include <ft2build.h>
+#include FT_CACHE_H
+#include FT_CACHE_MANAGER_H
FT_BEGIN_HEADER
diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h
index 812eaf1..ae4d4c1 100644
--- a/include/freetype/cache/ftcglyph.h
+++ b/include/freetype/cache/ftcglyph.h
@@ -53,10 +53,7 @@
#ifndef __FTCGLYPH_H__
#define __FTCGLYPH_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_MANAGER_H
#include <stddef.h>
diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h
index e68988e..2564daf 100644
--- a/include/freetype/cache/ftcimage.h
+++ b/include/freetype/cache/ftcimage.h
@@ -26,10 +26,7 @@
#ifndef __FTCIMAGE_H__
#define __FTCIMAGE_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_GLYPH_H
diff --git a/include/freetype/cache/ftcmanag.h b/include/freetype/cache/ftcmanag.h
index ce1e980..1e33c85 100644
--- a/include/freetype/cache/ftcmanag.h
+++ b/include/freetype/cache/ftcmanag.h
@@ -62,10 +62,7 @@
#ifndef __FTCMANAG_H__
#define __FTCMANAG_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_LRU_H
diff --git a/include/freetype/cache/ftcsbits.h b/include/freetype/cache/ftcsbits.h
index 9104d21..95bbde2 100644
--- a/include/freetype/cache/ftcsbits.h
+++ b/include/freetype/cache/ftcsbits.h
@@ -19,10 +19,7 @@
#ifndef __FTCSBITS_H__
#define __FTCSBITS_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_CHUNK_H
#include FT_CACHE_IMAGE_H
diff --git a/include/freetype/cache/ftlru.h b/include/freetype/cache/ftlru.h
index 538a238..16814c8 100644
--- a/include/freetype/cache/ftlru.h
+++ b/include/freetype/cache/ftlru.h
@@ -58,10 +58,7 @@
#ifndef __FTLRU_H__
#define __FTLRU_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h
new file mode 100644
index 0000000..629c399
--- /dev/null
+++ b/include/freetype/config/ft2build.h
@@ -0,0 +1,229 @@
+/***************************************************************************/
+/* */
+/* ft2build.h */
+/* */
+/* Build macros of the FreeType 2 library. */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/* */
+/* This file corresponds to the default "ft2build.h" file for */
+/* FreeType 2. It uses the "freetype" include root. */
+/* */
+/* Note that specific platforms might use a different configurations. */
+/* For example, on Unix, the "freetype2" include root is used, with */
+/* a specific "ft2build.h" used to take care of this. The latter */
+/* looks like the following: */
+/* */
+/* */
+/* #ifndef __FT_BUILD_UNIX_H__ */
+/* #define __FT_BUILD_UNIX_H__ */
+/* */
+/* #define FT_ROOT freetype2 */
+/* #include <FT_ROOT/config/ft2build.h> */
+/* */
+/* #endif // __FT_BUILD_UNIX_H__ */
+/* */
+/* */
+/***************************************************************************/
+
+
+#ifndef __FT2_BUILD_H__
+#define __FT2_BUILD_H__
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_ROOT is used to define the root of all public header */
+ /* files for FreeType 2. By default, it is set to "freetype", which */
+ /* means that all public files should be included with a line like: */
+ /* */
+ /* #include <freetype/...> */
+ /* */
+ /* Redefine it to something different if necessary, depending where the */
+ /* library is installed on the particular system. */
+ /* */
+#ifndef FT2_ROOT
+#define FT2_ROOT freetype
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_CONFIG_ROOT is used to define the root of all */
+ /* configuration header files for FreeType 2. By default, it is set to */
+ /* "freetype/config", which means that all config files should be */
+ /* include with a line like: */
+ /* */
+ /* #include <freetype/config/...> */
+ /* */
+ /* Redefine it to something different, depending where the library is */
+ /* installed on the particular system. */
+ /* */
+#ifndef FT2_CONFIG_ROOT
+#define FT2_CONFIG_ROOT FT2_ROOT/config
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public file.*/
+ /* Its parameter is the file pathname, relative to the public root of a */
+ /* given header file. */
+ /* */
+#define FT2_PUBLIC_FILE( x ) <FT2_ROOT/x>
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config file.*/
+ /* Its parameter is the file pathname, relative to the configuration */
+ /* root directory of a given header file. */
+ /* */
+#define FT2_CONFIG_FILE( x ) <FT2_CONFIG_ROOT/x>
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_INTERNAL_FILE is used to include a FreeType 2 internal */
+ /* file. Its parameter is the file pathname, relative to the */
+ /* configuration root directory of a given header file. */
+ /* */
+#define FT2_INTERNAL_FILE( x ) <FT2_ROOT/internal/x>
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_COMPONENT_FILE is used to include a given FreeType 2 */
+ /* component source file (be it a header, a C source file, or an */
+ /* included file). */
+ /* */
+ /* Its first argument is the component/module's directory according to */
+ /* the normal FreeType 2 source directory hierarchy, and the second one */
+ /* the file name. */
+ /* */
+ /* Note that you can also put all library source files in a single */
+ /* directory and compile them normally by defining the macro */
+ /* FT_FLAT_COMPILATION. */
+ /* */
+#define FT2_COMPONENT_FILE( d, x ) <FT2_ROOT/d/x>
+
+
+ /*************************************************************************/
+ /* */
+ /* The macro FT2_SOURCE_FILE is used to include a given FreeType 2 */
+ /* component source file (be it a header, a C source file, or an */
+ /* included file). */
+ /* */
+ /* Its first argument is the component/module's directory according to */
+ /* the normal FreeType 2 source directory hierarchy, and the second one */
+ /* the file name. */
+ /* */
+ /* Note that you can also put all library source files in a single */
+ /* directory and compile them normally by defining the macro */
+ /* FT_FLAT_COMPILATION. */
+ /* */
+#ifdef FT2_FLAT_COMPILATION
+#define FT2_SOURCE_FILE( d, x ) <d/x>
+#else
+#define FT2_SOURCE_FILE( d, x ) "x"
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* <Macro> */
+ /* FT_BEGIN_HEADER */
+ /* */
+ /* <Description> */
+ /* This macro is used in association with @FT_END_HEADER in header */
+ /* files to ensure that the declarations within are properly */
+ /* encapsulated in an `extern "C" { .. }' block when included from a */
+ /* C++ compiler. */
+ /* */
+#ifdef __cplusplus
+#define FT_BEGIN_HEADER extern "C" {
+#else
+#define FT_BEGIN_HEADER /* nothing */
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* <Macro> */
+ /* FT_END_HEADER */
+ /* */
+ /* <Description> */
+ /* This macro is used in association with @FT_BEGIN_HEADER in header */
+ /* files to ensure that the declarations within are properly */
+ /* encapsulated in an `extern "C" { .. }' block when included from a */
+ /* C++ compiler. */
+ /* */
+#ifdef __cplusplus
+#define FT_END_HEADER }
+#else
+#define FT_END_HEADER /* nothing */
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* Aliases for the FreeType 2 public and configuration files. */
+ /* */
+ /*************************************************************************/
+
+ /* don't add spaces around arguments to FT_CONFIG_FILE! */
+
+ /* configuration files */
+#ifndef FT_CONFIG_CONFIG_H
+# define FT_CONFIG_CONFIG_H FT2_CONFIG_FILE(ftconfig.h)
+#endif
+
+#ifndef FT_CONFIG_OPTIONS_H
+# define FT_CONFIG_OPTIONS_H FT2_CONFIG_FILE(ftoption.h)
+#endif
+
+#ifndef FT_CONFIG_MODULES_H
+# define FT_CONFIG_MODULES_H FT2_CONFIG_FILE(ftmodule.h)
+#endif
+
+ /* public headers */
+#define FT_ERRORS_H FT2_PUBLIC_FILE(fterrors.h)
+#define FT_SYSTEM_H FT2_PUBLIC_FILE(ftsystem.h)
+#define FT_IMAGE_H FT2_PUBLIC_FILE(ftimage.h)
+
+#define FT_TYPES_H FT2_PUBLIC_FILE(fttypes.h)
+
+#define FT_FREETYPE_H FT2_PUBLIC_FILE(freetype.h)
+#define FT_GLYPH_H FT2_PUBLIC_FILE(ftglyph.h)
+#define FT_BBOX_H FT2_PUBLIC_FILE(ftbbox.h)
+#define FT_CACHE_H FT2_PUBLIC_FILE(ftcache.h)
+#define FT_LIST_H FT2_PUBLIC_FILE(ftlist.h)
+#define FT_MAC_H FT2_PUBLIC_FILE(ftmac.h)
+#define FT_MULTIPLE_MASTERS_H FT2_PUBLIC_FILE(ftmm.h)
+#define FT_MODULE_H FT2_PUBLIC_FILE(ftmodule.h)
+#define FT_NAMES_H FT2_PUBLIC_FILE(ftnames.h)
+#define FT_OUTLINE_H FT2_PUBLIC_FILE(ftoutln.h)
+#define FT_RENDER_H FT2_PUBLIC_FILE(ftrender.h)
+#define FT_SYNTHESIS_H FT2_PUBLIC_FILE(ftsynth.h)
+#define FT_TYPE1_TABLES_H FT2_PUBLIC_FILE(t1tables.h)
+#define FT_TRUETYPE_NAMES_H FT2_PUBLIC_FILE(ttnameid.h)
+#define FT_TRUETYPE_TABLES_H FT2_PUBLIC_FILE(tttables.h)
+#define FT_TRUETYPE_TAGS_H FT2_PUBLIC_FILE(tttags.h)
+
+
+ /* now include internal headers definitions from <freetype/internal/...> */
+#include FT2_PUBLIC_FILE(internal/internal.h)
+
+
+#endif /* __FT2_BUILD_H__ */
+
+
+/* END */
diff --git a/include/freetype/config/ftbuild.h b/include/freetype/config/ftbuild.h
deleted file mode 100644
index 50bfb6e..0000000
--- a/include/freetype/config/ftbuild.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/***************************************************************************/
-/* */
-/* ftbuild.h */
-/* */
-/* Build macros of the FreeType 2 library. */
-/* */
-/* Copyright 1996-2000 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __FT_BUILD_H__
-#define __FT_BUILD_H__
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_ROOT is used to define the root of all public header */
- /* files for FreeType 2. By default, it is set to "freetype", which */
- /* means that all public files should be included with a line like: */
- /* */
- /* #include <freetype/...> */
- /* */
- /* Redefine it to something different if necessary, depending where the */
- /* library is installed on the particular system. */
- /* */
-#ifndef FT_ROOT
-#define FT_ROOT freetype
-#endif
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_CONFIG_ROOT is used to define the root of all */
- /* configuration header files for FreeType 2. By default, it is set to */
- /* "freetype/config", which means that all config files should be */
- /* include with a line like: */
- /* */
- /* #include <freetype/config/...> */
- /* */
- /* Redefine it to something different, depending where the library is */
- /* installed on the particular system. */
- /* */
-#ifndef FT_CONFIG_ROOT
-#define FT_CONFIG_ROOT FT_ROOT/config
-#endif
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_PUBLIC_FILE is used to include a FreeType 2 public file. */
- /* Its parameter is the file pathname, relative to the public root of a */
- /* given header file. */
- /* */
-#define FT_PUBLIC_FILE( x ) <FT_ROOT/x>
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_CONFIG_FILE is used to include a FreeType 2 config file. */
- /* Its parameter is the file pathname, relative to the configuration */
- /* root directory of a given header file. */
- /* */
-#define FT_CONFIG_FILE( x ) <FT_CONFIG_ROOT/x>
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_INTERNAL_FILE is used to include a FreeType 2 internal */
- /* file. Its parameter is the file pathname, relative to the */
- /* configuration root directory of a given header file. */
- /* */
-#define FT_INTERNAL_FILE( x ) <FT_ROOT/internal/x>
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_COMPONENT_FILE is used to include a given FreeType 2 */
- /* component source file (be it a header, a C source file, or an */
- /* included file). */
- /* */
- /* Its first argument is the component/module's directory according to */
- /* the normal FreeType 2 source directory hierarchy, and the second one */
- /* the file name. */
- /* */
- /* Note that you can also put all library source files in a single */
- /* directory and compile them normally by defining the macro */
- /* FT_FLAT_COMPILATION. */
- /* */
-#define FT_COMPONENT_FILE( d, x ) <FT_ROOT/d/x>
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_SOURCE_FILE is used to include a given FreeType 2 */
- /* component source file (be it a header, a C source file, or an */
- /* included file). */
- /* */
- /* Its first argument is the component/module's directory according to */
- /* the normal FreeType 2 source directory hierarchy, and the second one */
- /* the file name. */
- /* */
- /* Note that you can also put all library source files in a single */
- /* directory and compile them normally by defining the macro */
- /* FT_FLAT_COMPILATION. */
- /* */
-#ifdef FT_FLAT_COMPILATION
-#define FT_SOURCE_FILE( d, x ) <d/x>
-#else
-#define FT_SOURCE_FILE( d, x ) "x"
-#endif
-
-
- /*************************************************************************/
- /* */
- /* <Macro> */
- /* FT_BEGIN_HEADER */
- /* */
- /* <Description> */
- /* This macro is used in association with @FT_END_HEADER in header */
- /* files to ensure that the declarations within are properly */
- /* encapsulated in an `extern "C" { .. }' block when included from a */
- /* C++ compiler. */
- /* */
-#ifdef __cplusplus
-#define FT_BEGIN_HEADER extern "C" {
-#else
-#define FT_BEGIN_HEADER /* nothing */
-#endif
-
-
- /*************************************************************************/
- /* */
- /* <Macro> */
- /* FT_END_HEADER */
- /* */
- /* <Description> */
- /* This macro is used in association with @FT_BEGIN_HEADER in header */
- /* files to ensure that the declarations within are properly */
- /* encapsulated in an `extern "C" { .. }' block when included from a */
- /* C++ compiler. */
- /* */
-#ifdef __cplusplus
-#define FT_END_HEADER }
-#else
-#define FT_END_HEADER /* nothing */
-#endif
-
-
- /*************************************************************************/
- /* */
- /* Aliases for the FreeType 2 public and configuration files. */
- /* */
- /*************************************************************************/
-
- /* don't add spaces around arguments to FT_CONFIG_FILE! */
-
- /* configuration files */
-#ifndef FT_CONFIG_CONFIG_H
-# define FT_CONFIG_CONFIG_H FT_CONFIG_FILE(ftconfig.h)
-#endif
-
-#ifndef FT_CONFIG_OPTIONS_H
-# define FT_CONFIG_OPTIONS_H FT_CONFIG_FILE(ftoption.h)
-#endif
-
-#ifndef FT_CONFIG_MODULES_H
-# define FT_CONFIG_MODULES_H FT_CONFIG_FILE(ftmodule.h)
-#endif
-
- /* public headers */
-#define FT_ERRORS_H FT_PUBLIC_FILE(fterrors.h)
-#define FT_SYSTEM_H FT_PUBLIC_FILE(ftsystem.h)
-#define FT_IMAGE_H FT_PUBLIC_FILE(ftimage.h)
-
-#define FT_TYPES_H FT_PUBLIC_FILE(fttypes.h)
-
-#define FT_FREETYPE_H FT_PUBLIC_FILE(freetype.h)
-#define FT_GLYPH_H FT_PUBLIC_FILE(ftglyph.h)
-#define FT_BBOX_H FT_PUBLIC_FILE(ftbbox.h)
-#define FT_CACHE_H FT_PUBLIC_FILE(ftcache.h)
-#define FT_LIST_H FT_PUBLIC_FILE(ftlist.h)
-#define FT_MAC_H FT_PUBLIC_FILE(ftmac.h)
-#define FT_MULTIPLE_MASTERS_H FT_PUBLIC_FILE(ftmm.h)
-#define FT_MODULE_H FT_PUBLIC_FILE(ftmodule.h)
-#define FT_NAMES_H FT_PUBLIC_FILE(ftnames.h)
-#define FT_OUTLINE_H FT_PUBLIC_FILE(ftoutln.h)
-#define FT_RENDER_H FT_PUBLIC_FILE(ftrender.h)
-#define FT_SYNTHESIS_H FT_PUBLIC_FILE(ftsynth.h)
-#define FT_TYPE1_TABLES_H FT_PUBLIC_FILE(t1tables.h)
-#define FT_TRUETYPE_NAMES_H FT_PUBLIC_FILE(ttnameid.h)
-#define FT_TRUETYPE_TABLES_H FT_PUBLIC_FILE(tttables.h)
-#define FT_TRUETYPE_TAGS_H FT_PUBLIC_FILE(tttags.h)
-
-
- /* now include internal headers definitions from <freetype/internal/...> */
-#include FT_PUBLIC_FILE(internal/internal.h)
-
-
-#endif /* __FT_BUILD_H__ */
-
-
-/* END */
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index dc92d94..0c8217f 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -39,12 +39,7 @@
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
- /* Include the header file containing all developer build options */
-#ifndef FT_BUILD_H
-#define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
FT_BEGIN_HEADER
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 2b0793a..d7240e2 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -19,12 +19,6 @@
#ifndef __FREETYPE_H__
#define __FREETYPE_H__
-/* include potentially build-specific directives and macros */
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
-
/*************************************************************************/
/* */
/* The `raster' component duplicates some of the declarations in */
@@ -43,6 +37,7 @@
#define FREETYPE_MINOR 0
+#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_ERRORS_H
#include FT_TYPES_H
diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h
index 5a8d2e7..d2de225 100644
--- a/include/freetype/ftbbox.h
+++ b/include/freetype/ftbbox.h
@@ -30,10 +30,7 @@
#ifndef FTBBOX_H
#define FTBBOX_H
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index 9de1bc2..eacaa38 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -34,21 +34,18 @@
#ifndef __FTCACHE_H__
#define __FTCACHE_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_GLYPH_H
FT_BEGIN_HEADER
-#define FT_CACHE_MANAGER_H FT_PUBLIC_FILE(cache/ftcmanag.h)
-#define FT_CACHE_IMAGE_H FT_PUBLIC_FILE(cache/ftcimage.h)
-#define FT_CACHE_SMALL_BITMAPS_H FT_PUBLIC_FILE(cache/ftcsbits.h)
+#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
+#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
+#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
-#define FT_CACHE_INTERNAL_LRU_H FT_PUBLIC_FILE(cache/ftlru.h)
-#define FT_CACHE_INTERNAL_GLYPH_H FT_PUBLIC_FILE(cache/ftcglyph.h)
-#define FT_CACHE_INTERNAL_CHUNK_H FT_PUBLIC_FILE(cache/ftcchunk.h)
+#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h)
+#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h)
+#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h)
/*************************************************************************/
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index 010327c..dbe6274 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -32,10 +32,7 @@
#ifndef __FTGLYPH_H__
#define __FTGLYPH_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 16f42ca..f1e4e7d 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -28,10 +28,7 @@
#define __FTIMAGE_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
FT_BEGIN_HEADER
diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h
index bf84787..895aa10 100644
--- a/include/freetype/ftlist.h
+++ b/include/freetype/ftlist.h
@@ -27,10 +27,7 @@
#ifndef __FTLIST_H__
#define __FTLIST_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h
index 7734786..9269634 100644
--- a/include/freetype/ftmm.h
+++ b/include/freetype/ftmm.h
@@ -19,10 +19,7 @@
#ifndef __FTMM_H__
#define __FTMM_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_TYPE1_TABLES_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h
index fd07aaa..4afbf68 100644
--- a/include/freetype/ftmodule.h
+++ b/include/freetype/ftmodule.h
@@ -19,10 +19,7 @@
#ifndef __FTMODULE_H__
#define __FTMODULE_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftnames.h b/include/freetype/ftnames.h
index aabe18f..bb1e903 100644
--- a/include/freetype/ftnames.h
+++ b/include/freetype/ftnames.h
@@ -22,10 +22,7 @@
#ifndef __FTNAMES_H__
#define __FTNAMES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index 37e6b4b..2894fc0 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -20,10 +20,7 @@
#ifndef __FTOUTLN_H__
#define __FTOUTLN_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h
index 2a19fc0..73be242 100644
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -19,10 +19,7 @@
#ifndef __FTRENDER_H__
#define __FTRENDER_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_MODULE_H
#include FT_GLYPH_H
diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h
index e51aacf..42b1e26 100644
--- a/include/freetype/ftsynth.h
+++ b/include/freetype/ftsynth.h
@@ -37,10 +37,7 @@
#ifndef __FTSYNTH_H__
#define __FTSYNTH_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index e5eabb6..1460c7c 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -19,11 +19,7 @@
#ifndef __FTTYPES_H__
#define __FTTYPES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_SYSTEM_H
#include FT_IMAGE_H
#include <stddef.h>
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index 958ee9b..719ee13 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -69,10 +69,7 @@
/* */
/*************************************************************************/
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/fnttypes.h b/include/freetype/internal/fnttypes.h
index 38b01f8..1297672 100644
--- a/include/freetype/internal/fnttypes.h
+++ b/include/freetype/internal/fnttypes.h
@@ -20,10 +20,7 @@
#ifndef __FNTTYPES_H__
#define __FNTTYPES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index bac7370..5637fb1 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -19,10 +19,7 @@
#ifndef __FTCALC_H__
#define __FTCALC_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 30fc1fe..981775d 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -19,10 +19,7 @@
#ifndef __FTDEBUG_H__
#define __FTDEBUG_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h
index 85706a7..746ded6 100644
--- a/include/freetype/internal/ftdriver.h
+++ b/include/freetype/internal/ftdriver.h
@@ -19,10 +19,7 @@
#ifndef __FTDRIVER_H__
#define __FTDRIVER_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_MODULE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftextend.h b/include/freetype/internal/ftextend.h
index 69fe313..a386aa2 100644
--- a/include/freetype/internal/ftextend.h
+++ b/include/freetype/internal/ftextend.h
@@ -19,10 +19,7 @@
#ifndef __FTEXTEND_H__
#define __FTEXTEND_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index a5b9b87..304e390 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -19,10 +19,7 @@
#ifndef __FTMEMORY_H__
#define __FTMEMORY_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_CONFIG_CONFIG_H
#include FT_TYPES_H
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 95c1e65..db7893f 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -26,11 +26,7 @@
#ifndef __FTOBJS_H__
#define __FTOBJS_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_RENDER_H
#include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_DRIVER_H
diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h
index 3eaede7..44c26e3 100644
--- a/include/freetype/internal/ftstream.h
+++ b/include/freetype/internal/ftstream.h
@@ -19,10 +19,7 @@
#ifndef __FTSTREAM_H__
#define __FTSTREAM_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/internal.h b/include/freetype/internal/internal.h
index 767cc08..7a1a3d9 100644
--- a/include/freetype/internal/internal.h
+++ b/include/freetype/internal/internal.h
@@ -26,30 +26,30 @@
/* don't add spaces around the argument of FT_INTERNAL_FILE! */
-#define FT_INTERNAL_OBJECTS_H FT_INTERNAL_FILE(ftobjs.h)
-#define FT_INTERNAL_STREAM_H FT_INTERNAL_FILE(ftstream.h)
-#define FT_INTERNAL_MEMORY_H FT_INTERNAL_FILE(ftmemory.h)
-#define FT_INTERNAL_EXTENSION_H FT_INTERNAL_FILE(ftextend.h)
-#define FT_INTERNAL_DEBUG_H FT_INTERNAL_FILE(ftdebug.h)
-#define FT_INTERNAL_CALC_H FT_INTERNAL_FILE(ftcalc.h)
-#define FT_INTERNAL_DRIVER_H FT_INTERNAL_FILE(ftdriver.h)
+#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE(ftobjs.h)
+#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE(ftstream.h)
+#define FT_INTERNAL_MEMORY_H FT2_INTERNAL_FILE(ftmemory.h)
+#define FT_INTERNAL_EXTENSION_H FT2_INTERNAL_FILE(ftextend.h)
+#define FT_INTERNAL_DEBUG_H FT2_INTERNAL_FILE(ftdebug.h)
+#define FT_INTERNAL_CALC_H FT2_INTERNAL_FILE(ftcalc.h)
+#define FT_INTERNAL_DRIVER_H FT2_INTERNAL_FILE(ftdriver.h)
-#define FT_INTERNAL_SFNT_H FT_INTERNAL_FILE(sfnt.h)
+#define FT_INTERNAL_SFNT_H FT2_INTERNAL_FILE(sfnt.h)
-#define FT_INTERNAL_TRUETYPE_TYPES_H FT_INTERNAL_FILE(tttypes.h)
-#define FT_INTERNAL_TRUETYPE_ERRORS_H FT_INTERNAL_FILE(tterrors.h)
+#define FT_INTERNAL_TRUETYPE_TYPES_H FT2_INTERNAL_FILE(tttypes.h)
+#define FT_INTERNAL_TRUETYPE_ERRORS_H FT2_INTERNAL_FILE(tterrors.h)
-#define FT_INTERNAL_TYPE1_ERRORS_H FT_INTERNAL_FILE(t1errors.h)
-#define FT_INTERNAL_TYPE1_TYPES_H FT_INTERNAL_FILE(t1types.h)
+#define FT_INTERNAL_TYPE1_ERRORS_H FT2_INTERNAL_FILE(t1errors.h)
+#define FT_INTERNAL_TYPE1_TYPES_H FT2_INTERNAL_FILE(t1types.h)
-#define FT_INTERNAL_CFF_ERRORS_H FT_INTERNAL_FILE(t2errors.h)
-#define FT_INTERNAL_CFF_TYPES_H FT_INTERNAL_FILE(t2types.h)
+#define FT_INTERNAL_CFF_ERRORS_H FT2_INTERNAL_FILE(t2errors.h)
+#define FT_INTERNAL_CFF_TYPES_H FT2_INTERNAL_FILE(t2types.h)
-#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT_INTERNAL_FILE(psnames.h)
-#define FT_INTERNAL_POSTSCRIPT_AUX_H FT_INTERNAL_FILE(psaux.h)
+#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT2_INTERNAL_FILE(psnames.h)
+#define FT_INTERNAL_POSTSCRIPT_AUX_H FT2_INTERNAL_FILE(psaux.h)
-#define FT_INTERNAL_AUTOHINT_H FT_INTERNAL_FILE(autohint.h)
-#define FT_INTERNAL_FNT_TYPES_H FT_INTERNAL_FILE(fnttypes.h)
+#define FT_INTERNAL_AUTOHINT_H FT2_INTERNAL_FILE(autohint.h)
+#define FT_INTERNAL_FNT_TYPES_H FT2_INTERNAL_FILE(fnttypes.h)
/* END */
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 3db7049..a41acda 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -20,10 +20,7 @@
#ifndef __PSAUX_H__
#define __PSAUX_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_TYPE1_TYPES_H
diff --git a/include/freetype/internal/psnames.h b/include/freetype/internal/psnames.h
index cb6233f..7587bca 100644
--- a/include/freetype/internal/psnames.h
+++ b/include/freetype/internal/psnames.h
@@ -20,10 +20,7 @@
#ifndef __PSNAMES_H__
#define __PSNAMES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h
index 6815ce6..17db466 100644
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -19,10 +19,7 @@
#ifndef __SFNT_H__
#define __SFNT_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_TRUETYPE_TYPES_H
diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h
index 0aa42cc..9110be8 100644
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@@ -20,10 +20,7 @@
#ifndef __T1TYPES_H__
#define __T1TYPES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_TYPE1_TABLES_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
diff --git a/include/freetype/internal/t2types.h b/include/freetype/internal/t2types.h
index 29ab967..c2cef41 100644
--- a/include/freetype/internal/t2types.h
+++ b/include/freetype/internal/t2types.h
@@ -20,10 +20,7 @@
#ifndef __T2TYPES_H__
#define __T2TYPES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h
index ef74ac2..0ca53b9 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -20,10 +20,7 @@
#ifndef __TTTYPES_H__
#define __TTTYPES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_TRUETYPE_TABLES_H
#include FT_INTERNAL_OBJECTS_H
diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h
index 212627f..dc5edc9 100644
--- a/include/freetype/t1tables.h
+++ b/include/freetype/t1tables.h
@@ -20,11 +20,7 @@
#ifndef __T1TABLES_H__
#define __T1TABLES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h
index 6de013f..d5724ef 100644
--- a/include/freetype/tttables.h
+++ b/include/freetype/tttables.h
@@ -20,11 +20,7 @@
#ifndef __TTTABLES_H__
#define __TTTABLES_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index 4ab1669..56a6a91 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -19,11 +19,7 @@
#ifndef __TTAGS_H__
#define __TTAGS_H__
-#ifndef FT_BUILD_H
-# define FT_BUILD_H <freetype/config/ftbuild.h>
-#endif
-
-#include FT_BUILD_H
+#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
diff --git a/include/ft2build.h b/include/ft2build.h
new file mode 100644
index 0000000..17f61ee
--- /dev/null
+++ b/include/ft2build.h
@@ -0,0 +1,46 @@
+/***************************************************************************/
+/* */
+/* ft2build.h */
+/* */
+/* FreeType 2 build and setup macros. */
+/* (Generic version) */
+/* */
+/* Copyright 1996-2000 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/* */
+/* This file corresponds to the default "ft2build.h" file for */
+/* FreeType 2. It uses the "freetype" include root. */
+/* */
+/* Note that specific platforms might use a different configurations. */
+/* For example, on Unix, the "freetype2" include root is used, with */
+/* a specific "ft2build.h" used to take care of this. The latter */
+/* looks like the following: */
+/* */
+/* */
+/* #ifndef __FT_BUILD_UNIX_H__ */
+/* #define __FT_BUILD_UNIX_H__ */
+/* */
+/* #define FT_ROOT freetype2 */
+/* #include <FT_ROOT/config/ft2build.h> */
+/* */
+/* #endif // __FT_BUILD_UNIX_H__ */
+/* */
+/* */
+/***************************************************************************/
+
+
+#ifndef __FT2_BUILD_GENERIC_H__
+#define __FT2_BUILD_GENERIC_H__
+
+#include <freetype/config/ft2build.h>
+
+#endif /* __FT2_BUILD_GENERIC_H__ */
+
+/* END */
diff --git a/src/base/ftnames.c b/src/base/ftnames.c
index 106f6b1..36af8cf 100644
--- a/src/base/ftnames.c
+++ b/src/base/ftnames.c
@@ -48,7 +48,7 @@
TT_Face ttface = (TT_Face)face;
- if ( index < ttface->num_names )
+ if ( index < (FT_UInt)ttface->num_names )
{
TT_NameRec* name = ttface->name_table.names + index;
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 686629a..3b95d2f 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -1024,7 +1024,7 @@
/* I know that M$ encoded strings are Unicode, */
/* but this works reasonable well for debugging purposes. */
if ( cur->string )
- for ( j = 0; j < cur->stringLength; j++ )
+ for ( j = 0; j < (FT_UInt)cur->stringLength; j++ )
{
FT_Char c = *( cur->string + j );
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 5c759d7..798027d 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -584,6 +584,7 @@
slot->metrics.horiBearingY = slot->bitmap_top << 6;
slot->linearHoriAdvance = (FT_Fixed)bitmap->width << 16;
+ slot->format = ft_glyph_format_bitmap;
Exit:
return error;