131 lines
3.3 KiB
Diff
131 lines
3.3 KiB
Diff
*** a/Makefile Mon Dec 9 16:07:14 2002
|
|
--- b/Makefile Thu Apr 18 02:10:40 2019
|
|
***************
|
|
*** 39,48 ****
|
|
all: ttmkfdir
|
|
|
|
.cpp.o:
|
|
! libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
|
|
|
|
ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
|
|
! libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
|
|
|
|
parser.cpp: encoding.l
|
|
flex -i -8 -o$@ $<
|
|
--- 39,48 ----
|
|
all: ttmkfdir
|
|
|
|
.cpp.o:
|
|
! libtool --mode=compile --tag=CXX $(CXX) $(CXXFLAGS) -o $@ -c $^
|
|
|
|
ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
|
|
! libtool --mode=link --tag=CXX $(CXX) -o $@ $^ $(LDFLAGS)
|
|
|
|
parser.cpp: encoding.l
|
|
flex -i -8 -o$@ $<
|
|
*** a/directory.h Mon Dec 9 08:29:11 2002
|
|
--- b/directory.h Thu Apr 18 02:10:40 2019
|
|
***************
|
|
*** 4,9 ****
|
|
--- 4,10 ----
|
|
|
|
#include <vector>
|
|
#include <string>
|
|
+ #include <cstring>
|
|
|
|
class directory : public std::vector<std::string> {
|
|
public:
|
|
*** a/encoding.cpp Mon Dec 9 08:52:48 2002
|
|
--- b/encoding.cpp Thu Apr 18 02:10:40 2019
|
|
***************
|
|
*** 2,8 ****
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
! #include "freetype/freetype.h"
|
|
|
|
#include "ttmkfdir.h"
|
|
#include "encoding.h"
|
|
--- 2,10 ----
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
!
|
|
! #include <ft2build.h>
|
|
! #include FT_FREETYPE_H
|
|
|
|
#include "ttmkfdir.h"
|
|
#include "encoding.h"
|
|
*** a/encoding.h Mon Dec 9 08:52:48 2002
|
|
--- b/encoding.h Thu Apr 18 02:10:40 2019
|
|
***************
|
|
*** 6,12 ****
|
|
#include <map>
|
|
#include <string>
|
|
|
|
! #include "freetype/freetype.h"
|
|
|
|
#include "util.h"
|
|
|
|
--- 6,13 ----
|
|
#include <map>
|
|
#include <string>
|
|
|
|
! #include <ft2build.h>
|
|
! #include FT_FREETYPE_H
|
|
|
|
#include "util.h"
|
|
|
|
*** a/ttf.cpp Wed Jan 8 05:25:25 2003
|
|
--- b/ttf.cpp Thu Apr 18 02:10:40 2019
|
|
***************
|
|
*** 239,245 ****
|
|
for (i = 0; i < n; i++) {
|
|
if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
|
|
std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
|
|
! return;
|
|
};
|
|
platform = NamePtr.platform_id;
|
|
encoding = NamePtr.encoding_id;
|
|
--- 239,246 ----
|
|
for (i = 0; i < n; i++) {
|
|
if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
|
|
std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
|
|
! /*HELCE возвращаем 0 иначе падает */
|
|
! return 0;
|
|
};
|
|
platform = NamePtr.platform_id;
|
|
encoding = NamePtr.encoding_id;
|
|
*** a/ttf.h Wed Jan 8 05:25:25 2003
|
|
--- b/ttf.h Thu Apr 18 02:10:40 2019
|
|
***************
|
|
*** 3,14 ****
|
|
#define TTF_H__
|
|
|
|
#include <string>
|
|
! #include "freetype/freetype.h"
|
|
#include "freetype/tttables.h"
|
|
#include "freetype/ftsnames.h"
|
|
#include "freetype/ttnameid.h"
|
|
#include "freetype/fterrors.h"
|
|
! #include "freetype/ftmodule.h"
|
|
|
|
#include "util.h"
|
|
#include "encoding.h"
|
|
--- 3,17 ----
|
|
#define TTF_H__
|
|
|
|
#include <string>
|
|
!
|
|
! #include <ft2build.h>
|
|
! #include FT_FREETYPE_H
|
|
!
|
|
#include "freetype/tttables.h"
|
|
#include "freetype/ftsnames.h"
|
|
#include "freetype/ttnameid.h"
|
|
#include "freetype/fterrors.h"
|
|
! #include FT_MODULE_H
|
|
|
|
#include "util.h"
|
|
#include "encoding.h"
|