diff options
| author | Daniel Stone <daniel.stone@nokia.com> | 2006-07-19 19:55:13 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-21 15:19:52 -0400 |
| commit | ecfad74c48f633916305bcc25baaaad74aa52b78 (patch) | |
| tree | 3516291da00962af37153bf108d2868ee2cb96ce /dix/main.c | |
| parent | 0a2068d123520d35818c38a555ae3ba06d8ca7fb (diff) | |
add support for built-in fonts
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dix/main.c b/dix/main.c index 5f539895e..e186e896b 100644 --- a/dix/main.c +++ b/dix/main.c @@ -403,9 +403,14 @@ main(int argc, char *argv[], char *envp[]) FatalError("failed to initialize core devices"); InitFonts(); +#ifdef BUILTIN_FONTS + defaultFontPath = "built-ins"; +#else if (loadableFonts) { SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error); - } else { + } else +#endif + { if (SetDefaultFontPath(defaultFontPath) != Success) ErrorF("failed to set default font path '%s'", defaultFontPath); |