Merge of r1709 into trunk: Atari Falcon port

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1710 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2011-02-06 19:30:55 +00:00
parent 57a1bda6de
commit d0aaabf6b2
23 changed files with 536 additions and 90 deletions

View File

@@ -2,6 +2,7 @@
*/
/* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2011 Pawel Góralski
Copyright 2008 Yves Rizoud
Copyright 2008 Franck Charlet
Copyright 2008 Adrien Destugues
@@ -57,6 +58,7 @@
#include "errors.h"
#include "windows.h"
#include "misc.h"
#include "setup.h"
typedef struct T_Font
{
@@ -283,7 +285,7 @@ void Init_text(void)
Nb_fonts=0;
// Parcours du répertoire "fonts"
strcpy(directory_name, Data_directory);
strcat(directory_name, "fonts");
strcat(directory_name, FONTS_SUBDIRECTORY);
For_each_file(directory_name, Add_font);
#if defined(__WIN32__)
@@ -358,6 +360,10 @@ void Init_text(void)
#ifndef NOTTF
For_each_file("/boot/system/fonts", Add_font);
#endif
#elif defined(__MINT__)
#ifndef NOTTF
For_each_file("C:/BTFONTS", Add_font);
#endif
#endif
}