Merge b2g-inbound to m-c.

2014-02-04 14:43:23 -05:00 · 2014-02-04 14:43:23 -05:00 · f448244211
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@ -578,7 +578,7 @@ pref("dom.sysmsg.enabled", true);
 pref("media.plugins.enabled", false);
 pref("media.omx.enabled", true);
 pref("media.rtsp.enabled", true);
-pref("media.rtsp.video.enabled", false);
+pref("media.rtsp.video.enabled", true);

 // Disable printing (particularly, window.print())
 pref("dom.disable_window_print", true);
--- a/b2g/app/ua-update.json.in
+++ b/b2g/app/ua-update.json.in
@ -5,8 +5,6 @@
 {
  // bug 826335, globo.com
  "globo.com": "\\(Mobile#(Android; Mobile",
-  // bug 826338, yahoo.com
-  "yahoo.com": "\\(Mobile#(Android; Mobile",
  // bug 826342, mercadolivre.com.br
  "mercadolivre.com.br": "\\(Mobile#(Android; Mobile",
  // bug 826344, abril.com.br
@ -31,8 +29,6 @@
  "orkut.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
  // bug 826715, noticias.uol.com.br
  "noticias.uol.com.br": "\\(Mobile#(Android; Mobile",
-  // bug 826720, olx.com.br
-  "olx.com.br": "\\(Mobile#(Android; Mobile",
  // bug 826845, techtudo.com.br
  "techtudo.com.br": "\\(Mobile#(Android; Mobile",
  // bug 826958, ebay.com
@ -57,12 +53,8 @@
  "webmotors.com.br": "\\(Mobile#(Android; Mobile",
  // bug 827661, mercadolibre.com.co
  "mercadolibre.com.co": "\\(Mobile#(Android; Mobile",
-  // bug 827668, scribd.com
-  "scribd.com": "\\(Mobile#(Android; Mobile",
  // bug 827670, elpais.com.co
  "elpais.com.co": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
-  // bug 827672, olx.com.co
-  "olx.com.co": "\\(Mobile#(Android; Mobile",
  // bug 827674, avianca.com
  "avianca.com": "\\(Mobile#(Android; Mobile",
  // bug 827678, marca.com
@ -99,8 +91,6 @@
  "publico.es": "\\(Mobile#(Android; Mobile",
  // bug 828425, mercadolibre.com.ve
  "mercadolibre.com.ve": "\\(Mobile#(Android; Mobile",
-  // bug 828433, olx.com.ve
-  "olx.com.ve": "\\(Mobile#(Android; Mobile",
  // bug 828439, movistar.com.ve
  "movistar.com.ve": "\\(Mobile#(Android; Mobile",
  // bug 828445, bumeran.com.ve
@ -109,14 +99,10 @@
  "movil.bankinter.es": "\\(Mobile#(Android; Mobile",
  // bug 843114, einforma.com
  "einforma.com": "\\(Mobile#(Android; Mobile",
-  // bug 843116, wwwhatsnew.com
-  "wwwhatsnew.com": "\\(Mobile#(Android; Mobile",
  // bug 843119, askthebuilder.com
  "askthebuilder.com": "\\(Mobile#(Android; Mobile",
  // bug 843121, tor.com
  "tor.com": "\\(Mobile#(Android; Mobile",
-  // bug 843124, maruccisports.com
-  "maruccisports.com": "\\(Mobile#(Android; Mobile",
  // bug 843126, es.playstation.com
  "es.playstation.com": "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19",
  // bug 843129, 11870.com
@ -125,8 +111,6 @@
  "iphonejuegosgratis.com": "\\(Mobile#(Android; Mobile",
  // bug 843132, comunio.es
  "comunio.es": "\\(Mobile#(Android; Mobile",
-  // bug 843136, deviantart.com
-  "deviantart.com": "\\(Mobile#(Android; Mobile",
  // bug 843139, consumersearch.com
  "consumersearch.com": "\\(Mobile#(Android; Mobile",
  // bug 843141, foodily.com
@ -137,14 +121,10 @@
  "games.com": "\\(Mobile#(Android; Mobile",
  // bug 843160, ehow.com
  "ehow.com": "\\(Mobile#(Android; Mobile",
-  // bug 843162, urbanspoon.com
-  "urbanspoon.com": "\\(Mobile#(Android; Mobile",
  // bug 843165, virginatlantic.com
  "virginatlantic.com": "\\(Mobile#(Android; Mobile",
  // bug 843172, zimbio.com
  "zimbio.com": "\\(Mobile#(Android; Mobile",
-  // bug 843176, tylted.com
-  "tylted.com": "\\(Mobile#(Android; Mobile",
  // bug 843178, txt2nite.com
  "txt2nite.com": "\\(Mobile#(Android; Mobile",
  // bug 843181, slashgear.com
@ -203,10 +183,6 @@
  "eluniversal.com.mx": "\\(Mobile#(Android; Mobile",
  // bug 878642, mercadolibre.com.mx
  "mercadolibre.com.mx": "\\(Mobile#(Android; Mobile",
-  // bug 878645, olx.com.mx
-  "olx.com.mx": "\\(Mobile#(Android; Mobile",
-  // bug 878647, sat.gob.mx
-  "sat.gob.mx": "\\(Mobile#(Android; Mobile",
  // bug 878649, univision.com
  "univision.com": "\\(Mobile#(Android; Mobile",
  // bug 878653, redstarbelgrade.info
--- a/b2g/chrome/content/content.css
+++ b/b2g/chrome/content/content.css
@ -71,6 +71,10 @@ xul|thumb {
  border-radius: 3px;
 }

+xul|scrollbarbutton {
+  background-image: none !important;
+}
+
 /* -moz-touch-enabled? media elements */
 :-moz-any(video, audio) > xul|videocontrols {
  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@ -676,3 +676,42 @@ SettingsListener.observe('apz.force-enable', false, function(value) {
  Services.prefs.setBoolPref('dom.browser_frames.useAsyncPanZoom', value);
 });

+SettingsListener.observe('apz.displayport.heuristics', 'default', function(value) {
+  // first reset everything to default
+  Services.prefs.setCharPref('apz.velocity_bias', '1.0');
+  Services.prefs.setBoolPref('apz.use_paint_duration', true);
+  Services.prefs.setCharPref('apz.x_skate_size_multiplier', '1.5');
+  Services.prefs.setCharPref('apz.y_skate_size_multiplier', '2.5');
+  // and then set the things that we want to change
+  switch (value) {
+  case 'default':
+    break;
+  case 'center-displayport':
+    Services.prefs.setCharPref('apz.velocity_bias', '0.0');
+    break;
+  case 'perfect-paint-times':
+    Services.prefs.setBoolPref('apz.use_paint_duration', false);
+    Services.prefs.setCharPref('apz.velocity_bias', '0.32'); // 16/50 (assumes 16ms paint times instead of 50ms)
+    break;
+  case 'taller-displayport':
+    Services.prefs.setCharPref('apz.y_skate_size_multiplier', '3.5');
+    break;
+  case 'faster-paint':
+    Services.prefs.setCharPref('apz.x_skate_size_multiplier', '1.0');
+    Services.prefs.setCharPref('apz.y_skate_size_multiplier', '1.5');
+    break;
+  }
+});
+
+SettingsListener.observe('layers.enable-tiles', false, function(value) {
+  Services.prefs.setBoolPref('layers.enable-tiles', value);
+});
+
+SettingsListener.observe('layers.progressive-paint', false, function(value) {
+  Services.prefs.setBoolPref('layers.progressive-paint', value);
+});
+
+SettingsListener.observe('layers.draw-tile-borders', false, function(value) {
+  Services.prefs.setBoolPref('layers.draw-tile-borders', value);
+});
+
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@ -12,13 +12,13 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>
  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="87aa8679560ce09f6445621d6f370d9de722cdba"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
  <project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@ -11,10 +11,10 @@
  </project>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="905bfa3548eb75cf1792d0d8412b92113bbd4318"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="c3d7efc45414f1b44cd9c479bb2758c91c4707c0"/>
  <!-- Stock Android things -->
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@ -12,13 +12,13 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>
  <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="87aa8679560ce09f6445621d6f370d9de722cdba"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
  <project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@ -1,4 +1,4 @@
 {
-    "revision": "6193987d46a8d80c92554de0aa96462dd2a443b2", 
+    "revision": "a4d9c73e176e7dfc9a32d362f0f5e5cb5c21e323", 
    "repo_path": "/integration/gaia-central"
 }
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@ -11,12 +11,12 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
  <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@ -10,7 +10,7 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@ -12,12 +12,12 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
  <project name="platform/bionic" path="bionic" revision="cd5dfce80bc3f0139a56b58aca633202ccaee7f8"/>
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@ -11,12 +11,12 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@ -11,10 +11,10 @@
  </project>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <project name="valgrind" path="external/valgrind" remote="b2g" revision="905bfa3548eb75cf1792d0d8412b92113bbd4318"/>
  <project name="vex" path="external/VEX" remote="b2g" revision="c3d7efc45414f1b44cd9c479bb2758c91c4707c0"/>
  <!-- Stock Android things -->
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@ -11,12 +11,12 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="75e9691f02b9d18585c18a5434beeff39ee7ea20"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ac94739a01d64e86890f54f1795ff8e82b8e7939"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="f300646b085595d53c87f9763d031960bc6f0325"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="fd67604d5932cce3617ff7ce725a0a686d129905"/>
  <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
  <!-- Stock Android things -->
  <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@ -57,7 +57,7 @@ MOZ_PLACES=
 MOZ_B2G=1

 if test "$OS_TARGET" = "Android"; then
-MOZ_NUWA_PROCESS=
+MOZ_NUWA_PROCESS=1
 fi
 MOZ_FOLD_LIBS=1

--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@ -811,7 +811,7 @@ BrowserElementChild.prototype = {
    canvas.width = canvasWidth;
    canvas.height = canvasHeight;

-    var ctx = canvas.getContext("2d");
+    var ctx = canvas.getContext("2d", { willReadFrequently: true });
    ctx.scale(scale, scale);
    ctx.drawWindow(content, 0, 0, content.innerWidth, content.innerHeight,
                   transparent ? "rgba(255,255,255,0)" : "rgb(255,255,255)");
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@ -2256,6 +2256,11 @@ void
 ContentParent::FriendlyName(nsAString& aName)
 {
    aName.Truncate();
+#ifdef MOZ_NUWA_PROCESS
+    if (IsNuwaProcess()) {
+        aName.AssignLiteral("(Nuwa)");
+    } else
+#endif
    if (IsPreallocated()) {
        aName.AssignLiteral("(Preallocated)");
    } else if (mIsForBrowser) {
--- a/dom/ipc/PreallocatedProcessManager.cpp
+++ b/dom/ipc/PreallocatedProcessManager.cpp
@ -309,7 +309,7 @@ PreallocatedProcessManagerImpl::PublishSpareProcess(ContentParent* aContent)
      do_GetService("@mozilla.org/parentprocessmessagemanager;1");
    nsresult rv = ppmm->BroadcastAsyncMessage(
      NS_LITERAL_STRING("TEST-ONLY:nuwa-add-new-process"),
-      JSVAL_NULL, JSVAL_NULL, cx, 1);
+      JS::NullHandleValue, JS::NullHandleValue, cx, 1);
  }

  if (!mNuwaForkWaitTasks.IsEmpty()) {
@ -362,7 +362,7 @@ PreallocatedProcessManagerImpl::OnNuwaReady()
      do_GetService("@mozilla.org/parentprocessmessagemanager;1");
    nsresult rv = ppmm->BroadcastAsyncMessage(
      NS_LITERAL_STRING("TEST-ONLY:nuwa-ready"),
-      JSVAL_NULL, JSVAL_NULL, cx, 1);
+      JS::NullHandleValue, JS::NullHandleValue, cx, 1);
  }
  NuwaFork();
 }
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@ -1,2 +1,2 @@
 [test_NuwaProcessCreation.html]
-skip-if = true # re-enable when nuwa is enabled.
+run-if = toolkit == 'gonk'
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@ -37,11 +37,9 @@ skip-if = os == 'mac'
 [test_peerConnection_basicAudioVideoCombined.html]
 [test_peerConnection_basicVideo.html]
 [test_peerConnection_bug822674.html]
-[test_peerConnection_bug825703.html]
 [test_peerConnection_bug827843.html]
 [test_peerConnection_bug834153.html]
 [test_peerConnection_bug835370.html]
-[test_peerConnection_errorCallbacks.html]
 [test_peerConnection_offerRequiresReceiveAudio.html]
 [test_peerConnection_offerRequiresReceiveVideo.html]
 [test_peerConnection_offerRequiresReceiveVideoAudio.html]
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@ -196,6 +196,20 @@ static int32_t gFlingRepaintInterval = 75;
 */
 static float gMinSkateSpeed = 1.0f;

+/**
+ * Whether or not to use the estimated paint duration as a factor when projecting
+ * the displayport in the direction of scrolling. If this value is set to false,
+ * a constant 50ms paint time is used; the projection can be scaled as desired
+ * using the gVelocityBias pref below.
+ */
+static bool gUsePaintDuration = true;
+
+/**
+ * How much to adjust the displayport in the direction of scrolling. This value
+ * is multiplied by the velocity and added to the displayport offset.
+ */
+static float gVelocityBias = 1.0f;
+
 /**
 * Duration of a zoom to animation.
 */
@ -385,6 +399,8 @@ AsyncPanZoomController::InitializeGlobalState()
  Preferences::AddIntVarCache(&gPanRepaintInterval, "apz.pan_repaint_interval", gPanRepaintInterval);
  Preferences::AddIntVarCache(&gFlingRepaintInterval, "apz.fling_repaint_interval", gFlingRepaintInterval);
  Preferences::AddFloatVarCache(&gMinSkateSpeed, "apz.min_skate_speed", gMinSkateSpeed);
+  Preferences::AddBoolVarCache(&gUsePaintDuration, "apz.use_paint_duration", gUsePaintDuration);
+  Preferences::AddFloatVarCache(&gVelocityBias, "apz.velocity_bias", gVelocityBias);
  Preferences::AddIntVarCache(&gContentResponseTimeout, "apz.content_response_timeout", gContentResponseTimeout);
  Preferences::AddIntVarCache(&gNumPaintDurationSamples, "apz.num_paint_duration_samples", gNumPaintDurationSamples);
  Preferences::AddFloatVarCache(&gTouchStartTolerance, "apz.touch_start_tolerance", gTouchStartTolerance);
@ -1281,8 +1297,12 @@ EnlargeDisplayPortAlongAxis(float* aOutOffset, float* aOutLength,
  *aOutOffset -= (newLength - (*aOutLength)) / 2;
  *aOutLength = newLength;

-  // Project the displayport out based on the estimated time it will take to paint
-  *aOutOffset += (aVelocity * aEstimatedPaintDurationMillis);
+  // Project the displayport out based on the estimated time it will take to paint,
+  // if the gUsePaintDuration flag is set. If not, just use a constant 50ms paint
+  // time. Setting the gVelocityBias pref appropriately can cancel this out if so
+  // desired.
+  double paintFactor = (gUsePaintDuration ? aEstimatedPaintDurationMillis : 50.0);
+  *aOutOffset += (aVelocity * paintFactor * gVelocityBias);
 }

 /* static */
--- a/modules/freetype2/CMakeLists.txt
+++ b/modules/freetype2/CMakeLists.txt
@ -0,0 +1,165 @@
+# CMakeLists.txt
+#
+# Copyright 2013 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# Written by John Cary <cary@txcorp.com>
+#
+# 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.
+#
+#
+# Say
+#
+#   cmake CMakeLists.txt
+#
+# to create a Makefile that builds a static version of the library.  For a
+# dynamic library, use
+#
+#   cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true
+#
+# instead.  Please refer to the cmake manual for further options, in
+# particular, how to modify compilation and linking parameters.
+#
+# Some notes.
+#
+# . `cmake' will overwrite FreeType's original (top-level) `Makefile' file.
+#
+# . You can use `cmake' directly on a freshly cloned FreeType git
+#   repository.
+#
+# . `CMakeLists.txt'  is provided as-is since it is not used by the
+#   developer team.
+
+
+cmake_minimum_required(VERSION 2.6)
+
+project(freetype)
+
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "5")
+set(VERSION_PATCH "2")
+set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+
+# Compiler definitions for building the library
+add_definitions(-DFT2_BUILD_LIBRARY)
+
+# Specify library include directories
+include_directories("${PROJECT_SOURCE_DIR}/include")
+
+# Create the configuration file
+message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include.")
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include)
+
+# For the auto-generated ftconfig.h file
+include_directories("${PROJECT_BINARY_DIR}/include")
+message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/ftconfig.h.")
+execute_process(
+  COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?"
+  INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in
+  OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/ftconfig.h
+)
+
+set(BASE_SRCS
+  src/autofit/autofit.c
+  src/base/ftadvanc.c
+  src/base/ftbbox.c
+  src/base/ftbitmap.c
+  src/base/ftcalc.c
+  src/base/ftcid.c
+  src/base/ftdbgmem.c
+  src/base/ftdebug.c
+  src/base/ftfstype.c
+  src/base/ftgasp.c
+  src/base/ftgloadr.c
+  src/base/ftglyph.c
+  src/base/ftgxval.c
+  src/base/ftinit.c
+  src/base/ftlcdfil.c
+  src/base/ftmm.c
+  src/base/ftobjs.c
+  src/base/ftotval.c
+  src/base/ftoutln.c
+  src/base/ftpatent.c
+  src/base/ftpfr.c
+  src/base/ftrfork.c
+  src/base/ftsnames.c
+  src/base/ftstream.c
+  src/base/ftstroke.c
+  src/base/ftsynth.c
+  src/base/ftsystem.c
+  src/base/fttrigon.c
+  src/base/fttype1.c
+  src/base/ftutil.c
+  src/base/ftwinfnt.c
+  src/base/ftxf86.c
+  src/bdf/bdf.c
+  src/bzip2/ftbzip2.c
+  src/cache/ftcache.c
+  src/cff/cff.c
+  src/cid/type1cid.c
+  src/gzip/ftgzip.c
+  src/lzw/ftlzw.c
+  src/pcf/pcf.c
+  src/pfr/pfr.c
+  src/psaux/psaux.c
+  src/pshinter/pshinter.c
+  src/psnames/psmodule.c
+  src/raster/raster.c
+  src/sfnt/sfnt.c
+  src/smooth/smooth.c
+  src/truetype/truetype.c
+  src/type1/type1.c
+  src/type42/type42.c
+  src/winfonts/winfnt.c
+)
+
+include_directories("src/truetype")
+include_directories("src/sfnt")
+include_directories("src/autofit")
+include_directories("src/smooth")
+include_directories("src/raster")
+include_directories("src/psaux")
+include_directories("src/psnames")
+
+add_library(freetype ${BASE_SRCS})
+
+# Installations
+# Note the trailing slash in the argument to the `DIRECTORY' directive
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
+  DESTINATION include/freetype2
+  PATTERN "internal" EXCLUDE
+)
+install(TARGETS freetype
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+# Packaging
+# CPack version numbers for release tarball name.
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}})
+if (NOT DEFINED CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_NAME}")
+endif ()
+if (NOT DEFINED CPACK_SOURCE_PACKAGE_FILE_NAME)
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME
+    "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}-r${PROJECT_REV}"
+    CACHE INTERNAL "tarball basename"
+  )
+endif ()
+set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_IGNORE_FILES
+  "/CVS/;/.svn/;.swp$;.#;/#;/build/;/serial/;/ser/;/parallel/;/par/;~;/preconfig.out;/autom4te.cache/;/.config")
+set(CPACK_GENERATOR TGZ)
+include(CPack)
+
+# add make dist target
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+# eof
--- a/modules/freetype2/ChangeLog
+++ b/modules/freetype2/ChangeLog
--- a/modules/freetype2/Jamfile
+++ b/modules/freetype2/Jamfile
@ -1,6 +1,6 @@
 # FreeType 2 top Jamfile.
 #
-# Copyright 2001-2011 by
+# Copyright 2001-2011, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -140,9 +140,9 @@ DEFINES += FT2_BUILD_LIBRARY ;
 # FT2_MULTI = true ;


-# The file <freetype/config/ftheader.h> is used to define macros that are
-# later used in #include statements.  It needs to be parsed in order to
-# record these definitions.
+# The file <config/ftheader.h> is used to define macros that are later used
+# in #include statements.  It needs to be parsed in order to record these
+# definitions.
 #
 HDRMACRO  [ FT2_SubDir  include freetype config ftheader.h ] ;
 HDRMACRO  [ FT2_SubDir  include freetype internal internal.h ] ;
@ -177,7 +177,7 @@ actions GenExportSymbols1 bind APINAMES
  $(APINAMES) $(2) > $(1)
 }

-GenExportSymbols  ftexport.sym : include/freetype include/freetype/cache ;
+GenExportSymbols  ftexport.sym : include include/cache ;

 # Test files (hinter debugging).  Only used by FreeType developers.
 #
@ -195,7 +195,7 @@ rule RefDoc

 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.2 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
 }

 RefDoc  refdoc ;
--- a/modules/freetype2/README
+++ b/modules/freetype2/README
@ -1,4 +1,4 @@
-  FreeType 2.5.0
+  FreeType 2.5.2
  ==============

  Homepage: http://www.freetype.org
@ -24,9 +24,9 @@

  and download one of the following files.

-    freetype-doc-2.5.0.tar.bz2
-    freetype-doc-2.5.0.tar.gz
-    ftdoc250.zip
+    freetype-doc-2.5.2.tar.bz2
+    freetype-doc-2.5.2.tar.gz
+    ftdoc252.zip

  To view the documentation online, go to

--- a/modules/freetype2/README.git
+++ b/modules/freetype2/README.git
@ -31,9 +31,13 @@ configure script is necessary at all; saying
 should work on all platforms which have GNU make (or makepp).


+Similarly, a  build with  `cmake' can  be done  directly from  the git
+repository.
+
+
 ----------------------------------------------------------------------

-Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
+Copyright 2005-2010, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/modules/freetype2/README.moz-patches
+++ b/modules/freetype2/README.moz-patches
@ -1,4 +1,4 @@
-This directory contains freetype2 v2.5.0.1 downloaded from
+This directory contains freetype2 v2.5.2 downloaded from
 http://savannah.nongnu.org/download/freetype/

 There are currently no local changes applied the freetype tree.
--- a/modules/freetype2/autogen.sh
+++ b/modules/freetype2/autogen.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
+# Copyright 2005-2010, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -139,7 +139,7 @@ check_tool_version $LIBTOOLIZE libtoolize LIBTOOLIZE 2.2.4
 check_tool_version $AUTOCONF   autoconf   AUTOCONF   2.62

 # This sets freetype_major, freetype_minor, and freetype_patch.
-eval `sed -nf version.sed include/freetype/freetype.h`
+eval `sed -nf version.sed include/freetype.h`

 # We set freetype-patch to an empty value if it is zero.
 if test "$freetype_patch" = ".0"; then
--- a/modules/freetype2/builds/amiga/README
+++ b/modules/freetype2/builds/amiga/README
@ -1,7 +1,7 @@

 README for the builds/amiga subdirectory.

-Copyright 2005 by
+Copyright 2005, 2013 by
 Werner Lemberg and Detlef Würkner.

 This file is part of the FreeType project, and may only be used, modified,
@ -51,8 +51,8 @@ directory.  The results are:

 - ftdebug.o, an object module containing the standard version of the
  debugging code which uses vprintf() and exit() (not pure).
-  Debugging can be turned on in FT:include/freetype/config/ftoption.h
-  and with FT_SetTraceLevel().
+  Debugging can be turned on in FT:include/config/ftoption.h and with
+  FT_SetTraceLevel().

 - ftdebugpure.o, an object module containing the pure version of the
  debugging code which uses KVPrintf() from lib:debug.lib and no
@ -64,15 +64,14 @@ directory.  The results are:
  ftsystem.o would force ALL FreeType2 modules to be linked to your
  program, I decided to use a different scheme: You must #include
  FT:src/base/ftinit.c in your sourcecode and specify with #define
-  statements which modules you need.  See
-  include/freetype/config/ftmodule.h.
+  statements which modules you need.  See include/config/ftmodule.h.


 To use in your own programs:

 - Insert the #define and #include statements from top of
-  include/freetype/config/ftmodule.h in your source code and uncomment
-  the #define statements for the FreeType2 modules you need.
+  include/config/ftmodule.h in your source code and uncomment the
+  #define statements for the FreeType2 modules you need.

 - You can use either PARAMETERS=REGISTER or PARAMETERS=STACK for
  calling the FreeType2 functions, because the link library and the
--- a/modules/freetype2/builds/amiga/include/freetype/config/ftconfig.h
+++ b/modules/freetype2/builds/amiga/include/freetype/config/ftconfig.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright 2005, 2006, 2007 by                                          */
+/*  Copyright 2005-2007, 2013 by                                           */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -34,9 +34,9 @@
 /* Now include the original file */
 #ifndef __MORPHOS__
 #ifdef __SASC
-#include "FT:include/freetype/config/ftconfig.h"
+#include "FT:include/config/ftconfig.h"
 #else
-#include "/FT/include/freetype/config/ftconfig.h"
+#include "/FT/include/config/ftconfig.h"
 #endif
 #else
 /* We must define that, it seems that
@ -45,7 +45,7 @@
 * binaries from http://www.morphos.de)
 */
 #define _LIBC_LIMITS_H_
-#include "/FT/include/freetype/config/ftconfig.h"
+#include "/FT/include/config/ftconfig.h"
 #endif

 /*
--- a/modules/freetype2/builds/amiga/include/freetype/config/ftmodule.h
+++ b/modules/freetype2/builds/amiga/include/freetype/config/ftmodule.h
--- a/modules/freetype2/builds/amiga/makefile
+++ b/modules/freetype2/builds/amiga/makefile
@ -5,7 +5,7 @@
 #


-# Copyright 2005, 2006, 2007, 2009 by
+# Copyright 2005-2007, 2009, 2013 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -43,7 +43,7 @@
 #
 # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
 # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).

 all:	libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o

--- a/modules/freetype2/builds/amiga/makefile.os4
+++ b/modules/freetype2/builds/amiga/makefile.os4
@ -4,7 +4,7 @@
 #


-# Copyright 2005, 2006, 2007, 2009 by
+# Copyright 2005-2007, 2009, 2013 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -40,7 +40,7 @@
 #
 # link your programs with libft2_ppc.a and either ftsystem.ppc.o or ftsystempure.ppc.o
 # (and either ftdebug.ppc.o or ftdebugpure.ppc.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).

 all:	assign libft2_ppc.a ftsystem.ppc.o ftsystempure.ppc.o

--- a/modules/freetype2/builds/amiga/smakefile
+++ b/modules/freetype2/builds/amiga/smakefile
@ -3,7 +3,7 @@
 #


-# Copyright 2005,2006, 2007, 2009 by
+# Copyright 2005-2007, 2009, 2013 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -40,7 +40,7 @@
 #
 # link your programs with ft2_680x0.lib and either ftsystem.o or ftsystempure.o
 # (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
-# FT_DEBUG_LEVEL_TRACE in include/freetype/config/ftoption.h).
+# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).

 OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o ftgasp.o   \
 	  ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpatent.o ftpfr.o \
--- a/modules/freetype2/builds/amiga/src/base/ftdebug.c
+++ b/modules/freetype2/builds/amiga/src/base/ftdebug.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for amiga (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2004, 2005, 2013 by                         */
+/*  Copyright 1996-2002, 2004, 2005, 2013 by                               */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -176,7 +176,7 @@
  /* the memory and stream components which are set to 7 and 5,            */
  /* respectively.                                                         */
  /*                                                                       */
-  /* See the file <include/freetype/internal/fttrace.h> for details of the */
+  /* See the file <include/internal/fttrace.h> for details of the          */
  /* available toggle names.                                               */
  /*                                                                       */
  /* The level must be between 0 and 7; 0 means quiet (except for serious  */
--- a/modules/freetype2/builds/detect.mk
+++ b/modules/freetype2/builds/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by
+# Copyright 1996-2003, 2006, 2008, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -17,8 +17,8 @@
 # the following variables:
 #
 #   BUILD_DIR    The configuration and system-specific directory.  Usually
-#                `freetype/builds/$(PLATFORM)' but can be different for
-#                custom builds of the library.
+#                `builds/$(PLATFORM)' but can be different for custom builds
+#                of the library.
 #
 # The following variables must be defined in system specific `detect.mk'
 # files:
--- a/modules/freetype2/builds/freetype.mk
+++ b/modules/freetype2/builds/freetype.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 by
+# Copyright 1996-2006, 2008, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base

 # Other derived directories.
 #
-PUBLIC_DIR   := $(TOP_DIR)/include/freetype
+PUBLIC_DIR   := $(TOP_DIR)/include
 INTERNAL_DIR := $(PUBLIC_DIR)/internal
 SERVICES_DIR := $(INTERNAL_DIR)/services
 CONFIG_DIR   := $(PUBLIC_DIR)/config
@ -116,8 +116,8 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A
 # IMPORTANT NOTE: The architecture-dependent directory must ALWAYS be placed
 #                 before the standard include list.  Porters are then able to
 #                 put their own version of some of the FreeType components
-#                 in the `freetype/builds/<system>' directory, as these
-#                 files will override the default sources.
+#                 in the `builds/<system>' directory, as these files will
+#                 override the default sources.
 #
 INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
                                      $(DEVEL_DIR) \
@ -147,13 +147,14 @@ ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
  FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
 endif

+# Note that a build with the `configure' script uses $(CFLAGS) only.
+#
 FT_CFLAGS  = $(CPPFLAGS) \
             $(INCLUDE_FLAGS) \
             $(CFLAGS) \
             $DFT2_BUILD_LIBRARY \
             $DFT_CONFIG_MODULES_H="<ftmodule.h>" \
             $(FTOPTION_FLAG)
-FT_CC      = $(CC) $(FT_CFLAGS)
 FT_COMPILE = $(CC) $(ANSIFLAGS) $(FT_CFLAGS)


@ -178,7 +179,7 @@ PUBLIC_H   := $(wildcard $(PUBLIC_DIR)/*.h)
 INTERNAL_H := $(wildcard $(INTERNAL_DIR)/*.h) \
              $(wildcard $(SERVICES_DIR)/*.h)
 CONFIG_H   := $(wildcard $(CONFIG_DIR)/*.h) \
-              $(wildcard $(BUILD_DIR)/freetype/config/*.h) \
+              $(wildcard $(BUILD_DIR)/config/*.h) \
              $(FTMODULE_H) \
              $(FTOPTION_H)
 DEVEL_H    := $(wildcard $(TOP_DIR)/devel/*.h)
@ -261,8 +262,6 @@ objects: $(OBJECTS_LIST)

 library: $(PROJECT_LIBRARY)

-dll: $(PROJECT_LIBRARY) exported_symbols
-
 .c.$O:
 	$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)

--- a/modules/freetype2/builds/mac/README
+++ b/modules/freetype2/builds/mac/README
@ -1,8 +1,8 @@
 This folder contains

-  * Makefile skeltons for Apple MPW (Macintosh's Programmers Workshop)
+  * Makefile skeletons for Apple MPW (Macintosh's Programmer's Workshop)

-  * Python script to generate MPW makefile from skelton
+  * Python script to generate MPW makefile from skeleton

  * Metrowerks CodeWarrior 9.0 project file in XML format

@ -51,7 +51,7 @@ environment by Metrowerks. GCC for MPW and Symantec
  Also you can find documents how to update by MPW-PR.

  Python is required to restore MPW makefiles from the
-  skeltons. Python bundled to Mac OS X is enough. For
+  skeletons. Python bundled to Mac OS X is enough. For
  classic MacOS, MacPython is available:

      http://homepages.cwi.nl/~jack/macpython/
@ -78,10 +78,10 @@ environment by Metrowerks. GCC for MPW and Symantec
  Detailed building procedure by Apple MPW is
  described in following.

-    3-1-1. Generate MPW makefiles from the skeltons
+    3-1-1. Generate MPW makefiles from the skeletons
    ------------------------------------------------

-    Here are 4 skeltons for following targets are
+    Here are 4 skeletons for following targets are
    included.

    - FreeType.m68k_far.make.txt
@ -109,7 +109,7 @@ environment by Metrowerks. GCC for MPW and Symantec

    MPW makefile syntax uses 8bit characters. To keep
    from violating them during version control, here
-    we store skeltons in pure ASCII format. You must
+    we store skeletons in pure ASCII format. You must
    generate MPW makefile by Python script ascii2mpw.py.

    In Mac OS X terminal, you can convert as:
@ -118,10 +118,10 @@ environment by Metrowerks. GCC for MPW and Symantec
 		< builds/mac/FreeType.m68k_far.make.txt \
 		> FreeType.m68k_far.make

-    The skeltons are designed to use in the top
+    The skeletons are designed to use in the top
    directory where there are builds, include, src etc.
    You must name the generated MPW makefile by removing
-    ".txt" from source skelton name.
+    ".txt" from source skeleton name.

    3-1-2. Add resource forks to related files
    ------------------------------------------
@ -392,12 +392,10 @@ ATSFontGetFileSpecification()         |    x    |    x    |    x    |    x    |
    ATS font manager is not published in these versions.

 ------------------------------------------------------------
-Last update: 2009-Jul-25.
+Last update: 2013-Nov-03.

 Currently maintained by
 	suzuki toshiya, <mpsuzuki@hiroshima-u.ac.jp>
 Originally prepared by
 	Leonard Rosenthol, <leonardr@lazerware.com>
 	Just van Rossum, <just@letterror.com>
-
-This directory is now actively maintained as part of the FreeType Project.
--- a/modules/freetype2/builds/mac/ftmac.c
+++ b/modules/freetype2/builds/mac/ftmac.c
@ -1392,7 +1392,6 @@ typedef short ResourceIndex;
    if ( !pathname )
      return FT_THROW( Invalid_Argument );

-    error  = FT_Err_Ok;
    *aface = NULL;

    /* try resourcefork based font: LWFN, FFIL */
--- a/modules/freetype2/builds/symbian/bld.inf
+++ b/modules/freetype2/builds/symbian/bld.inf
@ -2,7 +2,7 @@
 // FreeType 2 project for the symbian platform
 //

-// Copyright 2008, 2009 by
+// Copyright 2008, 2009, 2013 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
@ -19,48 +19,48 @@ freetype.mmp

 PRJ_EXPORTS
 ../../include/ft2build.h
-../../include/freetype/config/ftconfig.h	freetype/config/ftconfig.h
-../../include/freetype/config/ftheader.h	freetype/config/ftheader.h
-../../include/freetype/config/ftmodule.h	freetype/config/ftmodule.h
-../../include/freetype/config/ftoption.h	freetype/config/ftoption.h
-../../include/freetype/config/ftstdlib.h	freetype/config/ftstdlib.h
-../../include/freetype/freetype.h		freetype/freetype.h
-../../include/freetype/ftbbox.h			freetype/ftbbox.h
-../../include/freetype/ftbdf.h			freetype/ftbdf.h
-../../include/freetype/ftbitmap.h		freetype/ftbitmap.h
-../../include/freetype/ftcache.h		freetype/ftcache.h
-../../include/freetype/ftcid.h			freetype/ftcid.h
-../../include/freetype/fterrdef.h		freetype/fterrdef.h
-../../include/freetype/fterrors.h		freetype/fterrors.h
-../../include/freetype/ftgasp.h			freetype/ftgasp.h
-../../include/freetype/ftglyph.h		freetype/ftglyph.h
-../../include/freetype/ftgxval.h		freetype/ftgxval.h
-../../include/freetype/ftgzip.h			freetype/ftgzip.h
-../../include/freetype/ftbzip2.h		freetype/ftbzip2.h
-../../include/freetype/ftimage.h		freetype/ftimage.h
-../../include/freetype/ftincrem.h		freetype/ftincrem.h
-../../include/freetype/ftlcdfil.h		freetype/ftlcdfil.h
-../../include/freetype/ftlist.h			freetype/ftlist.h
-../../include/freetype/ftlzw.h			freetype/ftlzw.h
-../../include/freetype/ftmac.h			freetype/ftmac.h
-../../include/freetype/ftmm.h			freetype/ftmm.h
-../../include/freetype/ftmodapi.h		freetype/ftmodapi.h
-../../include/freetype/ftmoderr.h		freetype/ftmoderr.h
-../../include/freetype/ftotval.h		freetype/ftotval.h
-../../include/freetype/ftoutln.h		freetype/ftoutln.h
-../../include/freetype/ftpfr.h			freetype/ftpfr.h
-../../include/freetype/ftrender.h		freetype/ftrender.h
-../../include/freetype/ftsizes.h		freetype/ftsizes.h
-../../include/freetype/ftsnames.h		freetype/ftsnames.h
-../../include/freetype/ftstroke.h		freetype/ftstroke.h
-../../include/freetype/ftsynth.h		freetype/ftsynth.h
-../../include/freetype/ftsystem.h		freetype/ftsystem.h
-../../include/freetype/fttrigon.h		freetype/fttrigon.h
-../../include/freetype/fttypes.h		freetype/fttypes.h
-../../include/freetype/ftwinfnt.h		freetype/ftwinfnt.h
-../../include/freetype/ftxf86.h			freetype/ftxf86.h
-../../include/freetype/t1tables.h		freetype/t1tables.h
-../../include/freetype/ttnameid.h		freetype/ttnameid.h
-../../include/freetype/tttables.h		freetype/tttables.h
-../../include/freetype/tttags.h			freetype/tttags.h
-../../include/freetype/ttunpat.h		freetype/ttunpat.h
+../../include/config/ftconfig.h	config/ftconfig.h
+../../include/config/ftheader.h	config/ftheader.h
+../../include/config/ftmodule.h	config/ftmodule.h
+../../include/config/ftoption.h	config/ftoption.h
+../../include/config/ftstdlib.h	config/ftstdlib.h
+../../include/freetype.h	freetype.h
+../../include/ftbbox.h		ftbbox.h
+../../include/ftbdf.h		ftbdf.h
+../../include/ftbitmap.h	ftbitmap.h
+../../include/ftcache.h		ftcache.h
+../../include/ftcid.h		ftcid.h
+../../include/fterrdef.h	fterrdef.h
+../../include/fterrors.h	fterrors.h
+../../include/ftgasp.h		ftgasp.h
+../../include/ftglyph.h		ftglyph.h
+../../include/ftgxval.h		ftgxval.h
+../../include/ftgzip.h		ftgzip.h
+../../include/ftbzip2.h		ftbzip2.h
+../../include/ftimage.h		ftimage.h
+../../include/ftincrem.h	ftincrem.h
+../../include/ftlcdfil.h	ftlcdfil.h
+../../include/ftlist.h		ftlist.h
+../../include/ftlzw.h		ftlzw.h
+../../include/ftmac.h		ftmac.h
+../../include/ftmm.h		ftmm.h
+../../include/ftmodapi.h	ftmodapi.h
+../../include/ftmoderr.h	ftmoderr.h
+../../include/ftotval.h		ftotval.h
+../../include/ftoutln.h		ftoutln.h
+../../include/ftpfr.h		ftpfr.h
+../../include/ftrender.h	ftrender.h
+../../include/ftsizes.h		ftsizes.h
+../../include/ftsnames.h	ftsnames.h
+../../include/ftstroke.h	ftstroke.h
+../../include/ftsynth.h		ftsynth.h
+../../include/ftsystem.h	ftsystem.h
+../../include/fttrigon.h	fttrigon.h
+../../include/fttypes.h		fttypes.h
+../../include/ftwinfnt.h	ftwinfnt.h
+../../include/ftxf86.h		ftxf86.h
+../../include/t1tables.h	t1tables.h
+../../include/ttnameid.h	ttnameid.h
+../../include/tttables.h	tttables.h
+../../include/tttags.h		tttags.h
+../../include/ttunpat.h		ttunpat.h
--- a/modules/freetype2/builds/toplevel.mk
+++ b/modules/freetype2/builds/toplevel.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012 by
+# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -176,7 +176,7 @@ include $(TOP_DIR)/builds/modules.mk

 # we check for `dist', not `distclean'
 ifneq ($(findstring distx,$(MAKECMDGOALS)x),)
-  FT_H := include/freetype/freetype.h
+  FT_H := include/freetype.h

  major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
  minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
--- a/modules/freetype2/builds/unix/aclocal.m4
+++ b/modules/freetype2/builds/unix/aclocal.m4
@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-

-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/modules/freetype2/builds/unix/config.sub
+++ b/modules/freetype2/builds/unix/config.sub
@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2013 Free Software Foundation, Inc.

-timestamp='2013-04-24'
+timestamp='2013-10-01'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -257,7 +257,7 @@ case $basic_machine in
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@ -265,6 +265,7 @@ case $basic_machine in
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@ -324,7 +325,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@ -372,7 +373,7 @@ case $basic_machine in
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@ -381,6 +382,7 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@ -794,7 +796,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@ -830,7 +832,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@ -1546,6 +1548,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
--- a/modules/freetype2/builds/unix/configure
+++ b/modules/freetype2/builds/unix/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeType 2.5.
+# Generated by GNU Autoconf 2.69 for FreeType 2.5.2.
 #
 # Report bugs to <freetype@nongnu.org>.
 #
@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FreeType'
 PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.5'
-PACKAGE_STRING='FreeType 2.5'
+PACKAGE_VERSION='2.5.2'
+PACKAGE_STRING='FreeType 2.5.2'
 PACKAGE_BUGREPORT='freetype@nongnu.org'
 PACKAGE_URL=''

@ -662,6 +662,7 @@ DLLTOOL
 AS
 SYSTEM_ZLIB
 FT2_EXTRA_LIBS
+LIBPNG
 LIBBZ2
 LIBZ
 ftmac_c
@ -1303,7 +1304,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures FreeType 2.5 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.5.2 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@ -1368,7 +1369,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of FreeType 2.5:";;
+     short | recursive ) echo "Configuration of FreeType 2.5.2:";;
   esac
  cat <<\_ACEOF

@ -1485,7 +1486,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-FreeType configure 2.5
+FreeType configure 2.5.2
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@ -2083,7 +2084,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by FreeType $as_me 2.5, which was
+It was created by FreeType $as_me 2.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@ -2439,7 +2440,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

 # Don't forget to update docs/VERSION.DLL!

-version_info='16:2:10'
+version_info='17:1:11'

 ft_version=`echo $version_info | tr : .`

@ -4775,8 +4776,13 @@ $as_echo_n "checking for libpng... " >&6; }
    if ! which libpng-config >/dev/null; then
      as_fn_error $? "\`libpng-config' not found;
 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
+or pass \`--without-png' to the \`configure' script." "$LINENO" 5
+    elif test ${cross_compiling} = yes; then
+      as_fn_error $? "\`libpng-config' should not be used in cross-building;
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
 or pass \`--without-png' to the \`configure' script." "$LINENO" 5
    fi
+    LIBPNG="`libpng-config --libs`"
    LIBPNG_CFLAGS="`libpng-config --cflags`"
    LIBPNG_LDFLAGS="`libpng-config --ldflags`"
  fi
@ -5372,6 +5378,7 @@ esac



+
 case `pwd` in
  *\ * | *\	*)
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@ -13363,7 +13370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by FreeType $as_me 2.5, which was
+This file was extended by FreeType $as_me 2.5.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@ -13429,7 +13436,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-FreeType config.status 2.5
+FreeType config.status 2.5.2
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/modules/freetype2/builds/unix/configure.ac
+++ b/modules/freetype2/builds/unix/configure.ac
@ -11,13 +11,13 @@
 # indicate that you have read the license and understand and accept it
 # fully.

-AC_INIT([FreeType], [2.5], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.5.2], [freetype@nongnu.org], [freetype])
 AC_CONFIG_SRCDIR([ftconfig.in])


 # Don't forget to update docs/VERSION.DLL!

-version_info='16:2:10'
+version_info='17:1:11'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@ -291,8 +291,13 @@ if test x$with_png != xno; then
    if ! which libpng-config >/dev/null; then
      AC_MSG_ERROR([`libpng-config' not found;
 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
+or pass `--without-png' to the `configure' script.])
+    elif test ${cross_compiling} = yes; then
+      AC_MSG_ERROR([`libpng-config' should not be used in cross-building;
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
 or pass `--without-png' to the `configure' script.])
    fi
+    LIBPNG="`libpng-config --libs`"
    LIBPNG_CFLAGS="`libpng-config --cflags`"
    LIBPNG_LDFLAGS="`libpng-config --ldflags`"
  fi
@ -717,6 +722,7 @@ esac
 AC_SUBST([ftmac_c])
 AC_SUBST([LIBZ])
 AC_SUBST([LIBBZ2])
+AC_SUBST([LIBPNG])
 AC_SUBST([FT2_EXTRA_LIBS])
 AC_SUBST([SYSTEM_ZLIB])

--- a/modules/freetype2/builds/unix/configure.raw
+++ b/modules/freetype2/builds/unix/configure.raw
@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])

 # Don't forget to update docs/VERSION.DLL!

-version_info='16:2:10'
+version_info='17:1:11'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@ -291,8 +291,13 @@ if test x$with_png != xno; then
    if ! which libpng-config >/dev/null; then
      AC_MSG_ERROR([`libpng-config' not found;
 either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
+or pass `--without-png' to the `configure' script.])
+    elif test ${cross_compiling} = yes; then
+      AC_MSG_ERROR([`libpng-config' should not be used in cross-building;
+either set the LIBPNG_CFLAGS and LIBPNG_LDFLAGS environment variables,
 or pass `--without-png' to the `configure' script.])
    fi
+    LIBPNG="`libpng-config --libs`"
    LIBPNG_CFLAGS="`libpng-config --cflags`"
    LIBPNG_LDFLAGS="`libpng-config --ldflags`"
  fi
@ -717,6 +722,7 @@ esac
 AC_SUBST([ftmac_c])
 AC_SUBST([LIBZ])
 AC_SUBST([LIBBZ2])
+AC_SUBST([LIBPNG])
 AC_SUBST([FT2_EXTRA_LIBS])
 AC_SUBST([SYSTEM_ZLIB])

--- a/modules/freetype2/builds/unix/freetype-config.in
+++ b/modules/freetype2/builds/unix/freetype-config.in
@ -119,13 +119,13 @@ else
 fi

 if test "$echo_ft_version" = "yes" ; then
-  major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
         | grep FREETYPE_MAJOR \
         | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
         | grep FREETYPE_MINOR \
         | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
-  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+  patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
         | grep FREETYPE_PATCH \
         | sed 's/.*[ 	]\([0-9][0-9]*\).*/\1/'`
  echo $major.$minor.$patch
@ -133,15 +133,11 @@ fi

 if test "$echo_cflags" = "yes" ; then
  cflags="-I${SYSROOT}$includedir/freetype2"
-  if test "${SYSROOT}$includedir" != "/usr/include" ; then
-    echo $cflags -I${SYSROOT}$includedir
-  else
-    echo $cflags
-  fi
+  echo $cflags
 fi

 if test "$echo_libs" = "yes" ; then
-  libs="-lfreetype %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%"
+  libs="-lfreetype %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%"
  if test "${SYSROOT}$libdir" != "/usr/lib"  &&
     test "${SYSROOT}$libdir" != "/usr/lib64"; then
    echo -L${SYSROOT}$libdir $libs
--- a/modules/freetype2/builds/unix/freetype2.in
+++ b/modules/freetype2/builds/unix/freetype2.in
@ -1,12 +1,12 @@
 prefix="%prefix%"
 exec_prefix="%exec_prefix%"
 libdir="%libdir%"
-includedir="%includedir%"
+includedir="%includedir%/freetype2"

 Name: FreeType 2
 Description: A free, high-quality, and portable font engine.
 Version: %ft_version%
 Requires:
 Libs: -L${libdir} -lfreetype
-Libs.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%
-Cflags: -I${includedir}/freetype2 -I${includedir}
+Libs.private: %LIBZ% %LIBBZ2% %LIBPNG% %FT2_EXTRA_LIBS%
+Cflags: -I${includedir}
--- a/modules/freetype2/builds/unix/ft2unix.h
+++ b/modules/freetype2/builds/unix/ft2unix.h
@ -1,61 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ft2build.h                                                             */
-/*                                                                         */
-/*    Build macros of the FreeType 2 library.                              */
-/*                                                                         */
-/*  Copyright 1996-2001, 2003, 2006 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 *after* installation of the library.                      */
-  /*                                                                       */
-  /* It assumes that `/usr/local/include/freetype2' (or whatever is        */
-  /* returned by the `freetype-config --cflags' or `pkg-config --cflags'   */
-  /* command) is in your compilation include path.                         */
-  /*                                                                       */
-  /* We don't need to do anything special in this release.  However, for   */
-  /* a future FreeType 2 release, the following installation changes will  */
-  /* be performed:                                                         */
-  /*                                                                       */
-  /*   - The contents of `freetype-2.x/include/freetype' will be installed */
-  /*     to `/usr/local/include/freetype2' instead of                      */
-  /*     `/usr/local/include/freetype2/freetype'.                          */
-  /*                                                                       */
-  /*   - This file will #include <freetype2/config/ftheader.h>, instead    */
-  /*     of <freetype/config/ftheader.h>.                                  */
-  /*                                                                       */
-  /*   - The contents of `ftheader.h' will be processed with `sed' to      */
-  /*     replace all `<freetype/xxx>' with `<freetype2/xxx>'.              */
-  /*                                                                       */
-  /*   - Adding `/usr/local/include/freetype2' to your compilation include */
-  /*     path will not be necessary anymore.                               */
-  /*                                                                       */
-  /* These changes will be transparent to client applications which use    */
-  /* freetype-config (or pkg-config).  No modifications will be necessary  */
-  /* to compile with the new scheme.                                       */
-  /*                                                                       */
-  /*************************************************************************/
-
-
-#ifndef __FT2_BUILD_UNIX_H__
-#define __FT2_BUILD_UNIX_H__
-
-  /* `<prefix>/include/freetype2' must be in your current inclusion path */
-#include <freetype/config/ftheader.h>
-
-#endif /* __FT2_BUILD_UNIX_H__ */
-
-
-/* END */
--- a/modules/freetype2/builds/unix/ftconfig.in
+++ b/modules/freetype2/builds/unix/ftconfig.in
@ -27,9 +27,9 @@
  /* Note however that if some specific modifications are needed, we       */
  /* advise you to place a modified copy in your build directory.          */
  /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
  /*                                                                       */
  /*************************************************************************/

@ -52,7 +52,7 @@ FT_BEGIN_HEADER
  /* These macros can be toggled to suit a specific system.  The current   */
  /* ones are defaults used to compile FreeType in an ANSI C environment   */
  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
  /*                                                                       */
  /*************************************************************************/

@ -86,7 +86,7 @@ FT_BEGIN_HEADER
 #else /* !FT_USE_AUTOCONF_SIZEOF_TYPES */

  /* Following cpp computation of the bit length of int and long */
-  /* is copied from default include/freetype/config/ftconfig.h.  */
+  /* is copied from default include/config/ftconfig.h.           */
  /* If any improvement is required for this file, it should be  */
  /* applied to the original header file for the builders that   */
  /* does not use configure script.                              */
@ -293,13 +293,15 @@ FT_BEGIN_HEADER

  /* FT_LONG64 must be defined if a 64-bit type is available */
 #define FT_LONG64
-#define FT_INT64  long
+#define FT_INT64   long
+#define FT_UINT64  unsigned long

 #elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */

  /* this compiler provides the __int64 type */
 #define FT_LONG64
-#define FT_INT64  __int64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64

 #elif defined( __BORLANDC__ )  /* Borland C++ */

@ -308,7 +310,8 @@ FT_BEGIN_HEADER

  /* this compiler provides the __int64 type */
 #define FT_LONG64
-#define FT_INT64  __int64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64

 #elif defined( __WATCOMC__ )   /* Watcom C++ */

@ -317,13 +320,15 @@ FT_BEGIN_HEADER
 #elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */

 #define FT_LONG64
-#define FT_INT64  long long int
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int

 #elif defined( __GNUC__ )

  /* GCC provides the `long long' type */
 #define FT_LONG64
-#define FT_INT64  long long int
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int

 #endif /* FT_SIZEOF_LONG == 8 */

@ -366,6 +371,7 @@ FT_BEGIN_HEADER
  /* These must be defined `static __inline__' with GCC.             */

 #if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm

  /* documentation is in freetype.h */
@ -395,8 +401,10 @@ FT_BEGIN_HEADER

 #ifdef __GNUC__

-#if defined( __arm__ ) && !defined( __thumb__ )    && \
+#if defined( __arm__ )                                 && \
+    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm

  /* documentation is in freetype.h */
@ -411,7 +419,11 @@ FT_BEGIN_HEADER
    __asm__ __volatile__ (
      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+#ifdef __clang__
+      "add.w  %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#else
      "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+#endif
      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
      "adc    %2, %2, #0\n\t"           /* %2 += carry */
      "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
@ -422,9 +434,13 @@ FT_BEGIN_HEADER
    return a;
  }

-#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
+#endif /* __arm__                      && */
+       /* ( __thumb2__ || !__thumb__ ) && */
+       /* !( __CC_ARM || __ARMCC__ )      */
+

 #if defined( __i386__ )
+
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386

  /* documentation is in freetype.h */
@ -493,6 +509,66 @@ FT_BEGIN_HEADER

 #endif /* _MSC_VER */

+
+#if defined( __GNUC__ ) && defined( __x86_64__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
+
+  static __inline__ FT_Int32
+  FT_MulFix_x86_64( FT_Int32  a,
+                    FT_Int32  b )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
+#if 1
+    /* Technically not an assembly fragment, but GCC does a really good */
+    /* job at inlining it and generating good machine code for it.      */
+    long long  ret, tmp;
+
+
+    ret  = (long long)a * b;
+    tmp  = ret >> 63;
+    ret += 0x8000 + tmp;
+
+    return (FT_Int32)( ret >> 16 );
+#else
+
+    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
+    /* code from the lines below.  The main issue is that `wide_a' is not  */
+    /* properly initialized by sign-extending `a'.  Instead, the generated */
+    /* machine code assumes that the register that contains `a' on input   */
+    /* can be used directly as a 64-bit value, which is wrong most of the  */
+    /* time.                                                               */
+    long long  wide_a = (long long)a;
+    long long  wide_b = (long long)b;
+    long long  result;
+
+
+    __asm__ __volatile__ (
+      "imul %2, %1\n"
+      "mov %1, %0\n"
+      "sar $63, %0\n"
+      "lea 0x8000(%1, %0), %0\n"
+      "sar $16, %0\n"
+      : "=&r"(result), "=&r"(wide_a)
+      : "r"(wide_b)
+      : "cc" );
+
+    return (FT_Int32)result;
+#endif
+
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic pop
+#endif
+  }
+
+#endif /* __GNUC__ && __x86_64__ */
+
 #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */


@ -520,6 +596,9 @@ FT_BEGIN_HEADER

 #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */

+#define FT_LOCAL_ARRAY( x )      extern const  x
+#define FT_LOCAL_ARRAY_DEF( x )  const  x
+

 #ifndef FT_BASE

--- a/modules/freetype2/builds/unix/ftsystem.c
+++ b/modules/freetype2/builds/unix/ftsystem.c
@ -268,9 +268,9 @@

    /* XXX: TODO -- real 64bit platform support                        */
    /*                                                                 */
-    /* `stream->size' is typedef'd to unsigned long (in                */
-    /* freetype/ftsystem.h); `stat_buf.st_size', however, is usually   */
-    /* typedef'd to off_t (in sys/stat.h).                             */
+    /* `stream->size' is typedef'd to unsigned long (in `ftsystem.h'); */
+    /* `stat_buf.st_size', however, is usually typedef'd to off_t      */
+    /* (in sys/stat.h).                                                */
    /* On some platforms, the former is 32bit and the latter is 64bit. */
    /* To avoid overflow caused by fonts in huge files larger than     */
    /* 2GB, do a test.  Temporary fix proposed by Sean McBride.        */
@ -317,7 +317,8 @@
      }

      total_read_count = 0;
-      do {
+      do
+      {
        ssize_t  read_count;


--- a/modules/freetype2/builds/unix/install.mk
+++ b/modules/freetype2/builds/unix/install.mk
@ -24,35 +24,34 @@

 # Unix installation and deinstallation targets.
 #
-# Note that we no longer install internal headers, and we remove any
-# `internal' subdirectory found in `$(includedir)/freetype2/freetype'.
+# Note that we remove any data in the `freetype' subdirectory found in
+# `$(includedir)/freetype2', which was the previous location of the header
+# files up to version 2.5.0.
 #
 install: $(PROJECT_LIBRARY)
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                               \
-                         $(DESTDIR)$(libdir)/pkgconfig                     \
-                         $(DESTDIR)$(includedir)/freetype2/freetype/config \
-                         $(DESTDIR)$(bindir)                               \
+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)                      \
+                         $(DESTDIR)$(libdir)/pkgconfig            \
+                         $(DESTDIR)$(includedir)/freetype2/config \
+                         $(DESTDIR)$(bindir)                      \
                         $(DESTDIR)$(datadir)/aclocal
 	$(LIBTOOL) --mode=install $(INSTALL)                             \
                                  $(PROJECT_LIBRARY) $(DESTDIR)$(libdir)
-	-for P in $(PUBLIC_H) ; do                           \
-          $(INSTALL_DATA)                                    \
-            $$P $(DESTDIR)$(includedir)/freetype2/freetype ; \
+	-for P in $(PUBLIC_H) ; do                  \
+          $(INSTALL_DATA)                           \
+            $$P $(DESTDIR)$(includedir)/freetype2 ; \
        done
-	-for P in $(CONFIG_H) ; do                                  \
-          $(INSTALL_DATA)                                           \
-            $$P $(DESTDIR)$(includedir)/freetype2/freetype/config ; \
+	-for P in $(CONFIG_H) ; do                         \
+          $(INSTALL_DATA)                                  \
+            $$P $(DESTDIR)$(includedir)/freetype2/config ; \
        done
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/cache/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/cache
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/internal/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/internal
-	$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
-          $(DESTDIR)$(includedir)/ft2build.h
-	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h                        \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h
-	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                          \
-          $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
+	$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h               \
+          $(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
+	$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h                 \
+          $(DESTDIR)$(includedir)/freetype2/config/ftmodule.h
 	$(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \
          $(DESTDIR)$(bindir)/freetype-config
 	$(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \
@ -63,12 +62,10 @@ install: $(PROJECT_LIBRARY)

 uninstall:
 	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY).$A
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/config/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/config/*
+	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/config
+	-$(DELETE) $(DESTDIR)$(includedir)/freetype2/*
 	-$(DELDIR) $(DESTDIR)$(includedir)/freetype2
-	-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
 	-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
 	-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
 	-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
--- a/modules/freetype2/builds/unix/unix-def.in
+++ b/modules/freetype2/builds/unix/unix-def.in
@ -63,6 +63,7 @@ version_info := @version_info@
 FT2_EXTRA_LIBS     := @FT2_EXTRA_LIBS@
 LIBBZ2             := @LIBBZ2@
 LIBZ               := @LIBZ@
+LIBPNG             := @LIBPNG@
 build_libtool_libs := @build_libtool_libs@
 ft_version         := @ft_version@

@ -102,6 +103,7 @@ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
 	sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \
 	    -e 's|%LIBZ%|$(LIBZ)|' \
+	    -e 's|%LIBPNG%|$(LIBPNG)|' \
 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
 	    -e 's|%exec_prefix%|$(exec_prefix)|' \
 	    -e 's|%ft_version%|$(ft_version)|' \
@ -119,6 +121,7 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
 	sed -e 's|%FT2_EXTRA_LIBS%|$(FT2_EXTRA_LIBS)|' \
 	    -e 's|%LIBBZ2%|$(LIBBZ2)|' \
 	    -e 's|%LIBZ%|$(LIBZ)|' \
+	    -e 's|%LIBPNG%|$(LIBPNG)|' \
 	    -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
 	    -e 's|%exec_prefix%|$(exec_prefix)|' \
 	    -e 's|%ft_version%|$(ft_version)|' \
@ -127,7 +130,6 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
 	    -e 's|%prefix%|$(prefix)|' \
 	    $< \
 	    > $@.tmp
-	chmod +x $@.tmp
 	chmod a-w $@.tmp
 	mv $@.tmp $@

--- a/modules/freetype2/builds/vms/ftconfig.h
+++ b/modules/freetype2/builds/vms/ftconfig.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    VMS-specific configuration file (specification only).                */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2011 by                                */
+/*  Copyright 1996-2004, 2006-2008, 2011, 2013 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -27,18 +27,15 @@
  /* Note however that if some specific modifications are needed, we       */
  /* advise you to place a modified copy in your build directory.          */
  /*                                                                       */
-  /* The build directory is usually `freetype/builds/<system>', and        */
-  /* contains system-specific files that are always included first when    */
-  /* building the library.                                                 */
+  /* The build directory is usually `builds/<system>', and contains        */
+  /* system-specific files that are always included first when building    */
+  /* the library.                                                          */
  /*                                                                       */
  /*************************************************************************/

-
 #ifndef __FTCONFIG_H__
 #define __FTCONFIG_H__

-
-  /* Include the header file containing all developer build options */
 #include <ft2build.h>
 #include FT_CONFIG_OPTIONS_H
 #include FT_CONFIG_STANDARD_LIBRARY_H
@ -46,6 +43,7 @@

 FT_BEGIN_HEADER

+
  /*************************************************************************/
  /*                                                                       */
  /*               PLATFORM-SPECIFIC CONFIGURATION MACROS                  */
@ -53,7 +51,7 @@ FT_BEGIN_HEADER
  /* These macros can be toggled to suit a specific system.  The current   */
  /* ones are defaults used to compile FreeType in an ANSI C environment   */
  /* (16bit compilers are also supported).  Copy this file to your own     */
-  /* `freetype/builds/<system>' directory, and edit it to port the engine. */
+  /* `builds/<system>' directory, and edit it to port the engine.          */
  /*                                                                       */
  /*************************************************************************/

@ -120,19 +118,95 @@ FT_BEGIN_HEADER

  /*************************************************************************/
  /*                                                                       */
-  /* IntN types                                                            */
+  /* <Section>                                                             */
+  /*    basic_types                                                        */
  /*                                                                       */
-  /*   Used to guarantee the size of some specific integers.               */
+  /*************************************************************************/
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int16                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 16bit signed integer type.                         */
+  /*                                                                       */
+  typedef signed short  FT_Int16;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt16                                                          */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 16bit unsigned integer type.                       */
  /*                                                                       */
-  typedef signed short    FT_Int16;
  typedef unsigned short  FT_UInt16;

-#if FT_SIZEOF_INT == 4
+  /* */
+
+
+  /* this #if 0 ... #endif clause is for documentation purposes */
+#if 0
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int32                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for a 32bit signed integer type.  The size depends on    */
+  /*    the configuration.                                                 */
+  /*                                                                       */
+  typedef signed XXX  FT_Int32;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt32                                                          */
+  /*                                                                       */
+  /*    A typedef for a 32bit unsigned integer type.  The size depends on  */
+  /*    the configuration.                                                 */
+  /*                                                                       */
+  typedef unsigned XXX  FT_UInt32;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Int64                                                           */
+  /*                                                                       */
+  /*    A typedef for a 64bit signed integer type.  The size depends on    */
+  /*    the configuration.  Only defined if there is real 64bit support;   */
+  /*    otherwise, it gets emulated with a structure (if necessary).       */
+  /*                                                                       */
+  typedef signed XXX  FT_Int64;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_UInt64                                                          */
+  /*                                                                       */
+  /*    A typedef for a 64bit unsigned integer type.  The size depends on  */
+  /*    the configuration.  Only defined if there is real 64bit support;   */
+  /*    otherwise, it gets emulated with a structure (if necessary).       */
+  /*                                                                       */
+  typedef unsigned XXX  FT_UInt64;
+
+  /* */
+
+#endif
+
+#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT)

  typedef signed int      FT_Int32;
  typedef unsigned int    FT_UInt32;

-#elif FT_SIZEOF_LONG == 4
+#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT)

  typedef signed long     FT_Int32;
  typedef unsigned long   FT_UInt32;
@ -141,13 +215,14 @@ FT_BEGIN_HEADER
 #error "no 32bit type found -- please check your configuration files"
 #endif

+
  /* look up an integer type that is at least 32 bits */
-#if FT_SIZEOF_INT >= 4
+#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT)

  typedef int            FT_Fast;
  typedef unsigned int   FT_UFast;

-#elif FT_SIZEOF_LONG >= 4
+#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT)

  typedef long           FT_Fast;
  typedef unsigned long  FT_UFast;
@ -157,17 +232,19 @@ FT_BEGIN_HEADER

  /* determine whether we have a 64-bit int type for platforms without */
  /* Autoconf                                                          */
-#if FT_SIZEOF_LONG == 8
+#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT)

  /* FT_LONG64 must be defined if a 64-bit type is available */
 #define FT_LONG64
-#define FT_INT64  long
+#define FT_INT64   long
+#define FT_UINT64  unsigned long

 #elif defined( _MSC_VER ) && _MSC_VER >= 900  /* Visual C++ (and Intel C++) */

  /* this compiler provides the __int64 type */
 #define FT_LONG64
-#define FT_INT64  __int64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64

 #elif defined( __BORLANDC__ )  /* Borland C++ */

@ -176,7 +253,8 @@ FT_BEGIN_HEADER

  /* this compiler provides the __int64 type */
 #define FT_LONG64
-#define FT_INT64  __int64
+#define FT_INT64   __int64
+#define FT_UINT64  unsigned __int64

 #elif defined( __WATCOMC__ )   /* Watcom C++ */

@ -185,28 +263,25 @@ FT_BEGIN_HEADER
 #elif defined( __MWERKS__ )    /* Metrowerks CodeWarrior */

 #define FT_LONG64
-#define FT_INT64  long long int
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int

 #elif defined( __GNUC__ )

  /* GCC provides the `long long' type */
 #define FT_LONG64
-#define FT_INT64  long long int
+#define FT_INT64   long long int
+#define FT_UINT64  unsigned long long int

-#endif /* FT_SIZEOF_LONG == 8 */
-
-
-#define FT_BEGIN_STMNT  do {
-#define FT_END_STMNT    } while ( 0 )
-#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
+#endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */


  /*************************************************************************/
  /*                                                                       */
  /* A 64-bit data type will create compilation problems if you compile    */
-  /* in strict ANSI mode.  To avoid them, we disable their use if          */
-  /* __STDC__ is defined.  You can however ignore this rule by             */
-  /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro.        */
+  /* in strict ANSI mode.  To avoid them, we disable its use if __STDC__   */
+  /* is defined.  You can however ignore this rule by defining the         */
+  /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro.                     */
  /*                                                                       */
 #if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )

@ -220,6 +295,225 @@ FT_BEGIN_HEADER

 #endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */

+#ifdef FT_LONG64
+  typedef FT_INT64   FT_Int64;
+  typedef FT_UINT64  FT_UInt64;
+#endif
+
+
+#define FT_BEGIN_STMNT  do {
+#define FT_END_STMNT    } while ( 0 )
+#define FT_DUMMY_STMNT  FT_BEGIN_STMNT FT_END_STMNT
+
+
+#ifndef  FT_CONFIG_OPTION_NO_ASSEMBLER
+  /* Provide assembler fragments for performance-critical functions. */
+  /* These must be defined `static __inline__' with GCC.             */
+
+#if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm
+    {
+      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
+      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
+      add   a,  a,  #0x8000         /* a  += 0x8000 */
+      adds  t2, t2, a               /* t2 += a */
+      adc   t,  t,  #0              /* t  += carry */
+      mov   a,  t2, lsr #16         /* a   = t2 >> 16 */
+      orr   a,  a,  t,  lsl #16     /* a  |= t << 16 */
+    }
+    return a;
+  }
+
+#endif /* __CC_ARM || __ARMCC__ */
+
+
+#ifdef __GNUC__
+
+#if defined( __arm__ )                                 && \
+    ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \
+    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline__ FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm__ __volatile__ (
+      "smull  %1, %2, %4, %3\n\t"       /* (lo=%1,hi=%2) = a*b */
+      "mov    %0, %2, asr #31\n\t"      /* %0  = (hi >> 31) */
+      "add    %0, %0, #0x8000\n\t"      /* %0 += 0x8000 */
+      "adds   %1, %1, %0\n\t"           /* %1 += %0 */
+      "adc    %2, %2, #0\n\t"           /* %2 += carry */
+      "mov    %0, %1, lsr #16\n\t"      /* %0  = %1 >> 16 */
+      "orr    %0, %0, %2, lsl #16\n\t"  /* %0 |= %2 << 16 */
+      : "=r"(a), "=&r"(t2), "=&r"(t)
+      : "r"(a), "r"(b)
+      : "cc" );
+    return a;
+  }
+
+#endif /* __arm__                      && */
+       /* ( __thumb2__ || !__thumb__ ) && */
+       /* !( __CC_ARM || __ARMCC__ )      */
+
+
+#if defined( __i386__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline__ FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+
+    __asm__ __volatile__ (
+      "imul  %%edx\n"
+      "movl  %%edx, %%ecx\n"
+      "sarl  $31, %%ecx\n"
+      "addl  $0x8000, %%ecx\n"
+      "addl  %%ecx, %%eax\n"
+      "adcl  $0, %%edx\n"
+      "shrl  $16, %%eax\n"
+      "shll  $16, %%edx\n"
+      "addl  %%edx, %%eax\n"
+      : "=a"(result), "=d"(b)
+      : "a"(a), "d"(b)
+      : "%ecx", "cc" );
+    return result;
+  }
+
+#endif /* i386 */
+
+#endif /* __GNUC__ */
+
+
+#ifdef _MSC_VER /* Visual C++ */
+
+#ifdef _M_IX86
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+    __asm
+    {
+      mov eax, a
+      mov edx, b
+      imul edx
+      mov ecx, edx
+      sar ecx, 31
+      add ecx, 8000h
+      add eax, ecx
+      adc edx, 0
+      shr eax, 16
+      shl edx, 16
+      add eax, edx
+      mov result, eax
+    }
+    return result;
+  }
+
+#endif /* _M_IX86 */
+
+#endif /* _MSC_VER */
+
+
+#if defined( __GNUC__ ) && defined( __x86_64__ )
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_x86_64
+
+  static __inline__ FT_Int32
+  FT_MulFix_x86_64( FT_Int32  a,
+                    FT_Int32  b )
+  {
+    /* Temporarily disable the warning that C90 doesn't support */
+    /* `long long'.                                             */
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wlong-long"
+#endif
+
+#if 1
+    /* Technically not an assembly fragment, but GCC does a really good */
+    /* job at inlining it and generating good machine code for it.      */
+    long long  ret, tmp;
+
+
+    ret  = (long long)a * b;
+    tmp  = ret >> 63;
+    ret += 0x8000 + tmp;
+
+    return (FT_Int32)( ret >> 16 );
+#else
+
+    /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine  */
+    /* code from the lines below.  The main issue is that `wide_a' is not  */
+    /* properly initialized by sign-extending `a'.  Instead, the generated */
+    /* machine code assumes that the register that contains `a' on input   */
+    /* can be used directly as a 64-bit value, which is wrong most of the  */
+    /* time.                                                               */
+    long long  wide_a = (long long)a;
+    long long  wide_b = (long long)b;
+    long long  result;
+
+
+    __asm__ __volatile__ (
+      "imul %2, %1\n"
+      "mov %1, %0\n"
+      "sar $63, %0\n"
+      "lea 0x8000(%1, %0), %0\n"
+      "sar $16, %0\n"
+      : "=&r"(result), "=&r"(wide_a)
+      : "r"(wide_b)
+      : "cc" );
+
+    return (FT_Int32)result;
+#endif
+
+#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
+#pragma GCC diagnostic pop
+#endif
+  }
+
+#endif /* __GNUC__ && __x86_64__ */
+
+#endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */
+
+
+#ifdef FT_CONFIG_OPTION_INLINE_MULFIX
+#ifdef FT_MULFIX_ASSEMBLER
+#define FT_MULFIX_INLINED  FT_MULFIX_ASSEMBLER
+#endif
+#endif
+

 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT

@ -238,6 +532,9 @@ FT_BEGIN_HEADER

 #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */

+#define FT_LOCAL_ARRAY( x )      extern const  x
+#define FT_LOCAL_ARRAY_DEF( x )  const  x
+

 #ifndef FT_BASE

@ -253,9 +550,9 @@ FT_BEGIN_HEADER
 #ifndef FT_BASE_DEF

 #ifdef __cplusplus
-#define FT_BASE_DEF( x )  extern "C"  x
+#define FT_BASE_DEF( x )  x
 #else
-#define FT_BASE_DEF( x )  extern  x
+#define FT_BASE_DEF( x )  x
 #endif

 #endif /* !FT_BASE_DEF */
--- a/modules/freetype2/builds/wince/ftdebug.c
+++ b/modules/freetype2/builds/wince/ftdebug.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for WinCE (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by                   */
+/*  Copyright 1996-2002, 2005, 2008, 2009, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -148,8 +148,8 @@
  /* for the memory and stream components which are set to 6 and 5,        */
  /* respectively.                                                         */
  /*                                                                       */
-  /* See the file <freetype/internal/fttrace.h> for details of the         */
-  /* available toggle names.                                               */
+  /* See the file <internal/fttrace.h> for details of the available toggle */
+  /* names.                                                                */
  /*                                                                       */
  /* The level must be between 0 and 6; 0 means quiet (except for serious  */
  /* runtime errors), and 6 means _very_ verbose.                          */
--- a/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj
+++ b/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj
@ -21,7 +21,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -41,7 +41,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -61,7 +61,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -81,7 +81,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -101,7 +101,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -121,7 +121,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -141,7 +141,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -161,7 +161,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -181,7 +181,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -201,7 +201,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -221,7 +221,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -241,7 +241,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -261,7 +261,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -281,7 +281,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -301,7 +301,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -321,7 +321,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -341,7 +341,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -361,7 +361,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -381,7 +381,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -401,7 +401,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -421,7 +421,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -441,7 +441,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -461,7 +461,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -481,7 +481,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -501,7 +501,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -521,7 +521,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -541,7 +541,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -561,7 +561,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -581,7 +581,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -601,7 +601,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -621,7 +621,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -641,7 +641,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -661,7 +661,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -681,7 +681,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -701,7 +701,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -721,7 +721,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -741,7 +741,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -758,7 +758,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -3822,15 +3822,15 @@
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
      <File RelativePath="..\..\..\include\ft2build.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
+      <File RelativePath="..\..\..\include\config\ftconfig.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftheader.h">
+      <File RelativePath="..\..\..\include\config\ftheader.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
+      <File RelativePath="..\..\..\include\config\ftmodule.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftoption.h">
+      <File RelativePath="..\..\..\include\config\ftoption.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
+      <File RelativePath="..\..\..\include\config\ftstdlib.h">
      </File>
    </Filter>
  </Files>
--- a/modules/freetype2/builds/wince/vc2005-ce/index.html
+++ b/modules/freetype2/builds/wince/vc2005-ce/index.html
@ -21,14 +21,14 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>

-It compiles the following libraries from the FreeType 2.5.0 sources:</p>
+It compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype252.lib     - release build; single threaded
+    freetype252_D.lib   - debug build;   single threaded
+    freetype252MT.lib   - release build; multi-threaded
+    freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
--- a/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj
+++ b/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj
@ -88,7 +88,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -177,7 +177,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -266,7 +266,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -444,7 +444,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -533,7 +533,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -709,7 +709,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -797,7 +797,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -885,7 +885,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -973,7 +973,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1061,7 +1061,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1149,7 +1149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1236,7 +1236,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1323,7 +1323,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1410,7 +1410,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1497,7 +1497,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1584,7 +1584,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1668,7 +1668,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1753,7 +1753,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1838,7 +1838,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1923,7 +1923,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2008,7 +2008,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2093,7 +2093,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2178,7 +2178,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2263,7 +2263,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2348,7 +2348,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2433,7 +2433,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2518,7 +2518,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2603,7 +2603,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2689,7 +2689,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2775,7 +2775,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2861,7 +2861,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2947,7 +2947,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3033,7 +3033,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3119,7 +3119,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3205,7 +3205,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3279,7 +3279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -13469,23 +13469,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
--- a/modules/freetype2/builds/wince/vc2008-ce/index.html
+++ b/modules/freetype2/builds/wince/vc2008-ce/index.html
@ -21,14 +21,14 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>

-It compiles the following libraries from the FreeType 2.5.0 sources:</p>
+It compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype252.lib     - release build; single threaded
+    freetype252_D.lib   - debug build;   single threaded
+    freetype252MT.lib   - release build; multi-threaded
+    freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
--- a/modules/freetype2/builds/windows/detect.mk
+++ b/modules/freetype2/builds/windows/detect.mk
--- a/modules/freetype2/builds/windows/ftdebug.c
+++ b/modules/freetype2/builds/windows/ftdebug.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Debugging and logging component for Win32 (body).                    */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2005, 2008, 2009, 2013 by                   */
+/*  Copyright 1996-2002, 2005, 2008, 2009, 2013 by                         */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -137,8 +137,8 @@
  /* for the memory and stream components which are set to 6 and 5,        */
  /* respectively.                                                         */
  /*                                                                       */
-  /* See the file <freetype/internal/fttrace.h> for details of the         */
-  /* available toggle names.                                               */
+  /* See the file <internal/fttrace.h> for details of the available toggle */
+  /* names.                                                                */
  /*                                                                       */
  /* The level must be between 0 and 6; 0 means quiet (except for serious  */
  /* runtime errors), and 6 means _very_ verbose.                          */
--- a/modules/freetype2/builds/windows/vc2005/freetype.sln
+++ b/modules/freetype2/builds/windows/vc2005/freetype.sln
--- a/modules/freetype2/builds/windows/vc2005/freetype.vcproj
+++ b/modules/freetype2/builds/windows/vc2005/freetype.vcproj
@ -16,7 +16,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -33,7 +33,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252MT.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -50,7 +50,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252ST.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -67,7 +67,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -84,7 +84,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252ST_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -101,7 +101,7 @@
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype250MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype252MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -629,15 +629,15 @@
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl">
      <File RelativePath="..\..\..\include\ft2build.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftconfig.h">
+      <File RelativePath="..\..\..\include\config\ftconfig.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftheader.h">
+      <File RelativePath="..\..\..\include\config\ftheader.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftmodule.h">
+      <File RelativePath="..\..\..\include\config\ftmodule.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftoption.h">
+      <File RelativePath="..\..\..\include\config\ftoption.h">
      </File>
-      <File RelativePath="..\..\..\include\freetype\config\ftstdlib.h">
+      <File RelativePath="..\..\..\include\config\ftstdlib.h">
      </File>
    </Filter>
  </Files>
--- a/modules/freetype2/builds/windows/vc2005/index.html
+++ b/modules/freetype2/builds/windows/vc2005/index.html
@ -11,14 +11,14 @@

 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype252.lib     - release build; single threaded
+    freetype252_D.lib   - debug build;   single threaded
+    freetype252MT.lib   - release build; multi-threaded
+    freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
--- a/modules/freetype2/builds/windows/vc2008/freetype.sln
+++ b/modules/freetype2/builds/windows/vc2008/freetype.sln
--- a/modules/freetype2/builds/windows/vc2008/freetype.vcproj
+++ b/modules/freetype2/builds/windows/vc2008/freetype.vcproj
@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250MT.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -220,7 +220,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250ST.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -365,7 +365,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -439,7 +439,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2154,23 +2154,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
--- a/modules/freetype2/builds/windows/vc2008/index.html
+++ b/modules/freetype2/builds/windows/vc2008/index.html
@ -11,14 +11,14 @@

 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype252.lib     - release build; single threaded
+    freetype252_D.lib   - debug build;   single threaded
+    freetype252MT.lib   - release build; multi-threaded
+    freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
--- a/modules/freetype2/builds/windows/vc2010/freetype.sln
+++ b/modules/freetype2/builds/windows/vc2010/freetype.sln
@ -1,30 +1,48 @@

 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual Studio Express 2012 for Windows Desktop
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Multithreaded|Win32 = Debug Multithreaded|Win32
+		Debug Multithreaded|x64 = Debug Multithreaded|x64
 		Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32
+		Debug Singlethreaded|x64 = Debug Singlethreaded|x64
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release Multithreaded|Win32 = Release Multithreaded|Win32
+		Release Multithreaded|x64 = Release Multithreaded|x64
 		Release Singlethreaded|Win32 = Release Singlethreaded|Win32
+		Release Singlethreaded|x64 = Release Singlethreaded|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Multithreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Multithreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/modules/freetype2/builds/windows/vc2010/freetype.vcxproj
+++ b/modules/freetype2/builds/windows/vc2010/freetype.vcxproj
--- a/modules/freetype2/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/modules/freetype2/builds/windows/vc2010/freetype.vcxproj.filters
@ -136,19 +136,19 @@
    <ClInclude Include="..\..\..\include\ft2build.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftconfig.h">
+    <ClInclude Include="..\..\..\include\config\ftconfig.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftheader.h">
+    <ClInclude Include="..\..\..\include\config\ftheader.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftmodule.h">
+    <ClInclude Include="..\..\..\include\config\ftmodule.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftoption.h">
+    <ClInclude Include="..\..\..\include\config\ftoption.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\include\freetype\config\ftstdlib.h">
+    <ClInclude Include="..\..\..\include\config\ftstdlib.h">
      <Filter>Header Files</Filter>
    </ClInclude>
  </ItemGroup>
--- a/modules/freetype2/builds/windows/vc2010/index.html
+++ b/modules/freetype2/builds/windows/vc2010/index.html
@ -1,26 +1,30 @@
 <html>
 <header>
 <title>
-  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010
+  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
 </title>

 <body>
 <h1>
-  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010
+  FreeType&nbsp;2 Project Files for VS.NET&nbsp;2010 or newer
 </h1>

-<p>This directory contains a project file for Visual C++, named
-<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+<p>This directory contains a project file for Visual C++ newer), named
+<tt>freetype.vcxproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.
+It compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+freetype252.lib     - release build
+freetype252_D.lib   - debug build
+freetype252ST.lib   - release build; single threaded
+freetype252ST_D.lib - debug build;   single threaded
+freetype252MT.lib   - release build; multi-threaded
+freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

+<p>Both Win32 and x64 builds are supported.</p>
+
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
--- a/modules/freetype2/builds/windows/visualc/freetype.dsp
+++ b/modules/freetype2/builds/windows/visualc/freetype.dsp
@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"

@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"

@ -92,7 +92,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\debug_mt"
 # PROP Intermediate_Dir "..\..\..\objs\debug_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
 # SUBTRACT BASE CPP /X
 # ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c
 # SUBTRACT CPP /nologo /X /YX
@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype252_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT_D.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"

@ -117,7 +117,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\release_mt"
 # PROP Intermediate_Dir "..\..\..\objs\release_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
+# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
 # ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c
 # SUBTRACT CPP /nologo /Z<none> /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype252.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"

@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype250ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype252ST.lib"
 # SUBTRACT LIB32 /nologo

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252ST_D.lib"

 !ENDIF 

@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftconfig.h
+SOURCE=..\..\..\include\config\ftconfig.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftheader.h
+SOURCE=..\..\..\include\config\ftheader.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftmodule.h
+SOURCE=..\..\..\include\config\ftmodule.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftoption.h
+SOURCE=..\..\..\include\config\ftoption.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftstdlib.h
+SOURCE=..\..\..\include\config\ftstdlib.h
 # End Source File
 # End Group
 # End Target
--- a/modules/freetype2/builds/windows/visualc/freetype.dsw
+++ b/modules/freetype2/builds/windows/visualc/freetype.dsw
--- a/modules/freetype2/builds/windows/visualc/freetype.sln
+++ b/modules/freetype2/builds/windows/visualc/freetype.sln
--- a/modules/freetype2/builds/windows/visualc/freetype.vcproj
+++ b/modules/freetype2/builds/windows/visualc/freetype.vcproj
@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2153,23 +2153,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
--- a/modules/freetype2/builds/windows/visualc/index.html
+++ b/modules/freetype2/builds/windows/visualc/index.html
@ -11,14 +11,14 @@

 <p>This directory contains project files for Visual C++, named
 <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.5.0 sources:</p>
+compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype252.lib     - release build; single threaded
+    freetype252_D.lib   - debug build;   single threaded
+    freetype252MT.lib   - release build; multi-threaded
+    freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
--- a/modules/freetype2/builds/windows/visualce/freetype.dsp
+++ b/modules/freetype2/builds/windows/visualce/freetype.dsp
@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"

@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"

@ -92,7 +92,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\debug_mt"
 # PROP Intermediate_Dir "..\..\..\objs\debug_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c
 # SUBTRACT BASE CPP /X
 # ADD CPP /MTd /Za /W4 /GX /Z7 /Od /I "..\..\..\include" /D "_DEBUG" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /GZ /c
 # SUBTRACT CPP /nologo /X /YX
@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype252_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT_D.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"

@ -117,7 +117,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\..\objs\release_mt"
 # PROP Intermediate_Dir "..\..\..\objs\release_mt"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
+# ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c
 # ADD CPP /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT2_BUILD_LIBRARY" /FD /c
 # SUBTRACT CPP /nologo /Z<none> /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype250.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype252.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252MT.lib"

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"

@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype250ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype252ST.lib"
 # SUBTRACT LIB32 /nologo

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype250_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype250ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype252_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype252ST_D.lib"

 !ENDIF 

@ -377,23 +377,23 @@ SOURCE=..\..\..\include\ft2build.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftconfig.h
+SOURCE=..\..\..\include\config\ftconfig.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftheader.h
+SOURCE=..\..\..\include\config\ftheader.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftmodule.h
+SOURCE=..\..\..\include\config\ftmodule.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftoption.h
+SOURCE=..\..\..\include\config\ftoption.h
 # End Source File
 # Begin Source File

-SOURCE=..\..\..\include\freetype\config\ftstdlib.h
+SOURCE=..\..\..\include\config\ftstdlib.h
 # End Source File
 # End Group
 # End Target
--- a/modules/freetype2/builds/windows/visualce/freetype.dsw
+++ b/modules/freetype2/builds/windows/visualce/freetype.dsw
--- a/modules/freetype2/builds/windows/visualce/freetype.vcproj
+++ b/modules/freetype2/builds/windows/visualce/freetype.vcproj
@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -456,7 +456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -619,7 +619,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -704,7 +704,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -867,7 +867,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -950,7 +950,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1036,7 +1036,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1121,7 +1121,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1206,7 +1206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1287,7 +1287,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1369,7 +1369,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1452,7 +1452,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1538,7 +1538,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1623,7 +1623,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1708,7 +1708,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1789,7 +1789,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1871,7 +1871,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1954,7 +1954,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2040,7 +2040,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2125,7 +2125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2210,7 +2210,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -2291,7 +2291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2373,7 +2373,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2456,7 +2456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2542,7 +2542,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2627,7 +2627,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2712,7 +2712,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -2793,7 +2793,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2875,7 +2875,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2958,7 +2958,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3044,7 +3044,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250.lib"
+				OutputFile="..\..\..\objs\freetype252.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3129,7 +3129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT.lib"
+				OutputFile="..\..\..\objs\freetype252MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3214,7 +3214,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST.lib"
+				OutputFile="..\..\..\objs\freetype252ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -3295,7 +3295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250_D.lib"
+				OutputFile="..\..\..\objs\freetype252_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3377,7 +3377,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250ST_D.lib"
+				OutputFile="..\..\..\objs\freetype252ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3460,7 +3460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype250MT_D.lib"
+				OutputFile="..\..\..\objs\freetype252MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -13859,23 +13859,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftconfig.h"
+				RelativePath="..\..\..\include\config\ftconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftheader.h"
+				RelativePath="..\..\..\include\config\ftheader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftmodule.h"
+				RelativePath="..\..\..\include\config\ftmodule.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftoption.h"
+				RelativePath="..\..\..\include\config\ftoption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\include\freetype\config\ftstdlib.h"
+				RelativePath="..\..\..\include\config\ftstdlib.h"
 				>
 			</File>
 		</Filter>
--- a/modules/freetype2/builds/windows/visualce/index.html
+++ b/modules/freetype2/builds/windows/visualce/index.html
@ -21,14 +21,14 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>

-It compiles the following libraries from the FreeType 2.5.0 sources:</p>
+It compiles the following libraries from the FreeType 2.5.2 sources:</p>

 <ul>
  <pre>
-    freetype250.lib     - release build; single threaded
-    freetype250_D.lib   - debug build;   single threaded
-    freetype250MT.lib   - release build; multi-threaded
-    freetype250MT_D.lib - debug build;   multi-threaded</pre>
+    freetype252.lib     - release build; single threaded
+    freetype252_D.lib   - debug build;   single threaded
+    freetype252MT.lib   - release build; multi-threaded
+    freetype252MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
--- a/modules/freetype2/builds/windows/w32-bcc.mk
+++ b/modules/freetype2/builds/windows/w32-bcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -wB

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/bcc.mk

 # include linking instructions
--- a/modules/freetype2/builds/windows/w32-bccd.mk
+++ b/modules/freetype2/builds/windows/w32-bccd.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2006 by
+# Copyright 1996-2000, 2003, 2006, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -15,7 +15,7 @@

 DEVEL_DIR := $(TOP_DIR)/devel

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk

 include $(TOP_DIR)/builds/compiler/bcc-dev.mk

--- a/modules/freetype2/builds/windows/w32-dev.mk
+++ b/modules/freetype2/builds/windows/w32-dev.mk
@ -5,7 +5,7 @@
 #


-# Copyright 1996-2000, 2003, 2006 by
+# Copyright 1996-2000, 2003, 2006, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -21,7 +21,7 @@

 DEVEL_DIR := $(TOP_DIR)/devel

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk

 include $(TOP_DIR)/builds/compiler/gcc-dev.mk

--- a/modules/freetype2/builds/windows/w32-gcc.mk
+++ b/modules/freetype2/builds/windows/w32-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -19,7 +19,7 @@ EXPORTS_OPTIONS   = $(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w

 # include Win32-specific definitions
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk

 # include gcc-specific definitions
 include $(TOP_DIR)/builds/compiler/gcc.mk
--- a/modules/freetype2/builds/windows/w32-icc.mk
+++ b/modules/freetype2/builds/windows/w32-icc.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2005 by
+# Copyright 1996-2000, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/visualage.mk

 # include linking instructions
--- a/modules/freetype2/builds/windows/w32-intl.mk
+++ b/modules/freetype2/builds/windows/w32-intl.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/intelc.mk

 # include linking instructions
--- a/modules/freetype2/builds/windows/w32-lcc.mk
+++ b/modules/freetype2/builds/windows/w32-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000 by
+# Copyright 1996-2000, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -14,7 +14,7 @@


 SEP := /
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/win-lcc.mk

 # include linking instructions
--- a/modules/freetype2/builds/windows/w32-mingw32.mk
+++ b/modules/freetype2/builds/windows/w32-mingw32.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -19,7 +19,7 @@ EXPORTS_OPTIONS   = $(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w

 # include Win32-specific definitions
-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk

 LIBRARY := lib$(PROJECT)

--- a/modules/freetype2/builds/windows/w32-vcc.mk
+++ b/modules/freetype2/builds/windows/w32-vcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/freetype.def
 EXPORTS_OPTIONS   = /DEF:$(EXPORTS_LIST)
 APINAMES_OPTIONS := -dfreetype.dll -w

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/visualc.mk

 # include linking instructions
--- a/modules/freetype2/builds/windows/w32-wat.mk
+++ b/modules/freetype2/builds/windows/w32-wat.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005 by
+# Copyright 1996-2000, 2003, 2005, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -18,7 +18,7 @@ EXPORTS_LIST      = $(OBJ_DIR)/watcom-ftexports.lbc
 EXPORTS_OPTIONS   = -\"export @$(EXPORTS_LIST)\"-
 APINAMES_OPTIONS := -wW

-include $(TOP_DIR)/builds/win32/win32-def.mk
+include $(TOP_DIR)/builds/windows/win32-def.mk
 include $(TOP_DIR)/builds/compiler/watcom.mk

 # include linking instructions
--- a/modules/freetype2/builds/windows/win32-def.mk
+++ b/modules/freetype2/builds/windows/win32-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright 1996-2000, 2003, 2005, 2006 by
+# Copyright 1996-2000, 2003, 2005, 2006, 2013 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -16,7 +16,7 @@
 DELETE    := del
 CAT       := type
 SEP       := $(strip \ )
-BUILD_DIR := $(TOP_DIR)/builds/win32
+BUILD_DIR := $(TOP_DIR)/builds/windows
 PLATFORM  := win32

 # The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!
--- a/modules/freetype2/devel/ft2build.h
+++ b/modules/freetype2/devel/ft2build.h
@ -2,10 +2,9 @@
 /*                                                                         */
 /*  ft2build.h                                                             */
 /*                                                                         */
-/*    FreeType 2 build and setup macros.                                   */
-/*    (Generic version)                                                    */
+/*    FreeType 2 build and setup macros (development version).             */
 /*                                                                         */
-/*  Copyright 1996-2001, 2003, 2006 by                                     */
+/*  Copyright 1996-2001, 2003, 2006, 2013 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@ -18,24 +17,24 @@


 /*
-  *  This is a development version of <ft2build.h> that is used
-  *  to build the library in debug mode.  Its only difference with
-  *  the reference is that it forces the use of the local `ftoption.h'
-  *  which contains different settings for all configuration macros.
+  *  This is a development version of <ft2build.h> to build the library in
+  *  debug mode.  Its only difference to the default version is that it
+  *  includes a local `ftoption.h' header file with different settings for
+  *  many configuration macros.
+  *
+  *  To use it, simply ensure that the directory containing this file is
+  *  scanned by the compiler before the default FreeType header directory.
  *
-  *  To use it, you must define the environment variable FT2_BUILD_INCLUDE
-  *  to point to the directory containing these two files (`ft2build.h' and
-  *  `ftoption.h'), then invoke Jam as usual.
  */

-#ifndef __FT2_BUILD_DEVEL_H__
-#define __FT2_BUILD_DEVEL_H__
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__

-#define  FT_CONFIG_OPTIONS_H   <ftoption.h>
+#define FT_CONFIG_OPTIONS_H  <ftoption.h>

-#include <freetype/config/ftheader.h>
+#include <config/ftheader.h>

-#endif /* __FT2_BUILD_DEVEL_H__ */
+#endif /* __FT2BUILD_H__ */


 /* END */
--- a/modules/freetype2/devel/ftoption.h
+++ b/modules/freetype2/devel/ftoption.h
@ -38,9 +38,9 @@ FT_BEGIN_HEADER
  /*    library from a single source directory.                            */
  /*                                                                       */
  /*  - You can put a copy of this file in your build directory, more      */
-  /*    precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD'   */
-  /*    is the name of a directory that is included _before_ the FreeType  */
-  /*    include path during compilation.                                   */
+  /*    precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the     */
+  /*    name of a directory that is included _before_ the FreeType include */
+  /*    path during compilation.                                           */
  /*                                                                       */
  /*    The default FreeType Makefiles and Jamfiles use the build          */
  /*    directory `builds/<system>' by default, but you can easily change  */
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
  /*    locate this file during the build.  For example,                   */
  /*                                                                       */
  /*      #define FT_CONFIG_OPTIONS_H  <myftoptions.h>                     */
-  /*      #include <freetype/config/ftheader.h>                            */
+  /*      #include <config/ftheader.h>                                     */
  /*                                                                       */
  /*    will use `$BUILD/myftoptions.h' instead of this file for macro     */
  /*    definitions.                                                       */
@ -59,7 +59,7 @@ FT_BEGIN_HEADER
  /*    Note also that you can similarly pre-define the macro              */
  /*    FT_CONFIG_MODULES_H used to locate the file listing of the modules */
  /*    that are statically linked to the library at compile time.  By     */
-  /*    default, this file is <freetype/config/ftmodule.h>.                */
+  /*    default, this file is <config/ftmodule.h>.                         */
  /*                                                                       */
  /*  We highly recommend using the third method whenever possible.        */
  /*                                                                       */
@ -528,7 +528,7 @@ FT_BEGIN_HEADER
  /* does not contain any glyph name though.                               */
  /*                                                                       */
  /* Accessing SFNT names is done through the functions declared in        */
-  /* `freetype/ftsnames.h'.                                                */
+  /* `ftsnames.h'.                                                         */
  /*                                                                       */
 #define TT_CONFIG_OPTION_SFNT_NAMES

--- a/modules/freetype2/docs/CHANGES
+++ b/modules/freetype2/docs/CHANGES
@ -1,4 +1,132 @@

+CHANGES BETWEEN 2.5.1 and 2.5.2
+
+  I. IMPORTANT BUG FIXES
+
+    - Improving the display of some broken TrueType fonts introduced a
+      bug  that made  FreeType crash  on some  popular (but  not fully
+      conformant) fonts like `ahronbd.ttf'.
+
+    - Another round of improvements to correct positioning and hinting
+      of composite glyphs in TrueType fonts.
+
+
+  II. MISCELLANEOUS
+
+    - Version  2.5.1  introduced a  bug  in  handling embedded  bitmap
+      strikes of  TrueType fonts,  causing garbage display  under some
+      circumstances.
+
+    - The   `ftgrid'   demo   program    couldn't   be   compiled   in
+      non-development builds.
+
+
+======================================================================
+
+CHANGES BETWEEN 2.5 and 2.5.1
+
+  I. IMPORTANT BUG FIXES
+
+    - For  some WinFNT  files,  the last  glyph  wasn't displayed  but
+      incorrectly marked as invalid.
+
+    - The vertical size of glyphs was  incorrectly set after a call to
+      `FT_GlyphSlot_Embolden', resulting in clipped glyphs.
+
+    - Many fields of the `PCLT' table in SFNT based fonts (if accessed
+      with `FT_Get_Sfnt_Table') were computed incorrectly.
+
+    - In TrueType fonts,  hinting of composite glyphs  could sometimes
+      deliver  incorrect positions  of  components or  even  distorted
+      shapes.
+
+
+  II. IMPORTANT CHANGES
+
+    - WOFF font format support has been added.
+
+    - The auto-hinter now supports Hebrew.  Greek and Cyrillic support
+      has been improved.
+
+    - Support for the forthcoming `OS/2'  SFNT table version 5, as can
+      be found e.g. in the `Sitka' font family for Windows 8.1.
+
+    - The header  file layout  has been changed.   After installation,
+      all files are now located in `<prefix>/include/freetype2'.
+
+      Applications  that  use   (a)  `freetype-config'  or  FreeType's
+      `pkg-config' file to get the include directory for the compiler,
+      and (b) the documented way for header inclusion like
+
+        #include <ft2build.h>
+        #include FT_FREETYPE_H
+        ...
+
+      don't need any change to the source code.
+
+
+  III. MISCELLANEOUS
+
+    - The stem  darkening feature  of the  new CFF  engine can  now be
+      fine-tuned with the new `darkening-parameters' property.
+
+    - `ftgrid' has been updated to toggle various engines with the `H'
+      key, similar to `ftview' and `ftdiff'.
+
+    - The functionality of `ttdebug' has been greatly enhanced.
+
+      . It now displays twilight, storage, and control value data; key
+        `T' shows the twilight point  table, key `S' the storage data,
+        and key `C' the control value table.
+
+      . Some  keys  have  been  reassigned  from  lowercase  to  their
+        uppercase equivalents; for example `q'  to quit the program is
+        now `Q'.
+
+      . Key `f' finishes the current function.
+
+      . Key `R' restarts the debugger.
+
+      . Keys `b' and `p' set a breakpoint.
+
+      . Key `B' provides a function call backtrace.
+
+    - Better support of ARMv7 and x86_64 processors.
+
+    - Apple's `sbix' color bitmap format is now supported.
+
+    - Improved   auto-hinter  rendering   for  many   TrueType  fonts,
+      especially in the range 20-40ppem.
+
+    - A  new face  flag  `FT_FACE_FLAG_COLOR' has  been  added (to  be
+      accessed with the macro `FT_HAS_COLOR').
+
+    - `FT_Gzip_Uncompress'   (modeled    after   zlib's   `uncompress'
+      function)  has been  added; this  is a  by-product of  the newly
+      added WOFF support.
+
+    - Support for  a build with  `cmake' has been contributed  by John
+      Cary <cary@txcorp.com>.
+
+    - Support for x64  builds with Visual C++ has  been contributed by
+      Kenneth Miller <kennethadammiller@yahoo.com>
+
+    - Manual pages for most demo programs have been added.
+
+    - The GETINFO bytecode instruction for TrueType fonts was buggy if
+      used to retrieve subpixel hinting information.  It was necessary
+      to set  selector bit 6  to get  results for selector  bits 7-10,
+      which is wrong.
+
+    - Improved computation  of emulated vertical metrics  for TrueType
+      fonts.
+
+    - Fixed horizontal start-up position of vertical phantom points in
+      TrueType bytecode.
+
+
+======================================================================
+
 CHANGES BETWEEN 2.4.12 and 2.5

  I. IMPORTANT BUG FIXES
--- a/modules/freetype2/docs/CMAKE
+++ b/modules/freetype2/docs/CMAKE
@ -0,0 +1,2 @@
+Support for a cmake build has been contributed.  See the remarks in the
+top-level `CMakeLists.txt' file for more.
--- a/modules/freetype2/docs/CUSTOMIZE
+++ b/modules/freetype2/docs/CUSTOMIZE
@ -8,10 +8,9 @@ How to customize the compilation of the library

 I. Configuration macros

-  The  file found  in `include/freetype/config/ftoption.h'  contains a
-  list  of  commented configuration  macros  that  can  be toggled  by
-  developers  to  indicate  which  features  should  be  active  while
-  building the library.
+  The  file found  in `include/config/ftoption.h'  contains a  list of
+  commented configuration macros that can  be toggled by developers to
+  indicate which features should be active while building the library.

  These  options range  from debug  level to  availability  of certain
  features,   like  native   TrueType  hinting   through   a  bytecode
@ -36,9 +35,9 @@ II. Modules list
  can keep the source files `clean'.

  If  you don't  use  GNU make  you  have to  manually  edit the  file
-  `include/freetype/config/ftmodule.h'  (which is  *not* used  with if
-  compiled with GNU make) to  add or remove the drivers and components
-  you want  to compile into  the library.  See `INSTALL.ANY'  for more
+  `include/config/ftmodule.h' (which  is *not*  used with  if compiled
+  with GNU make) to add or  remove the drivers and components you want
+  to   compile  into   the  library.    See  `INSTALL.ANY'   for  more
  information.


@ -96,19 +95,16 @@ IV. Overriding default configuration and module headers
      #include FT_CONFIG_OPTIONS_H
      #include FT_CONFIG_MODULES_H

-    are      compiled.       Their      default      values      being
-    <freetype/config/ftoption.h> and <freetype/config/ftmodule.h>, you
-    can do something like:
+    are compiled.  Their default  values being <config/ftoption.h> and
+    <config/ftmodule.h>, you can do something like:

      custom/
-        freetype/
-          config/
-            ftoption.h    => custom options header
-            ftmodule.h    => custom modules list
+        config/
+          ftoption.h      => custom options header
+          ftmodule.h      => custom modules list

      include/            => normal FreeType 2 include
-        freetype/
-          ...
+        ...

    then change the C include path to always give the path to `custom'
    before the FreeType 2 `include'.
@ -126,7 +122,7 @@ IV. Overriding default configuration and module headers
      #define FT_CONFIG_OPTIONS_H  <custom/my-ftoption.h>
      #define FT_CONFIG_MODULES_H  <custom/my-ftmodule.h>

-      #include <freetype/config/ftheader.h>
+      #include <config/ftheader.h>

      #endif /* __FT2_BUILD_MY_PLATFORM_H__ */

@ -142,7 +138,7 @@ IV. Overriding default configuration and module headers

 ----------------------------------------------------------------------

-Copyright 2003, 2005, 2006, 2012 by
+Copyright 2003, 2005, 2006, 2012, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/modules/freetype2/docs/DEBUG
+++ b/modules/freetype2/docs/DEBUG
@ -4,63 +4,63 @@ Debugging within the FreeType sources
 I. Configuration macros
 -----------------------

-There  are several ways  to enable  debugging features  in a  FreeType 2
-builds.   This is controlled  through the  definition of  special macros
+There are  several ways to enable  debugging features in a  FreeType 2
+builds.  This is  controlled through the definition  of special macros
 located in the file `ftoptions.h'.  The macros are:


  FT_DEBUG_LEVEL_ERROR

-    #define this macro  if you want to compile  the FT_ERROR macro calls
-    to  print error messages  during program  execution.  This  will not
-    stop  the  program.   Very  useful  to  spot  invalid  fonts  during
+    #define this macro if you want to compile the FT_ERROR macro calls
+    to print error  messages during program execution.   This will not
+    stop  the  program.  Very  useful  to  spot invalid  fonts  during
    development and to code workarounds for them.

  FT_DEBUG_LEVEL_TRACE

-    #define this macro  if you want to compile  both macros FT_ERROR and
-    FT_TRACE.   This also  includes the  variants  FT_TRACE0, FT_TRACE1,
+    #define this macro if you want to compile both macros FT_ERROR and
+    FT_TRACE.  This  also includes the variants  FT_TRACE0, FT_TRACE1,
    FT_TRACE2, ..., FT_TRACE7.

-    The  trace  macros are  used  to  send  debugging messages  when  an
-    appropriate  `debug  level' is  configured  at  runtime through  the
+    The  trace macros  are used  to  send debugging  messages when  an
+    appropriate  `debug level'  is configured  at runtime  through the
    FT2_DEBUG environment variable (more on this later).

  FT_DEBUG_MEMORY

-    If  this macro is  #defined, the  FreeType engine  is linked  with a
-    small  but  effective  debugging  memory  manager  that  tracks  all
+    If this  macro is #defined, the  FreeType engine is linked  with a
+    small  but  effective debugging  memory  manager  that tracks  all
    allocations and frees that are performed within the font engine.

-    When  the  FT2_DEBUG_MEMORY   environment  variable  is  defined  at
-    runtime,  a call  to FT_Done_FreeType  will dump  memory statistics,
-    including the list of leaked memory blocks with the source locations
-    where these were allocated.  It is always a very good idea to define
-    this in development builds.  This works with _any_ program linked to
-    FreeType, but  requires a big  deal of memory (the  debugging memory
-    manager never frees the blocks to the heap in order to detect double
-    frees).
+    When  the  FT2_DEBUG_MEMORY  environment variable  is  defined  at
+    runtime, a  call to FT_Done_FreeType will  dump memory statistics,
+    including  the  list  of  leaked memory  blocks  with  the  source
+    locations where  these were allocated.   It is always a  very good
+    idea to define this in  development builds.  This works with _any_
+    program linked to FreeType, but requires a big deal of memory (the
+    debugging memory  manager never  frees the blocks  to the  heap in
+    order to detect double frees).

-    When FT2_DEBUG_MEMORY isn't defined at runtime, the debugging memory
-    manager is ignored, and performance is unaffected.
+    When  FT2_DEBUG_MEMORY isn't  defined  at  runtime, the  debugging
+    memory manager is ignored, and performance is unaffected.


 II. Debugging macros
 --------------------

-Several macros can be used within the FreeType sources to help debugging
-its code:
+Several  macros  can be  used  within  the  FreeType sources  to  help
+debugging its code:


  1. FT_ERROR(( ... ))

-    This macro is  used to send debug messages  that indicate relatively
-    serious  errors (like  broken font  files),  but will  not stop  the
-    execution of  the running program.   Its code is compiled  only when
-    either FT_DEBUG_LEVEL_ERROR  or FT_DEBUG_LEVEL_TRACE are  defined in
+    This macro is used to send debug messages that indicate relatively
+    serious errors  (like broken  font files), but  will not  stop the
+    execution of the running program.   Its code is compiled only when
+    either FT_DEBUG_LEVEL_ERROR or FT_DEBUG_LEVEL_TRACE are defined in
    `ftoption.h'.

-    Note that you  have to use a printf-like  signature, but with double
+    Note that you have to use a printf-like signature, but with double
    parentheses, like in

      FT_ERROR(( "your %s is not %s\n", "foo", "bar" ));
@ -68,128 +68,130 @@ its code:

  2. FT_ASSERT( condition )

-    This macro  is used to check  strong assertions at  runtime.  If its
-    condition isn't TRUE,  the program will abort with  a panic message.
-    Its   code   is  compiled   when   either  FT_DEBUG_LEVEL_ERROR   or
-    FT_DEBUG_LEVEL_TRACE are defined.  You don't need double parentheses
-    here.  For example
+    This macro is used to check  strong assertions at runtime.  If its
+    condition isn't TRUE, the program will abort with a panic message.
+    Its  code   is  compiled   when  either   FT_DEBUG_LEVEL_ERROR  or
+    FT_DEBUG_LEVEL_TRACE   are  defined.    You   don't  need   double
+    parentheses here.  For example

      FT_ASSERT( ptr != NULL );


  3. FT_TRACE( level, (message...) )

-    The  FT_TRACE  macro  is  used  to  send  general-purpose  debugging
-    messages during  program execution.   This macro uses  an *implicit*
-    macro named FT_COMPONENT used to name the current FreeType component
-    being run.
+    The  FT_TRACE  macro is  used  to  send general-purpose  debugging
+    messages during program execution.   This macro uses an *implicit*
+    macro  named  FT_COMPONENT  used  to  name  the  current  FreeType
+    component being run.

-    The developer should always  define FT_COMPONENT as appropriate, for
-    example as in
+    The developer  should always  define FT_COMPONENT  as appropriate,
+    for example as in

      #undef  FT_COMPONENT
      #define FT_COMPONENT  trace_io

-    The  value  of  the  FT_COMPONENT  macro  is  an  enumeration  named
-    trace_XXXX where XXXX  is one of the component  names defined in the
-    internal file `freetype/internal/fttrace.h'.  If you modify FreeType
-    source  and insert  new trace_XXXX macro,  you  must register  it in
-    fttrace.h. If you insert or remove many trace macros,  you can check
-    the undefined or the unused trace macro by src/tools/chktrcmp.py.
+    The  value  of the  FT_COMPONENT  macro  is an  enumeration  named
+    `trace_XXXX' where `XXXX' is one of the component names defined in
+    the internal  file `internal/fttrace.h'.   If you  modify FreeType
+    source and insert new `trace_XXXX'  macro, you must register it in
+    `fttrace.h'. If  you insert or  remove many trace macros,  you can
+    check   the    undefined   or   the   unused    trace   macro   by
+    `src/tools/chktrcmp.py'.

-    Each  such component  is assigned  a `debug  level', ranging  from 0
-    to  7,  through  the  use  of  the  FT2_DEBUG  environment  variable
+    Each such component is assigned a `debug level', ranging from 0 to
+    7,  through   the  use  of  the   FT2_DEBUG  environment  variable
    (described below) when a program linked with FreeType starts.

-    When FT_TRACE  is called, its  level is compared  to the one  of the
-    corresponding component.   Messages with trace  levels *higher* than
+    When FT_TRACE is  called, its level is compared to  the one of the
+    corresponding component.  Messages with trace levels *higher* than
    the corresponding component level are filtered and never printed.

-    This  means that  trace messages  with level  0 are  always printed,
-    those with level 2 are only  printed when the component level is *at
-    least* 2.
+    This means  that trace messages  with level 0 are  always printed,
+    those with  level 2 are only  printed when the component  level is
+    *at least* 2.

-    The  second  parameter  to  FT_TRACE must  contain  parentheses  and
+    The  second parameter  to  FT_TRACE must  contain parentheses  and
    correspond to a printf-like call, as in

      FT_TRACE( 2, ( "your %s is not %s\n", "foo", "bar" ) )

-    The shortcut macros  FT_TRACE0, FT_TRACE1, FT_TRACE2, ..., FT_TRACE7
-    can be  used with  constant level indices,  and are much  cleaner to
-    use, as in
+    The   shortcut  macros   FT_TRACE0,  FT_TRACE1,   FT_TRACE2,  ...,
+    FT_TRACE7 can  be used with  constant level indices, and  are much
+    cleaner to use, as in

-     FT_TRACE2(( "your %s is not %s\n", "foo", "bar" ));
+      FT_TRACE2(( "your %s is not %s\n", "foo", "bar" ));


 III. Environment variables
 --------------------------

-The  following  environment   variables  control  debugging  output  and
+The  following  environment  variables control  debugging  output  and
 behaviour of FreeType at runtime.


  FT2_DEBUG

-    This   variable  is   only  used   when  FreeType   is   built  with
-    FT_DEBUG_LEVEL_TRACE defined.  It contains a list of component level
-    definitions, following this format:
+    This  variable   is  only  used   when  FreeType  is   built  with
+    FT_DEBUG_LEVEL_TRACE  defined.  It  contains a  list of  component
+    level definitions, following this format:

-       component1:level1 component2:level2 component3:level3 ...
+      component1:level1 component2:level2 component3:level3 ...

-    where `componentX' is the name of a tracing component, as defined in
-    `fttrace.h',  but  without the  `trace_'  prefix.   `levelX' is  the
+    where `componentX' is the name  of a tracing component, as defined
+    in `fttrace.h', but without the  `trace_' prefix.  `levelX' is the
    corresponding level to use at runtime.

-    `any'  is a  special  component  name that  will  be interpreted  as
+    `any'  is a  special component  name that  will be  interpreted as
    `any/all components'.  For example, the following definitions

-       set FT2_DEBUG=any:2 memory:5 io:4        (on Windows)
-       export FT2_DEBUG="any:2 memory:5 io:4"   (on Linux with bash)
+      set FT2_DEBUG=any:2 memory:5 io:4        (on Windows)
+      export FT2_DEBUG="any:2 memory:5 io:4"   (on Linux with bash)

-    both stipulate that  all components should have level  2, except for
-    the memory and io components which will be set to trace levels 5 and
-    4, respectively.
+    both stipulate that all components should have level 2, except for
+    the memory and  io components which will be set  to trace levels 5
+    and 4, respectively.


  FT2_DEBUG_MEMORY

-    This  environment variable, when  defined, tells  FreeType to  use a
-    debugging memory  manager that will  track leaking memory  blocks as
-    well as other  common errors like double frees.   It is also capable
-    of  reporting  _where_  the  leaking blocks  were  allocated,  which
-    considerably saves time when debugging new additions to the library.
+    This environment variable,  when defined, tells FreeType  to use a
+    debugging memory manager that will  track leaking memory blocks as
+    well as other common errors like double frees.  It is also capable
+    of  reporting _where_  the  leaking blocks  were allocated,  which
+    considerably  saves  time  when  debugging new  additions  to  the
+    library.

-    This  code  is  only  compiled  when  FreeType  is  built  with  the
-    FT_DEBUG_MEMORY macro  #defined in  `ftoption.h' though, it  will be
+    This  code  is only  compiled  when  FreeType  is built  with  the
+    FT_DEBUG_MEMORY macro #defined in  `ftoption.h' though, it will be
    ignored in other builds.


  FT2_ALLOC_TOTAL_MAX

-    This  variable is ignored  if FT2_DEBUG_MEMORY  is not  defined.  It
-    allows you to specify a maximum heap size for all memory allocations
-    performed by FreeType.   This is very useful to  test the robustness
-    of  the  font  engine and  programs  that  use  it in  tight  memory
-    conditions.
+    This variable is  ignored if FT2_DEBUG_MEMORY is  not defined.  It
+    allows  you  to  specify  a  maximum  heap  size  for  all  memory
+    allocations performed  by FreeType.  This  is very useful  to test
+    the robustness  of the  font engine  and programs  that use  it in
+    tight memory conditions.

-    If it is  undefined, or if its value is  not strictly positive, then
+    If it is undefined, or if its value is not strictly positive, then
    no allocation bounds are checked at runtime.


  FT2_ALLOC_COUNT_MAX

-    This  variable is ignored  if FT2_DEBUG_MEMORY  is not  defined.  It
-    allows  you  to  specify  a  maximum number  of  memory  allocations
-    performed    by     FreeType    before    returning     the    error
-    FT_Err_Out_Of_Memory.  This is useful  for debugging and testing the
-    engine's robustness.
+    This variable is  ignored if FT2_DEBUG_MEMORY is  not defined.  It
+    allows  you to  specify  a maximum  number  of memory  allocations
+    performed    by    FreeType    before    returning    the    error
+    FT_Err_Out_Of_Memory.  This  is useful  for debugging  and testing
+    the engine's robustness.

-    If it is  undefined, or if its value is  not strictly positive, then
+    If it is undefined, or if its value is not strictly positive, then
    no allocation bounds are checked at runtime.

 ------------------------------------------------------------------------

-Copyright 2002, 2003, 2004, 2005, 2009 by
+Copyright 2002-2005, 2009, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part  of the  FreeType  project, and  may  only be  used,
--- a/modules/freetype2/docs/INSTALL
+++ b/modules/freetype2/docs/INSTALL
@ -43,7 +43,12 @@ I. Normal installation and upgrades
    directory, where <system> stands for your OS or environment.


-  5. From you own IDE, or own Makefiles
+  5. Using cmake
+
+    See the top-level `CMakeLists.txt' file for more information.
+
+
+  6. From you own IDE, or own Makefiles

    If  you  want  to  create   your  own  project  file,  follow  the
    instructions   given  in  the   `INSTALL.ANY'  document   of  this
@ -70,7 +75,7 @@ II. Custom builds of the library

 ----------------------------------------------------------------------

-Copyright   2000-2008, 2010-2011
+Copyright   2000-2008, 2010-2011, 2013
 by David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/modules/freetype2/docs/INSTALL.ANY
+++ b/modules/freetype2/docs/INSTALL.ANY
@ -33,25 +33,25 @@ I. Standard procedure

      src/base/ftbase.c

-      src/base/ftbbox.c       -- recommended, see <freetype/ftbbox.h>
-      src/base/ftglyph.c      -- recommended, see <freetype/ftglyph.h>
+      src/base/ftbbox.c       -- recommended, see <ftbbox.h>
+      src/base/ftglyph.c      -- recommended, see <ftglyph.h>

-      src/base/ftbdf.c        -- optional, see <freetype/ftbdf.h>
-      src/base/ftbitmap.c     -- optional, see <freetype/ftbitmap.h>
-      src/base/ftcid.c        -- optional, see <freetype/ftcid.h>
+      src/base/ftbdf.c        -- optional, see <ftbdf.h>
+      src/base/ftbitmap.c     -- optional, see <ftbitmap.h>
+      src/base/ftcid.c        -- optional, see <ftcid.h>
      src/base/ftfstype.c     -- optional
-      src/base/ftgasp.c       -- optional, see <freetype/ftgasp.h>
-      src/base/ftgxval.c      -- optional, see <freetype/ftgxval.h>
-      src/base/ftlcdfil.c     -- optional, see <freetype/ftlcdfil.h>
-      src/base/ftmm.c         -- optional, see <freetype/ftmm.h>
-      src/base/ftotval.c      -- optional, see <freetype/ftotval.h>
+      src/base/ftgasp.c       -- optional, see <ftgasp.h>
+      src/base/ftgxval.c      -- optional, see <ftgxval.h>
+      src/base/ftlcdfil.c     -- optional, see <ftlcdfil.h>
+      src/base/ftmm.c         -- optional, see <ftmm.h>
+      src/base/ftotval.c      -- optional, see <ftotval.h>
      src/base/ftpatent.c     -- optional
-      src/base/ftpfr.c        -- optional, see <freetype/ftpfr.h>
-      src/base/ftstroke.c     -- optional, see <freetype/ftstroke.h>
-      src/base/ftsynth.c      -- optional, see <freetype/ftsynth.h>
-      src/base/fttype1.c      -- optional, see <freetype/t1tables.h>
-      src/base/ftwinfnt.c     -- optional, see <freetype/ftwinfnt.h>
-      src/base/ftxf86.c       -- optional, see <freetype/ftxf86.h>
+      src/base/ftpfr.c        -- optional, see <ftpfr.h>
+      src/base/ftstroke.c     -- optional, see <ftstroke.h>
+      src/base/ftsynth.c      -- optional, see <ftsynth.h>
+      src/base/fttype1.c      -- optional, see <t1tables.h>
+      src/base/ftwinfnt.c     -- optional, see <ftwinfnt.h>
+      src/base/ftxf86.c       -- optional, see <ftxf86.h>

      src/base/ftmac.c        -- only on the Macintosh

@ -143,7 +143,7 @@ II. Support for flat-directory compilation

 ----------------------------------------------------------------------

-Copyright 2003, 2005, 2006, 2009, 2010 by
+Copyright 2003, 2005, 2006, 2009, 2010, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/modules/freetype2/docs/INSTALL.GNU
+++ b/modules/freetype2/docs/INSTALL.GNU
@ -1,7 +1,7 @@
-This document contains instructions  how to build the FreeType library
-on non-Unix systems  with the help of GNU Make.  Note  that if you are
-running Cygwin or MSys in  Windows, you should follow the instructions
-in the file INSTALL.UNIX instead.
+This document contains instructions how  to build the FreeType library
+on non-Unix systems with  the help of GNU Make.  Note  that if you are
+running  Cygwin  or  MinGW/MSYS  in Windows,  you  should  follow  the
+instructions in the file `INSTALL.UNIX' instead.


  FreeType 2 includes a powerful and flexible build system that allows
@ -54,8 +54,8 @@ in the file INSTALL.UNIX instead.

        platform                     win32
        compiler                     gcc
-        configuration directory      .\builds\win32
-        configuration rules          .\builds\win32\w32-gcc.mk
+        configuration directory      .\builds\windows
+        configuration rules          .\builds\windows\w32-gcc.mk

      If this does not correspond to your system or settings please
      remove the file 'config.mk' from this directory then read the
@ -138,15 +138,17 @@ in the file INSTALL.UNIX instead.

  Final note

-    The build  system builds a  statically linked library of  the font
-    engine in the  `objs' directory.  It does _not_  support the build
-    of  DLLs on  Windows and  OS/2.  If  you need  these, you  have to
-    either   use  an   IDE-specific  project   file,  or   follow  the
+    The above instructions build a  _statically_ linked library of the
+    font engine in the `objs' directory.   On Windows, you can build a
+    DLL  either  with  MinGW  (within an  MSYS  shell,  following  the
+    instructions in `INSTALL.UNIX'), or you  use one of the Visual C++
+    project files; see  the  subdirectories  of `builds/windows'.  For
+    everything else,  you are on  your own,  and you might  follow the
    instructions in `INSTALL.ANY' to create your own Makefiles.

 ----------------------------------------------------------------------

-Copyright 2003, 2004, 2005, 2006, 2008 by
+Copyright 2003, 2004, 2005, 2006, 2008, 2013 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/Показать больше
+++ b/Показать больше