Commit 8d3a401fa808a8c70bd6a9ce17d5a840fb0ae2db
2001-03-20T11:14:24
* builds/*/*-def.mk: changed the objects directory from "obj" to "objs" * include/freetype/config/ftheader.h: removed obsolete macros like FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that were previously defined in <freetype/ftcache.h>. Added comments to be included in a new API Reference section. * src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component needs to added its own directory to the include path at compile time. Modified all "rules.mk" and "descrip.mms" accordingly..
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
diff --git a/ChangeLog b/ChangeLog
index a44ae31..79592d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-03-20 David Turner <david.turner@freetype.org>
+
+ * builds/*/*-def.mk: changed the objects directory from "obj" to "objs"
+
+ * include/freetype/config/ftheader.h: removed obsolete macros like
+ FT_SOURCE_FILE, etc.. and added cache-specific macro definitions that
+ were previously defined in <freetype/ftcache.h>. Added comments to be
+ included in a new API Reference section.
+
+ * src/*/*: removed the use of FT_SOURCE_FILE, etc.. now, each component
+ needs to added its own directory to the include path at compile time.
+ Modified all "rules.mk" and "descrip.mms" accordingly..
+
+
2001-03-20 Werner Lemberg <wl@gnu.org>
* builds/unix/configure.in: Add $ft_version.
@@ -69,8 +83,8 @@
* include/freetype/internal/psaux.h: Changed the lenIV member of
the T1_Decoder_ struct to be an FT_Int instead of an FT_UInt.
- * src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Adjust
- for lenIV seed bytes at the start of a decrypted subroutine.
+ * src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Adjust
+ for lenIV seed bytes at the start of a decrypted subroutine.
* src/cid/cidload.c (cid_read_subrs): Decrypt subroutines only
if lenIV >= 0.
diff --git a/builds/ansi/ansi-def.mk b/builds/ansi/ansi-def.mk
index df98d10..9d4685e 100644
--- a/builds/ansi/ansi-def.mk
+++ b/builds/ansi/ansi-def.mk
@@ -34,7 +34,7 @@ PLATFORM := ansi
# make -f $TOP/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(TOP)$(SEP)obj
+ OBJ_DIR := $(TOP)$(SEP)objs
endif
diff --git a/builds/cygwin/cygwin-def.in b/builds/cygwin/cygwin-def.in
index 5fd1d74..a1c2ae5 100644
--- a/builds/cygwin/cygwin-def.in
+++ b/builds/cygwin/cygwin-def.in
@@ -66,7 +66,7 @@ version_info := @version_info@
# make -f $TOP/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
+ OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif
diff --git a/builds/cygwin/cygwinddef.mk b/builds/cygwin/cygwinddef.mk
index e1e92df..b593db5 100644
--- a/builds/cygwin/cygwinddef.mk
+++ b/builds/cygwin/cygwinddef.mk
@@ -33,7 +33,7 @@ PLATFORM := unixdev
# The directory where all object files are placed.
#
ifndef OBJ_DIR
- OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
+ OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif
diff --git a/builds/dos/dos-def.mk b/builds/dos/dos-def.mk
index ec7f766..19c1301 100644
--- a/builds/dos/dos-def.mk
+++ b/builds/dos/dos-def.mk
@@ -34,7 +34,7 @@ endif
# make -f %TOP%/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(TOP)$(SEP)obj
+ OBJ_DIR := $(TOP)$(SEP)objs
endif
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 15861ff..532de0f 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -130,7 +130,7 @@ PROJECT_LIBRARY := $(LIB_)$(LIBRARY).$A
# in the `freetype/builds/<system>' directory, as these
# files will override the default sources.
#
-INCLUDES := $(BUILD) $(TOP)$(SEP)include $(SRC)
+INCLUDES := $(BUILD) $(TOP)$(SEP)include
INCLUDE_FLAGS = $(INCLUDES:%=$I%)
diff --git a/builds/os2/os2-def.mk b/builds/os2/os2-def.mk
index b65b591..e25f90c 100644
--- a/builds/os2/os2-def.mk
+++ b/builds/os2/os2-def.mk
@@ -34,7 +34,7 @@ endif
# make -f %TOP%/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(TOP)$(SEP)obj
+ OBJ_DIR := $(TOP)$(SEP)objs
endif
diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h
index b5478cf..06f7284 100644
--- a/builds/unix/ft2unix.h
+++ b/builds/unix/ft2unix.h
@@ -34,7 +34,7 @@
#define FT2_CONFIG_FILE( x ) <freetype2/freetype/config/ ## x ## >
#define FT2_INTERNAL_FILE( x ) <freetype2/freetype/internal/ ## x ## >
-#include FT2_CONFIG_FILE( ft2build.h )
+#include FT2_CONFIG_FILE( ftheader.h )
#endif /* __FT2_BUILD_UNIX_H__ */
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 1c1ce71..f7781bc 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -66,7 +66,7 @@ version_info := @version_info@
# make -f $TOP/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
+ OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif
diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk
index e1e92df..b593db5 100644
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -33,7 +33,7 @@ PLATFORM := unixdev
# The directory where all object files are placed.
#
ifndef OBJ_DIR
- OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
+ OBJ_DIR := $(shell cd $(TOP)/objs; pwd)
endif
diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk
index 5604cec..54d0a73 100644
--- a/builds/win32/detect.mk
+++ b/builds/win32/detect.mk
@@ -86,6 +86,14 @@ ifeq ($(PLATFORM),win32)
.PHONY: visualc
endif
+ ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
+ CONFIG_FILE := w32-intl.mk
+ SEP := $(BACKSLASH)
+ CC := cl
+ visualc: setup
+ .PHONY: visualc
+ endif
+
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := w32-wat.mk
SEP := $(BACKSLASH)
diff --git a/builds/win32/win32-def.mk b/builds/win32/win32-def.mk
index eabd59f..590237c 100644
--- a/builds/win32/win32-def.mk
+++ b/builds/win32/win32-def.mk
@@ -36,7 +36,7 @@ endif
# make -f %TOP%/Makefile
#
ifndef OBJ_DIR
- OBJ_DIR := $(TOP)$(SEP)obj
+ OBJ_DIR := $(TOP)$(SEP)objs
endif
diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h
index f8c16ab..51157d0 100644
--- a/include/freetype/config/ftheader.h
+++ b/include/freetype/config/ftheader.h
@@ -15,134 +15,8 @@
/* */
/***************************************************************************/
-
- /*************************************************************************/
- /* */
- /* 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 configuration. */
- /* For example, on Unix, the "freetype2" include root could be used, */
- /* with a specific "ft2build.h" to take care of this. The latter then */
- /* looks like the following: */
- /* */
- /* #ifndef __FT2_BUILD_UNIX_H__ */
- /* #define __FT2_BUILD_UNIX_H__ */
- /* */
- /* #define FT2_ROOT freetype2 */
- /* #include <freetype2/config/ft2build.h> */
- /* */
- /* #include FT2_CONFIG_FILE( ft2build.h ) */
- /* */
- /* #endif */
- /* */
- /* If necessary, the macro FT_SOURCE_FILE() can be redefined also if a */
- /* different path separator is needed. */
- /* */
- /*************************************************************************/
-
-
-#ifndef __FT2_BUILD_H__
-#define __FT2_BUILD_H__
-
-
- /* this macro is used to enclose its argument in brackets */
-#define FT2_ENCLOSE(x) <x>
-
- /* this macro is used to join a path and a file name */
-#define FT2_JOINPATH(d,x) d/x
-
- /* this macro is used to format a path in "<d/x>" format easily */
-#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
-
-
-
- /*************************************************************************/
- /* */
- /* 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_JOINPATH(FT2_ROOT,config)
-#endif
-
-
-#define FT2_INTERNAL_ROOT FT2_JOINPATH(FT2_ROOT,internal)
-
- /*************************************************************************/
- /* */
- /* 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_PUBLIC_PATH(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_PUBLIC_PATH(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_ENCLOSE(FT2_ROOT/internal/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. */
- /* */
-#ifndef FT_SOURCE_FILE
-
-#ifdef FT_FLAT_COMPILATION
-#define FT_SOURCE_FILE( d, x ) #x
-#else
-#define FT_SOURCE_FILE( d, x ) FT2_PUBLIC_PATH(d,x)
-#endif
-
-#endif /* !FT_SOURCE_FILE */
-
+#ifndef __FT_HEADER_H__
+#define __FT_HEADER_H__
/*************************************************************************/
/* */
@@ -431,7 +305,36 @@
* a macro used in #include statements to name the file containing
* the API of the optional FreeType 2 cache sub-system.
*/
-#define FT_CACHE_H <freetype/ftcache.h>
+#define FT_CACHE_H <freetype/ftcache.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_CACHE_IMAGE_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the "glyph image" API of the FreeType 2 cache sub-system
+ *
+ * it is used to define a cache for @FT_Glyph elements. You can also
+ * see the API defined in @FT_CACHE_SMALL_BITMAPS_H if you only need
+ * to store small glyph bitmaps, as it will use less memory
+ */
+#define FT_CACHE_IMAGE_H <freetype/cache/ftcimage.h>
+
+/*************************************************************************
+ *
+ * @macro: FT_CACHE_SMALL_BITMAPS_H
+ *
+ * @description:
+ * a macro used in #include statements to name the file containing
+ * the "small bitmaps" API of the FreeType 2 cache sub-system
+ *
+ * it is used to define a cache for small glyph bitmaps in a relatively
+ * memory-efficient way. You can also use the API defined in
+ * @FT_CACHE_IMAGE_H if you want to cache arbitrary glyph images, including
+ * scalable outlines.
+ */
+#define FT_CACHE_SMALL_BITMAPS_H <freetype/cache/ftcsbits.h>
/*************************************************************************
*
@@ -466,15 +369,20 @@
* the optional FreeType 2 API used to access embedded "name" strings
* in SFNT-based font formats (i.e. TrueType and OpenType)
*/
-#define FT_NAMES_H <freetype/ftnames.h>
+#define FT_NAMES_H <freetype/ftnames.h>
/* */
-#define FT_SYNTHESIS_H <freetype/ftsynth.h>
+#define FT_SYNTHESIS_H <freetype/ftsynth.h>
+
+#define FT_CACHE_MANAGER_H <freetype/cache/ftcmanag.h>
+#define FT_CACHE_INTERNAL_LRU_H <freetype/cache/ftlru.h>
+#define FT_CACHE_INTERNAL_GLYPH_H <freetype/cache/ftcglyph.h>
+#define FT_CACHE_INTERNAL_CHUNK_H <freetype/cache/ftcchunk.h>
/* now include internal headers definitions from <freetype/internal/...> */
-#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
+#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
#include FT_INTERNAL_INTERNAL_H
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 76d8875..5c3973c 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -311,7 +311,7 @@ FT_BEGIN_HEADER
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 0e72a1a..9bd80bf 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2339,10 +2339,6 @@ FT_BEGIN_HEADER
/* <Return> */
/* The result of `(a + 0x8000) & -0x10000'. */
/* */
- /* <Note> */
- /* This function assumes that the target platform supports 32-bit */
- /* signed integers. */
- /* */
FT_EXPORT( FT_Fixed ) FT_RoundFix( FT_Fixed a );
@@ -2361,10 +2357,6 @@ FT_BEGIN_HEADER
/* <Return> */
/* The result of `(a + 0x10000 - 1) & -0x10000'. */
/* */
- /* <Note> */
- /* This function assumes that the target platform supports 32-bit */
- /* signed integers. */
- /* */
FT_EXPORT( FT_Fixed ) FT_CeilFix( FT_Fixed a );
@@ -2383,10 +2375,6 @@ FT_BEGIN_HEADER
/* <Return> */
/* The result of `a & -0x10000'. */
/* */
- /* <Note> */
- /* This function assumes that the target platform supports 32-bit */
- /* signed integers. */
- /* */
FT_EXPORT( FT_Fixed ) FT_FloorFix( FT_Fixed a );
diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h
index cedf6d9..64d0c44 100644
--- a/include/freetype/ftcache.h
+++ b/include/freetype/ftcache.h
@@ -42,15 +42,6 @@
FT_BEGIN_HEADER
-#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 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)
-
-
/*************************************************************************/
/* */
/* <Section> */
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 607ba43..9f80951 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -55,6 +55,8 @@ FT_BEGIN_HEADER
/* FT_Long */
/* FT_ULong */
/* FT_Bool */
+ /* FT_Offset */
+ /* FT_PtrDist */
/* FT_Error */
/* FT_Fixed */
/* FT_Pointer */
@@ -270,6 +272,32 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
+ /* <Type> */
+ /* FT_Offset */
+ /* */
+ /* <Description> */
+ /* This is equivalent to the ANSI C "size_t" type, i.e. it's the */
+ /* largest _unsigned_ integer type used to express a file size or */
+ /* position, or a memory block size. */
+ /* */
+ typedef size_t FT_Offset;
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_PtrDist */
+ /* */
+ /* <Description> */
+ /* This is equivalent to the ANSI C "ptrdiff_t" type, i.e. the */
+ /* largest _signed_ integer type used to express the distance */
+ /* between two pointers. */
+ /* */
+ typedef size_t FT_PtrDist;
+
+
+ /*************************************************************************/
+ /* */
/* <Struct> */
/* FT_UnitVector */
/* */
diff --git a/src/autohint/ahangles.c b/src/autohint/ahangles.c
index 812b021..3f1b43c 100644
--- a/src/autohint/ahangles.c
+++ b/src/autohint/ahangles.c
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahangles.h)
+#include "ahangles.h"
/* the following table has been automatically generated with */
diff --git a/src/autohint/ahangles.h b/src/autohint/ahangles.h
index 30f9886..f66ad17 100644
--- a/src/autohint/ahangles.h
+++ b/src/autohint/ahangles.h
@@ -26,7 +26,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
-#include FT_SOURCE_FILE(autohint,ahtypes.h)
+#include "ahtypes.h"
FT_BEGIN_HEADER
diff --git a/src/autohint/ahglobal.c b/src/autohint/ahglobal.c
index 58c8122..68f68c4 100644
--- a/src/autohint/ahglobal.c
+++ b/src/autohint/ahglobal.c
@@ -20,8 +20,8 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahglobal.h)
-#include FT_SOURCE_FILE(autohint,ahglyph.h)
+#include "ahglobal.h"
+#include "ahglyph.h"
#define MAX_TEST_CHARACTERS 12
diff --git a/src/autohint/ahglobal.h b/src/autohint/ahglobal.h
index f63462d..e2cce0e 100644
--- a/src/autohint/ahglobal.h
+++ b/src/autohint/ahglobal.h
@@ -25,7 +25,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahtypes.h)
+#include "ahtypes.h"
#include FT_INTERNAL_OBJECTS_H
diff --git a/src/autohint/ahglyph.c b/src/autohint/ahglyph.c
index 1752dc7..23c26ed 100644
--- a/src/autohint/ahglyph.c
+++ b/src/autohint/ahglyph.c
@@ -21,9 +21,9 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahglyph.h)
-#include FT_SOURCE_FILE(autohint,ahangles.h)
-#include FT_SOURCE_FILE(autohint,ahglobal.h)
+#include "ahglyph.h"
+#include "ahangles.h"
+#include "ahglobal.h"
#include <stdio.h>
diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h
index 4a19104..d910651 100644
--- a/src/autohint/ahglyph.h
+++ b/src/autohint/ahglyph.h
@@ -25,7 +25,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahtypes.h)
+#include "ahtypes.h"
FT_BEGIN_HEADER
diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c
index 64ace00..754687c 100644
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -20,9 +20,9 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahhint.h)
-#include FT_SOURCE_FILE(autohint,ahglyph.h)
-#include FT_SOURCE_FILE(autohint,ahangles.h)
+#include "ahhint.h"
+#include "ahglyph.h"
+#include "ahangles.h"
#include FT_OUTLINE_H
diff --git a/src/autohint/ahhint.h b/src/autohint/ahhint.h
index 777155b..fbd7230 100644
--- a/src/autohint/ahhint.h
+++ b/src/autohint/ahhint.h
@@ -24,7 +24,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahglobal.h)
+#include "ahglobal.h"
FT_BEGIN_HEADER
diff --git a/src/autohint/ahmodule.c b/src/autohint/ahmodule.c
index f1a2564..3449752 100644
--- a/src/autohint/ahmodule.c
+++ b/src/autohint/ahmodule.c
@@ -21,7 +21,7 @@
#include <ft2build.h>
#include FT_MODULE_H
-#include FT_SOURCE_FILE(autohint,ahhint.h)
+#include "ahhint.h"
typedef struct FT_AutoHinterRec_
diff --git a/src/autohint/ahoptim.c b/src/autohint/ahoptim.c
index 910d635..848526c 100644
--- a/src/autohint/ahoptim.c
+++ b/src/autohint/ahoptim.c
@@ -33,7 +33,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H /* for ALLOC_ARRAY() and FREE() */
-#include FT_SOURCE_FILE(autohint,ahoptim.h)
+#include "ahoptim.h"
/* define this macro to use brute force optimisation -- this is slow, */
diff --git a/src/autohint/ahoptim.h b/src/autohint/ahoptim.h
index b45366c..29b9c38 100644
--- a/src/autohint/ahoptim.h
+++ b/src/autohint/ahoptim.h
@@ -24,7 +24,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahtypes.h)
+#include "ahtypes.h"
FT_BEGIN_HEADER
diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h
index 5d94330..11b7519 100644
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -26,7 +26,7 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
-#include FT_SOURCE_FILE(autohint,ahloader.h)
+#include "ahloader.h"
#define xxAH_DEBUG
diff --git a/src/autohint/autohint.c b/src/autohint/autohint.c
index a06eac5..45ac2c2 100644
--- a/src/autohint/autohint.c
+++ b/src/autohint/autohint.c
@@ -22,11 +22,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(autohint,ahangles.c)
-#include FT_SOURCE_FILE(autohint,ahglyph.c)
-#include FT_SOURCE_FILE(autohint,ahglobal.c)
-#include FT_SOURCE_FILE(autohint,ahhint.c)
-#include FT_SOURCE_FILE(autohint,ahmodule.c)
+#include "ahangles.c"
+#include "ahglyph.c"
+#include "ahglobal.c"
+#include "ahhint.c"
+#include "ahmodule.c"
/* END */
diff --git a/src/autohint/descrip.mms b/src/autohint/descrip.mms
index 80b4f7f..cce93a4 100644
--- a/src/autohint/descrip.mms
+++ b/src/autohint/descrip.mms
@@ -15,7 +15,7 @@
# Note that this license is compatible with the FreeType license.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/incl=([--.include],[--.src.autohint])
OBJS=autohint.obj
diff --git a/src/autohint/rules.mk b/src/autohint/rules.mk
index 87f7849..c6f275b 100644
--- a/src/autohint/rules.mk
+++ b/src/autohint/rules.mk
@@ -24,7 +24,7 @@ AUTO_DIR_ := $(AUTO_DIR)$(SEP)
# compilation flags for the driver
#
-AUTO_COMPILE := $(FT_COMPILE)
+AUTO_COMPILE := $(FT_COMPILE) $I$(AUTO_DIR)
# AUTO driver sources (i.e., C files)
diff --git a/src/base/descrip.mms b/src/base/descrip.mms
index 9c4bfb7..f650ced 100644
--- a/src/base/descrip.mms
+++ b/src/base/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include])
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
OBJS=ftbase.obj,ftinit.obj,ftglyph.obj
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index 3918700..1d61b5a 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -17,13 +17,18 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(base,ftcalc.c)
-#include FT_SOURCE_FILE(base,ftobjs.c)
-#include FT_SOURCE_FILE(base,ftstream.c)
-#include FT_SOURCE_FILE(base,ftlist.c)
-#include FT_SOURCE_FILE(base,ftoutln.c)
-#include FT_SOURCE_FILE(base,ftextend.c)
-#include FT_SOURCE_FILE(base,ftnames.c)
+#define FT_MAKE_OPTION_SINGLE_OBJECT
+
+#include "ftcalc.c"
+#include "ftobjs.c"
+#include "ftstream.c"
+#include "ftlist.c"
+#include "ftoutln.c"
+#include "ftnames.c"
+
+#if 0
+#include "ftextend.c"
+#endif
/* END */
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 8f7e7a0..fff02f4 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -60,8 +60,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_INTERNAL_STREAM_H
-#include FT_SOURCE_FILE( truetype, ttobjs.h )
-#include FT_SOURCE_FILE( type1, t1objs.h )
+#include "truetype/ttobjs.h"
+#include "type1/t1objs.h"
#include <Resources.h>
#include <Fonts.h>
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index a0c6713..03fe64e 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2079,10 +2079,10 @@
}
- FT_LOCAL_DEF
- FT_Error FT_Render_Glyph_Internal( FT_Library library,
- FT_GlyphSlot slot,
- FT_UInt render_mode )
+ FT_EXPORT_DEF(FT_Error)
+ FT_Render_Glyph_Internal( FT_Library library,
+ FT_GlyphSlot slot,
+ FT_UInt render_mode )
{
FT_Error error = FT_Err_Ok;
FT_Renderer renderer;
diff --git a/src/cache/descrip.mms b/src/cache/descrip.mms
index 0c59295..b87c1c6 100644
--- a/src/cache/descrip.mms
+++ b/src/cache/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cache])
OBJS=ftcache.obj
diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c
index b9ebbb7..324d1b6 100644
--- a/src/cache/ftcache.c
+++ b/src/cache/ftcache.c
@@ -19,12 +19,12 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(cache,ftlru.c)
-#include FT_SOURCE_FILE(cache,ftcmanag.c)
-#include FT_SOURCE_FILE(cache,ftcglyph.c)
-#include FT_SOURCE_FILE(cache,ftcchunk.c)
-#include FT_SOURCE_FILE(cache,ftcimage.c)
-#include FT_SOURCE_FILE(cache,ftcsbits.c)
+#include "ftlru.c"
+#include "ftcmanag.c"
+#include "ftcglyph.c"
+#include "ftcchunk.c"
+#include "ftcimage.c"
+#include "ftcsbits.c"
/* END */
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 086b099..a83416a 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -23,7 +23,7 @@ CACHE_H_DIR_ := $(CACHE_H_DIR)$(SEP)
# compilation flags for the driver
#
-Cache_COMPILE := $(FT_COMPILE)
+Cache_COMPILE := $(FT_COMPILE) $I$(CACHE_DIR)
# Cache driver sources (i.e., C files)
diff --git a/src/cff/cff.c b/src/cff/cff.c
index 2c6c1df..6ac61f7 100644
--- a/src/cff/cff.c
+++ b/src/cff/cff.c
@@ -19,11 +19,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(cff,cffdrivr.c)
-#include FT_SOURCE_FILE(cff,cffparse.c)
-#include FT_SOURCE_FILE(cff,cffload.c)
-#include FT_SOURCE_FILE(cff,cffobjs.c)
-#include FT_SOURCE_FILE(cff,cffgload.c)
+#include "cffdrivr.c"
+#include "cffparse.c"
+#include "cffload.c"
+#include "cffobjs.c"
+#include "cffgload.c"
/* END */
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index e701f3f..f195c3d 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -24,9 +24,9 @@
#include FT_TRUETYPE_NAMES_H
#include FT_INTERNAL_CFF_ERRORS_H
-#include FT_SOURCE_FILE(cff,cffdrivr.h)
-#include FT_SOURCE_FILE(cff,cffgload.h)
-#include FT_SOURCE_FILE(cff,cffload.h)
+#include "cffdrivr.h"
+#include "cffgload.h"
+#include "cffload.h"
/*************************************************************************/
/* */
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 7337bf4..e602034 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -24,8 +24,8 @@
#include FT_OUTLINE_H
#include FT_TRUETYPE_TAGS_H
-#include FT_SOURCE_FILE(cff,cffload.h)
-#include FT_SOURCE_FILE(cff,cffgload.h)
+#include "cffload.h"
+#include "cffgload.h"
#include FT_INTERNAL_CFF_ERRORS_H
@@ -74,7 +74,7 @@
cff_op_hintmask,
cff_op_cntrmask,
- cff_op_dotsection,
+ cff_op_dotsection, /* deprecated, acts as no-op */
cff_op_abs,
cff_op_add,
@@ -1092,11 +1092,6 @@
args = stack;
break;
- case cff_op_dotsection:
-
- FT_TRACE4(( " dotsection" ));
- break;
-
case cff_op_rmoveto:
FT_TRACE4(( " rmoveto" ));
@@ -1843,6 +1838,13 @@
goto Unimplemented;
+ case cff_op_dotsection:
+ {
+ /* this operator is deprecated and ignored by the parser */
+ FT_TRACE4(( " dotsection" ));
+ }
+ break;
+
case cff_op_and:
{
FT_Fixed cond = args[0] && args[1];
diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h
index fb07274..988ff4d 100644
--- a/src/cff/cffgload.h
+++ b/src/cff/cffgload.h
@@ -22,7 +22,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include FT_SOURCE_FILE(cff,cffobjs.h)
+#include "cffobjs.h"
FT_BEGIN_HEADER
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 0fa8210..2dd0728 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -8,7 +8,7 @@
/* 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 */
+/* modified, and xdistributed 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. */
@@ -24,8 +24,8 @@
#include FT_INTERNAL_CFF_ERRORS_H
#include FT_TRUETYPE_TAGS_H
-#include FT_SOURCE_FILE(cff,cffload.h)
-#include FT_SOURCE_FILE(cff,cffparse.h)
+#include "cffload.h"
+#include "cffparse.h"
/*************************************************************************/
@@ -1790,7 +1790,7 @@
for ( k = i; k < nleft + i; k++, glyph_code++ )
{
/* Make sure k is not too big. */
- if ( k > num_glyphs )
+ if ( (FT_UInt)k > num_glyphs )
goto Exit;
/* Assign code to GID mapping. */
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 5ceb78c..882d5e0 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -25,8 +25,8 @@
#include FT_TRUETYPE_TAGS_H
#include FT_INTERNAL_SFNT_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
-#include FT_SOURCE_FILE(cff,cffobjs.h)
-#include FT_SOURCE_FILE(cff,cffload.h)
+#include "cffobjs.h"
+#include "cffload.h"
#include FT_INTERNAL_CFF_ERRORS_H
#include <string.h> /* for strlen() */
@@ -388,8 +388,8 @@
/* set global bbox, as well as EM size */
root->bbox = dict->font_bbox;
- root->ascender = root->bbox.yMax >> 16;
- root->descender = root->bbox.yMin >> 16;
+ root->ascender = (FT_Short)(root->bbox.yMax >> 16);
+ root->descender = (FT_Short)(root->bbox.yMin >> 16);
root->height = ( ( root->ascender - root->descender ) * 12 ) / 10;
if ( dict->units_per_em )
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index ec20f3e..da53be5 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -17,7 +17,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(cff,cffparse.h)
+#include "cffparse.h"
#include FT_INTERNAL_CFF_ERRORS_H
#include FT_INTERNAL_STREAM_H
@@ -477,7 +477,7 @@
static const CFF_Field_Handler cff_field_handlers[] =
{
-#include FT_SOURCE_FILE(cff,cfftoken.h)
+#include "cfftoken.h"
{ 0, 0, 0, 0, 0, 0, 0 }
};
diff --git a/src/cff/descrip.mms b/src/cff/descrip.mms
index d51f7ee..b4a99d1 100644
--- a/src/cff/descrip.mms
+++ b/src/cff/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cff])
OBJS=cff.obj
diff --git a/src/cff/rules.mk b/src/cff/rules.mk
index 5a0a67e..f87634f 100644
--- a/src/cff/rules.mk
+++ b/src/cff/rules.mk
@@ -19,7 +19,7 @@ CFF_DIR := $(SRC_)cff
CFF_DIR_ := $(CFF_DIR)$(SEP)
-CFF_COMPILE := $(FT_COMPILE)
+CFF_COMPILE := $(FT_COMPILE) $I$(CFF_DIR)
# CFF driver sources (i.e., C files)
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 7ca0c44..2732784 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -17,8 +17,8 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(cid,cidload.h)
-#include FT_SOURCE_FILE(cid,cidgload.h)
+#include "cidload.h"
+#include "cidgload.h"
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_OUTLINE_H
diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h
index a894d97..44aed0f 100644
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(cid,cidobjs.h)
+#include "cidobjs.h"
FT_BEGIN_HEADER
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index 03343e2..06bdffe 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -22,7 +22,7 @@
#include FT_MULTIPLE_MASTERS_H
#include FT_INTERNAL_TYPE1_TYPES_H
#include FT_INTERNAL_TYPE1_ERRORS_H
-#include FT_SOURCE_FILE(cid,cidload.h)
+#include "cidload.h"
#include <stdio.h>
#include <ctype.h> /* for isspace(), isalnum() */
@@ -271,16 +271,8 @@
const T1_Field cid_field_records[] =
{
-#ifdef FT_FLAT_COMPILE
-
#include "cidtokens.h"
-#else
-
-#include <cid/cidtokens.h>
-
-#endif
-
T1_FIELD_CALLBACK( "FontBBox", parse_font_bbox )
T1_FIELD_CALLBACK( "FDArray", parse_fd_array )
T1_FIELD_CALLBACK( "FontMatrix", parse_font_matrix )
diff --git a/src/cid/cidload.h b/src/cid/cidload.h
index d520904..cbd2235 100644
--- a/src/cid/cidload.h
+++ b/src/cid/cidload.h
@@ -22,7 +22,7 @@
#include <ft2build.h>
#include FT_INTERNAL_STREAM_H
-#include FT_SOURCE_FILE(cid,cidparse.h)
+#include "cidparse.h"
FT_BEGIN_HEADER
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 1d87527..4fe8c29 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
-#include FT_SOURCE_FILE(cid,cidgload.h)
-#include FT_SOURCE_FILE(cid,cidload.h)
+#include "cidgload.h"
+#include "cidload.h"
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index c8cff5e..6f0b2ca 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -22,7 +22,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TYPE1_ERRORS_H
-#include FT_SOURCE_FILE(cid,cidparse.h)
+#include "cidparse.h"
#include <string.h> /* for strncmp() */
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index d916dab..c86f0a2 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -17,8 +17,8 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(cid,cidriver.h)
-#include FT_SOURCE_FILE(cid,cidgload.h)
+#include "cidriver.h"
+#include "cidgload.h"
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
diff --git a/src/cid/descrip.mms b/src/cid/descrip.mms
index 1e261a7..1502e42 100644
--- a/src/cid/descrip.mms
+++ b/src/cid/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cid])
OBJS=type1cid.obj
diff --git a/src/cid/rules.mk b/src/cid/rules.mk
index cbaaec7..d7ab026 100644
--- a/src/cid/rules.mk
+++ b/src/cid/rules.mk
@@ -19,7 +19,7 @@ CID_DIR := $(SRC_)cid
CID_DIR_ := $(CID_DIR)$(SEP)
-CID_COMPILE := $(FT_COMPILE)
+CID_COMPILE := $(FT_COMPILE) $I$(CID_DIR)
# CID driver sources (i.e., C files)
diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c
index f27a499..852eca1 100644
--- a/src/cid/type1cid.c
+++ b/src/cid/type1cid.c
@@ -19,11 +19,11 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(cid,cidparse.c)
-#include FT_SOURCE_FILE(cid,cidload.c)
-#include FT_SOURCE_FILE(cid,cidobjs.c)
-#include FT_SOURCE_FILE(cid,cidriver.c)
-#include FT_SOURCE_FILE(cid,cidgload.c)
+#include "cidparse.c"
+#include "cidload.c"
+#include "cidobjs.c"
+#include "cidriver.c"
+#include "cidgload.c"
/* END */
diff --git a/src/pcf/descrip.mms b/src/pcf/descrip.mms
index d576ddc..c9dd638 100644
--- a/src/pcf/descrip.mms
+++ b/src/pcf/descrip.mms
@@ -25,7 +25,7 @@
# THE SOFTWARE.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pcf])
OBJS=pcf.obj
diff --git a/src/pcf/pcf.c b/src/pcf/pcf.c
index e606b7c..ccd1ead 100644
--- a/src/pcf/pcf.c
+++ b/src/pcf/pcf.c
@@ -29,8 +29,8 @@ THE SOFTWARE.
#include <ft2build.h>
-#include FT_SOURCE_FILE(pcf,pcfutil.c)
-#include FT_SOURCE_FILE(pcf,pcfread.c)
-#include FT_SOURCE_FILE(pcf,pcfdriver.c)
+#include "pcfutil.c"
+#include "pcfread.c"
+#include "pcfdriver.c"
/* END */
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
index de45fec..af1d8fe 100644
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -226,7 +226,7 @@ FT_BEGIN_HEADER
#define GLYPHPADOPTIONS 4 /* I'm not sure about this */
- static
+ FT_LOCAL
FT_Error pcf_load_font( FT_Stream,
PCF_Face );
diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c
index 248b89d..59e7dc3 100644
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -32,9 +32,9 @@ THE SOFTWARE.
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H
-#include FT_SOURCE_FILE(pcf,pcf.h)
-#include FT_SOURCE_FILE(pcf,pcfdriver.h)
-#include FT_SOURCE_FILE(pcf,pcfutil.h)
+#include "pcf.h"
+#include "pcfdriver.h"
+#include "pcfutil.h"
/*************************************************************************/
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index cf2c28a..0b7d358 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -32,8 +32,8 @@ THE SOFTWARE.
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H
-#include FT_SOURCE_FILE(pcf,pcf.h)
-#include FT_SOURCE_FILE(pcf,pcfdriver.h)
+#include "pcf.h"
+#include "pcfdriver.h"
#include <string.h> /* strlen(), strcpy() */
@@ -856,6 +856,7 @@ THE SOFTWARE.
}
+ FT_LOCAL_DEF
FT_Error pcf_load_font( FT_Stream stream,
PCF_Face face )
{
diff --git a/src/pcf/pcfutil.c b/src/pcf/pcfutil.c
index e0253ca..ca0c7c1 100644
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
#include <ft2build.h>
-#include FT_SOURCE_FILE(pcf,pcfutil.h)
+#include "pcfutil.h"
/* Utility functions for reformatting font bitmaps */
diff --git a/src/pcf/rules.mk b/src/pcf/rules.mk
index d2fd9cc..67a0dce 100644
--- a/src/pcf/rules.mk
+++ b/src/pcf/rules.mk
@@ -31,7 +31,7 @@ PCF_DIR := $(SRC_)pcf
PCF_DIR_ := $(PCF_DIR)$(SEP)
-PCF_COMPILE := $(FT_COMPILE)
+PCF_COMPILE := $(FT_COMPILE) $I$(PCF_DIR)
# pcf driver sources (i.e., C files)
diff --git a/src/psaux/descrip.mms b/src/psaux/descrip.mms
index 8f0e490..d3ed754 100644
--- a/src/psaux/descrip.mms
+++ b/src/psaux/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psaux])
OBJS=psaux.obj
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index c0119a8..9275e02 100644
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -19,9 +19,9 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(psaux,psobjs.c)
-#include FT_SOURCE_FILE(psaux,psauxmod.c)
-#include FT_SOURCE_FILE(psaux,t1decode.c)
+#include "psobjs.c"
+#include "psauxmod.c"
+#include "t1decode.c"
/* END */
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index d8f436c..f752372 100644
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -17,9 +17,9 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(psaux,psauxmod.h)
-#include FT_SOURCE_FILE(psaux,psobjs.h)
-#include FT_SOURCE_FILE(psaux,t1decode.h)
+#include "psauxmod.h"
+#include "psobjs.h"
+#include "t1decode.h"
FT_CALLBACK_TABLE_DEF
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 7546261..abca45a 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -20,7 +20,7 @@
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_INTERNAL_DEBUG_H
#include FT_ERRORS_H
-#include FT_SOURCE_FILE(psaux,psobjs.h)
+#include "psobjs.h"
/*************************************************************************/
diff --git a/src/psaux/rules.mk b/src/psaux/rules.mk
index ae182e2..dd5c8a6 100644
--- a/src/psaux/rules.mk
+++ b/src/psaux/rules.mk
@@ -21,7 +21,7 @@ PSAUX_DIR_ := $(PSAUX_DIR)$(SEP)
# compilation flags for the driver
#
-PSAUX_COMPILE := $(FT_COMPILE)
+PSAUX_COMPILE := $(FT_COMPILE) $I$(PSAUX_DIR)
# PSAUX driver sources (i.e., C files)
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 54e9cad..a19807e 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -20,8 +20,8 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_OUTLINE_H
-#include FT_SOURCE_FILE(psaux,t1decode.h)
-#include FT_SOURCE_FILE(psaux,psobjs.h)
+#include "t1decode.h"
+#include "psobjs.h"
/*************************************************************************/
diff --git a/src/psnames/descrip.mms b/src/psnames/descrip.mms
index a21e704..bb86c54 100644
--- a/src/psnames/descrip.mms
+++ b/src/psnames/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames])
OBJS=psnames.obj
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 2160c5d..389e1a0 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_OBJECTS_H
-#include FT_SOURCE_FILE(psnames,psmodule.h)
-#include FT_SOURCE_FILE(psnames,pstables.h)
+#include "psmodule.h"
+#include "pstables.h"
#include <stdlib.h> /* for qsort() */
#include <string.h> /* for strcmp(), strncpy() */
diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c
index 07b5e15..6e482ff 100644
--- a/src/psnames/psnames.c
+++ b/src/psnames/psnames.c
@@ -19,7 +19,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(psnames,psmodule.c)
+#include "psmodule.c"
/* END */
diff --git a/src/psnames/rules.mk b/src/psnames/rules.mk
index 25552b2..7612e82 100644
--- a/src/psnames/rules.mk
+++ b/src/psnames/rules.mk
@@ -21,7 +21,7 @@ PSNAMES_DIR_ := $(PSNAMES_DIR)$(SEP)
# compilation flags for the driver
#
-PSNAMES_COMPILE := $(FT_COMPILE)
+PSNAMES_COMPILE := $(FT_COMPILE) $I$(PSNAMES_DIR)
# PSNames driver sources (i.e., C files)
diff --git a/src/raster/descrip.mms b/src/raster/descrip.mms
index 03c48b7..ea42a4b 100644
--- a/src/raster/descrip.mms
+++ b/src/raster/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.raster])
OBJS=raster.obj
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index 993fd11..ef35b80 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -23,7 +23,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(raster,ftraster.h)
+#include "ftraster.h"
#include FT_INTERNAL_CALC_H /* for FT_MulDiv only */
diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c
index 81931f0..19c741c 100644
--- a/src/raster/ftrend1.c
+++ b/src/raster/ftrend1.c
@@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_OUTLINE_H
-#include FT_SOURCE_FILE(raster,ftrend1.h)
-#include FT_SOURCE_FILE(raster,ftraster.h)
+#include "ftrend1.h"
+#include "ftraster.h"
/* initialize renderer -- init its raster */
diff --git a/src/raster/raster.c b/src/raster/raster.c
index 96894a5..9dc2a86 100644
--- a/src/raster/raster.c
+++ b/src/raster/raster.c
@@ -19,8 +19,8 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(raster,ftraster.c)
-#include FT_SOURCE_FILE(raster,ftrend1.c)
+#include "ftraster.c"
+#include "ftrend1.c"
/* END */
diff --git a/src/raster/rules.mk b/src/raster/rules.mk
index 32dbf69..2dba013 100644
--- a/src/raster/rules.mk
+++ b/src/raster/rules.mk
@@ -20,7 +20,7 @@ RAS1_DIR_ := $(RAS1_DIR)$(SEP)
# compilation flags for the driver
#
-RAS1_COMPILE := $(FT_COMPILE)
+RAS1_COMPILE := $(FT_COMPILE) $I$(RAS1_DIR)
# raster1 driver sources (i.e., C files)
diff --git a/src/sfnt/descrip.mms b/src/sfnt/descrip.mms
index b32c291..8eeb2a6 100644
--- a/src/sfnt/descrip.mms
+++ b/src/sfnt/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt])
OBJS=sfnt.obj
diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index 2255e6a..4502b5c 100644
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -21,7 +21,7 @@ SFNT_DIR_ := $(SFNT_DIR)$(SEP)
# compilation flags for the driver
#
-SFNT_COMPILE := $(FT_COMPILE)
+SFNT_COMPILE := $(FT_COMPILE) $I$(SFNT_DIR)
# SFNT driver sources (i.e., C files)
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index de30fbb..1541145 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -20,17 +20,17 @@
#include FT_INTERNAL_SFNT_H
#include FT_INTERNAL_OBJECTS_H
-#include FT_SOURCE_FILE(sfnt,sfdriver.h)
-#include FT_SOURCE_FILE(sfnt,ttload.h)
-#include FT_SOURCE_FILE(sfnt,ttcmap.h)
-#include FT_SOURCE_FILE(sfnt,sfobjs.h)
+#include "sfdriver.h"
+#include "ttload.h"
+#include "ttcmap.h"
+#include "sfobjs.h"
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-#include FT_SOURCE_FILE(sfnt,ttsbit.h)
+#include "ttsbit.h"
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-#include FT_SOURCE_FILE(sfnt,ttpost.h)
+#include "ttpost.h"
#endif
#include <string.h> /* for strcmp() */
diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c
index 91fce49..bab7b57 100644
--- a/src/sfnt/sfnt.c
+++ b/src/sfnt/sfnt.c
@@ -19,17 +19,17 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(sfnt,ttload.c)
-#include FT_SOURCE_FILE(sfnt,ttcmap.c)
-#include FT_SOURCE_FILE(sfnt,sfobjs.c)
-#include FT_SOURCE_FILE(sfnt,sfdriver.c)
+#include "ttload.c"
+#include "ttcmap.c"
+#include "sfobjs.c"
+#include "sfdriver.c"
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-#include FT_SOURCE_FILE(sfnt,ttsbit.c)
+#include "ttsbit.c"
#endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-#include FT_SOURCE_FILE(sfnt,ttpost.c)
+#include "ttpost.c"
#endif
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index e4284a4..894ed52 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -17,8 +17,8 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(sfnt,sfobjs.h)
-#include FT_SOURCE_FILE(sfnt,ttload.h)
+#include "sfobjs.h"
+#include "ttload.h"
#include FT_INTERNAL_SFNT_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_TRUETYPE_NAMES_H
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 2f2a53a..c9eb946 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_TRUETYPE_ERRORS_H
-#include FT_SOURCE_FILE(sfnt,ttload.h)
-#include FT_SOURCE_FILE(sfnt,ttcmap.h)
+#include "ttload.h"
+#include "ttcmap.h"
/*************************************************************************/
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 572d65b..254fc8e 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -22,8 +22,8 @@
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
-#include FT_SOURCE_FILE(sfnt,ttload.h)
-#include FT_SOURCE_FILE(sfnt,ttcmap.h)
+#include "ttload.h"
+#include "ttcmap.h"
/*************************************************************************/
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 5fcf066..3f85170 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -29,8 +29,8 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_TRUETYPE_TAGS_H
-#include FT_SOURCE_FILE(sfnt,ttpost.h)
-#include FT_SOURCE_FILE(sfnt,ttload.h)
+#include "ttpost.h"
+#include "ttload.h"
/*************************************************************************/
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 2b637fc..ff5fd93 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -21,7 +21,7 @@
#include FT_INTERNAL_TRUETYPE_ERRORS_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
-#include FT_SOURCE_FILE(sfnt,ttsbit.h)
+#include "ttsbit.h"
/*************************************************************************/
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index bda3829..679a1c5 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(sfnt,ttload.h)
+#include "ttload.h"
FT_BEGIN_HEADER
diff --git a/src/smooth/descrip.mms b/src/smooth/descrip.mms
index 1e534e3..67d62ec 100644
--- a/src/smooth/descrip.mms
+++ b/src/smooth/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.smooth])
OBJS=smooth.obj
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 83eb17e..6ac2608 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -123,7 +123,7 @@
#else /* _STANDALONE_ */
#include <ft2build.h>
-#include FT_SOURCE_FILE(smooth,ftgrays.h)
+#include "ftgrays.h"
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DEBUG_H
#include FT_OUTLINE_H
diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
index 9e56821..cc2985d 100644
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -19,8 +19,8 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_OUTLINE_H
-#include FT_SOURCE_FILE(smooth,ftsmooth.h)
-#include FT_SOURCE_FILE(smooth,ftgrays.h)
+#include "ftsmooth.h"
+#include "ftgrays.h"
/* initialize renderer -- init its raster */
diff --git a/src/smooth/rules.mk b/src/smooth/rules.mk
index 62febfa..cf751f5 100644
--- a/src/smooth/rules.mk
+++ b/src/smooth/rules.mk
@@ -20,7 +20,7 @@ SMOOTH_DIR_ := $(SMOOTH_DIR)$(SEP)
# compilation flags for the driver
#
-SMOOTH_COMPILE := $(FT_COMPILE)
+SMOOTH_COMPILE := $(FT_COMPILE) $I$(SMOOTH_DIR)
# smooth driver sources (i.e., C files)
diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c
index aeeb254..40639cb 100644
--- a/src/smooth/smooth.c
+++ b/src/smooth/smooth.c
@@ -19,8 +19,8 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(smooth,ftgrays.c)
-#include FT_SOURCE_FILE(smooth,ftsmooth.c)
+#include "ftgrays.c"
+#include "ftsmooth.c"
/* END */
diff --git a/src/truetype/descrip.mms b/src/truetype/descrip.mms
index d0dda96..92ea89a 100644
--- a/src/truetype/descrip.mms
+++ b/src/truetype/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.truetype])
OBJS=truetype.obj
diff --git a/src/truetype/rules.mk b/src/truetype/rules.mk
index 9289378..a9f6c36 100644
--- a/src/truetype/rules.mk
+++ b/src/truetype/rules.mk
@@ -21,7 +21,7 @@ TT_DIR_ := $(TT_DIR)$(SEP)
# compilation flags for the driver
#
-TT_COMPILE := $(FT_COMPILE)
+TT_COMPILE := $(FT_COMPILE) $I$(TT_DIR)
# TrueType driver sources (i.e., C files)
diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c
index a32c9b0..59833e5 100644
--- a/src/truetype/truetype.c
+++ b/src/truetype/truetype.c
@@ -19,13 +19,13 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(truetype,ttdriver.c) /* driver interface */
-#include FT_SOURCE_FILE(truetype,ttpload.c) /* tables loader */
-#include FT_SOURCE_FILE(truetype,ttgload.c) /* glyph loader */
-#include FT_SOURCE_FILE(truetype,ttobjs.c) /* object manager */
+#include "ttdriver.c" /* driver interface */
+#include "ttpload.c" /* tables loader */
+#include "ttgload.c" /* glyph loader */
+#include "ttobjs.c" /* object manager */
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-#include FT_SOURCE_FILE(truetype,ttinterp.c)
+#include "ttinterp.c"
#endif
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 4478232..9f23e36 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -21,8 +21,8 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_SFNT_H
#include FT_TRUETYPE_NAMES_H
-#include FT_SOURCE_FILE(truetype,ttdriver.h)
-#include FT_SOURCE_FILE(truetype,ttgload.h)
+#include "ttdriver.h"
+#include "ttgload.h"
/*************************************************************************/
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 1464a8a..66aa380 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -24,7 +24,7 @@
#include FT_TRUETYPE_TAGS_H
#include FT_OUTLINE_H
-#include FT_SOURCE_FILE(truetype,ttgload.h)
+#include "ttgload.h"
/*************************************************************************/
diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h
index 3bd41b6..1b45f51 100644
--- a/src/truetype/ttgload.h
+++ b/src/truetype/ttgload.h
@@ -21,10 +21,10 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(truetype,ttobjs.h)
+#include "ttobjs.h"
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-#include FT_SOURCE_FILE(truetype,ttinterp.h)
+#include "ttinterp.h"
#endif
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index d73cf94..320c783 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -20,7 +20,7 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_CALC_H
#include FT_SYSTEM_H
-#include FT_SOURCE_FILE(truetype,ttinterp.h)
+#include "ttinterp.h"
#include FT_INTERNAL_TRUETYPE_ERRORS_H
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index b6f861c..c8a71f9 100644
--- a/src/truetype/ttinterp.h
+++ b/src/truetype/ttinterp.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(truetype,ttobjs.h)
+#include "ttobjs.h"
FT_BEGIN_HEADER
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index d65524d..e2df8d4 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -26,11 +26,11 @@
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_TRUETYPE_ERRORS_H
-#include FT_SOURCE_FILE(truetype,ttgload.h)
-#include FT_SOURCE_FILE(truetype,ttpload.h)
+#include "ttgload.h"
+#include "ttpload.h"
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
-#include FT_SOURCE_FILE(truetype,ttinterp.h)
+#include "ttinterp.h"
#endif
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index a14ad1f..aecd3c2 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -21,7 +21,7 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_STREAM_H
#include FT_TRUETYPE_TAGS_H
-#include FT_SOURCE_FILE(truetype,ttpload.h)
+#include "ttpload.h"
#include FT_INTERNAL_TRUETYPE_ERRORS_H
diff --git a/src/type1/descrip.mms b/src/type1/descrip.mms
index 8d36c15..da50ab1 100644
--- a/src/type1/descrip.mms
+++ b/src/type1/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1])
OBJS=type1.obj
diff --git a/src/type1/rules.mk b/src/type1/rules.mk
index c00b594..aff446f 100644
--- a/src/type1/rules.mk
+++ b/src/type1/rules.mk
@@ -21,7 +21,7 @@ T1_DIR_ := $(T1_DIR)$(SEP)
# compilation flags for the driver
#
-T1_COMPILE := $(FT_COMPILE)
+T1_COMPILE := $(FT_COMPILE) $I$(T1_DIR)
# Type1 driver sources (i.e., C files)
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index 5f0457d..53c6a4b 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -17,7 +17,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(type1,t1afm.h)
+#include "t1afm.h"
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TYPE1_TYPES_H
#include <stdlib.h> /* for qsort() */
diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h
index 8426b10..e2d5e3f 100644
--- a/src/type1/t1afm.h
+++ b/src/type1/t1afm.h
@@ -20,7 +20,7 @@
#define __T1AFM_H__
#include <ft2build.h>
-#include FT_SOURCE_FILE(type1,t1objs.h)
+#include "t1objs.h"
FT_BEGIN_HEADER
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index b3a6c6c..5146192 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -17,12 +17,12 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(type1,t1driver.h)
-#include FT_SOURCE_FILE(type1,t1gload.h)
-#include FT_SOURCE_FILE(type1,t1load.h)
+#include "t1driver.h"
+#include "t1gload.h"
+#include "t1load.h"
#ifndef T1_CONFIG_OPTION_NO_AFM
-#include FT_SOURCE_FILE(type1,t1afm.h)
+#include "t1afm.h"
#endif
#include FT_INTERNAL_DEBUG_H
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index 7bb6516..071c29d 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -17,7 +17,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(type1,t1gload.h)
+#include "t1gload.h"
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_OUTLINE_H
diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h
index 0c48eaf..99ca3a2 100644
--- a/src/type1/t1gload.h
+++ b/src/type1/t1gload.h
@@ -21,7 +21,7 @@
#include <ft2build.h>
-#include FT_SOURCE_FILE(type1,t1objs.h)
+#include "t1objs.h"
FT_BEGIN_HEADER
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index bac08b1..3992226 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -68,7 +68,7 @@
#include FT_INTERNAL_TYPE1_TYPES_H
#include FT_INTERNAL_TYPE1_ERRORS_H
-#include FT_SOURCE_FILE(type1,t1load.h)
+#include "t1load.h"
#include <string.h> /* for strncmp(), strcmp() */
#include <ctype.h> /* for isalnum() */
@@ -1383,7 +1383,7 @@
const T1_Field t1_keywords[] =
{
-#include FT_SOURCE_FILE(type1,t1tokens.h)
+#include "t1tokens.h"
/* now add the special functions... */
T1_FIELD_CALLBACK( "FontName", parse_font_name )
diff --git a/src/type1/t1load.h b/src/type1/t1load.h
index 40100d2..fb117f0 100644
--- a/src/type1/t1load.h
+++ b/src/type1/t1load.h
@@ -25,7 +25,7 @@
#include FT_INTERNAL_POSTSCRIPT_AUX_H
#include FT_MULTIPLE_MASTERS_H
-#include FT_SOURCE_FILE(type1,t1parse.h)
+#include "t1parse.h"
FT_BEGIN_HEADER
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 84fea49..bb8d69f 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -22,11 +22,11 @@
#include <string.h> /* strcmp() */
-#include FT_SOURCE_FILE(type1,t1gload.h)
-#include FT_SOURCE_FILE(type1,t1load.h)
+#include "t1gload.h"
+#include "t1load.h"
#ifndef T1_CONFIG_OPTION_NO_AFM
-#include FT_SOURCE_FILE(type1,t1afm.h)
+#include "t1afm.h"
#endif
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c
index 4d9a767..eede8bb 100644
--- a/src/type1/t1parse.c
+++ b/src/type1/t1parse.c
@@ -39,7 +39,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_TYPE1_ERRORS_H
#include FT_INTERNAL_POSTSCRIPT_AUX_H
-#include FT_SOURCE_FILE(type1,t1parse.h)
+#include "t1parse.h"
#include <string.h> /* for strncmp() */
diff --git a/src/type1/type1.c b/src/type1/type1.c
index 03080f7..3651265 100644
--- a/src/type1/type1.c
+++ b/src/type1/type1.c
@@ -19,14 +19,14 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
-#include FT_SOURCE_FILE(type1,t1parse.c)
-#include FT_SOURCE_FILE(type1,t1load.c)
-#include FT_SOURCE_FILE(type1,t1objs.c)
-#include FT_SOURCE_FILE(type1,t1driver.c)
-#include FT_SOURCE_FILE(type1,t1gload.c)
+#include "t1parse.c"
+#include "t1load.c"
+#include "t1objs.c"
+#include "t1driver.c"
+#include "t1gload.c"
#ifndef T1_CONFIG_OPTION_NO_AFM
-#include FT_SOURCE_FILE(type1,t1afm.c)
+#include "t1afm.c"
#endif
diff --git a/src/winfonts/descrip.mms b/src/winfonts/descrip.mms
index bfc878f..1f431e4 100644
--- a/src/winfonts/descrip.mms
+++ b/src/winfonts/descrip.mms
@@ -13,7 +13,7 @@
# fully.
-CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=[--.include]
+CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.winfonts])
OBJS=winfnt.obj
diff --git a/src/winfonts/rules.mk b/src/winfonts/rules.mk
index 8396894..aa015f4 100644
--- a/src/winfonts/rules.mk
+++ b/src/winfonts/rules.mk
@@ -19,7 +19,7 @@ FNT_DIR := $(SRC_)winfonts
FNT_DIR_ := $(FNT_DIR)$(SEP)
-FNT_COMPILE := $(FT_COMPILE)
+FNT_COMPILE := $(FT_COMPILE) $I$(FNT_DIR)
# Windows driver sources (i.e., C files)
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 1097486..d834960 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -22,7 +22,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_FNT_TYPES_H
-#include FT_SOURCE_FILE(winfonts,winfnt.h)
+#include "winfnt.h"
/*************************************************************************/