Update to master up to 2018/01/16.

This commit is contained in:
Pere Pujal i Carabantes 2018-01-18 00:04:26 +01:00
commit 4366697e8d
30 changed files with 4772 additions and 5360 deletions

View file

@ -24187,6 +24187,14 @@ int main(int argc, char *argv[])
CLOCK_ASM(time2);
#endif
#if defined(__APPLE__)
/* Pango uses Fontconfig which requires /opt/local/etc/fonts/fonts.conf. This
* file may not exist on the runtime system, however, so we copy the file
* into our app bundle at compile time, and tell Fontconfig here to look for
* the file within the app bundle. */
putenv((char*) "FONTCONFIG_PATH=Resources/etc");
#endif
#ifdef FORKED_FONTS
/* must start ASAP, but depends on locale which in turn needs the config */
#ifdef NO_SDLPANGO