From 0b7b96ae7529c38927d850f9226a81bfd94be568 Mon Sep 17 00:00:00 2001 From: Pete Gordon Date: Wed, 31 Dec 2008 21:36:47 +0000 Subject: [PATCH] Enabled TTF fonts in OS4 build, scans system default directory for TTF files. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@450 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Makefile | 4 ++-- texte.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 957f8ef1..2a4f1ba6 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,10 @@ else BIN = grafx2 CFGBIN = gfxcfg COPT = -Wall -c -gstabs -mcrt=newlib `sdl-config --cflags` $(TTFCOPT) - LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) + LOPT = `sdl-config --libs` -lSDL_image -lpng -ljpeg -lz $(TTFLOPT) -lft2 CC = gcc OBJDIR = obj/amiga - NOTTF = 1 +# NOTTF = 1 else #AROS specific diff --git a/texte.c b/texte.c index 11d4dded..72341b22 100644 --- a/texte.c +++ b/texte.c @@ -333,6 +333,10 @@ void Initialisation_Texte(void) XFreeFontPath(font_path_list); } #endif + #elif defined(__amigaos4__) + #ifndef NOTTF + for_each_file( "FONTS:_TrueType", Ajout_fonte ); + #endif #elif defined(__BEOS__) || defined(__HAIKU__) #ifndef NOTTF for_each_file("/etc/fonts/ttfonts", Ajout_fonte);