David Hammerton wrote:
hi, seems you have done some updating on it.. but now it still doesnt compile, im not sure if your trying to include something that is defined elsewhere or you made a typo, but it seems to bawk on:
gcc -c -I. -I. -I../../include -I../../include -I/usr/include/freetype2 -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_REENTRANT -I/usr/X11R6/include -o truetype.o truetype.c truetype.c:13: `#include' expects "FILENAME" or <FILENAME> truetype.c:14: `#include' expects "FILENAME" or <FILENAME>
I give up. You're getting the error because FreeType's macros are not being defined by your include files. This is supposed to be the way to work around the fact that the FreeType guys rename their include files with every minor release. freetype/freetype.h should either define the macros or include another file that does so. If you can figure out why that isn't happening, let me know. -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================
On Wed, 30 May 2001, Ian Pilcher wrote:
You're getting the error because FreeType's macros are not being defined by your include files. This is supposed to be the way to work around the fact that the FreeType guys rename their include files with every minor release.
freetype/freetype.h should either define the macros or include another file that does so. If you can figure out why that isn't happening, let me know.
It is happening, ftheader.h just doesn't define those two symbols. It defines these: #define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h> #define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h> #define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h> #define FT_FREETYPE_H <freetype/freetype.h> #define FT_ERRORS_H <freetype/fterrors.h> #define FT_SYSTEM_H <freetype/ftsystem.h> #define FT_IMAGE_H <freetype/ftimage.h> #define FT_TYPES_H <freetype/fttypes.h> #define FT_LIST_H <freetype/ftlist.h> #define FT_OUTLINE_H <freetype/ftoutln.h> #define FT_MODULE_H <freetype/ftmodule.h> #define FT_RENDER_H <freetype/ftrender.h> #define FT_TYPE1_TABLES_H <freetype/t1tables.h> #define FT_TRUETYPE_IDS_H <freetype/ttnameid.h> #define FT_TRUETYPE_TABLES_H <freetype/tttables.h> #define FT_TRUETYPE_TAGS_H <freetype/tttags.h> #define FT_GLYPH_H <freetype/ftglyph.h> #define FT_BBOX_H <freetype/ftbbox.h> #define FT_BEZIER_H <freetype/ftbezier.h> #define FT_CACHE_H <freetype/ftcache.h> #define FT_CACHE_IMAGE_H <freetype/cache/ftcimage.h> #define FT_CACHE_SMALL_BITMAPS_H <freetype/cache/ftcsbits.h> #define FT_MAC_H <freetype/ftmac.h> #define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h> #define FT_SFNT_NAMES_H <freetype/ftsnames.h> #define FT_TRIGONOMETRY_H <freetype/fttrigon.h> #define FT_SYNTHESIS_H <freetype/ftsynth.h> #define FT_CACHE_MANAGER_H <freetype/cache/ftcmanag.h> #define FT_CACHE_INTERNAL_LRU_H <freetype/cache/ftlru.h> #define FT_CACHE_INTERNAL_GLYPH_H <freetype/cache/ftcglyph.h> #define FT_CACHE_INTERNAL_CHUNK_H <freetype/cache/ftcchunk.h> #define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h> So FT_TRUETYPE_TABLES_H and FT_GLYPH_H is covered, but FT_NAMES_H and FT_TRUETYPE_NAMES_H is not. Apparently the defines were changed or something - FT_SFNT_NAMES_H is apparently the one you must use now?
Ove Kaaven wrote:
So FT_TRUETYPE_TABLES_H and FT_GLYPH_H is covered, but FT_NAMES_H and FT_TRUETYPE_NAMES_H is not. Apparently the defines were changed or something - FT_SFNT_NAMES_H is apparently the one you must use now?
FT_SFNT_NAMES_H doesn't appear anywhere in the 2.0.1 headers. It appears to be impossible to be source code compatible between 2.0.1 and 2.0.2. -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================
Hello,
Ove Kaaven wrote:
So FT_TRUETYPE_TABLES_H and FT_GLYPH_H is covered, but FT_NAMES_H and FT_TRUETYPE_NAMES_H is not. Apparently the defines were changed or something - FT_SFNT_NAMES_H is apparently the one you must use now?
FT_SFNT_NAMES_H doesn't appear anywhere in the 2.0.1 headers. It appears to be impossible to be source code compatible between 2.0.1 and 2.0.2.
Yes, sorry for the disturbance, but I didn't expect people to use this header file so soon (the API reference wasn't available before 2.0.2). I believe that a simple fix can be something like: #include <ft2build.h> #ifndef FT_TRUETYPE_NAMES_H #define FT_TRUETYPE_NAMES_H FT_SFNT_NAMES_H #endif thus, the source code should work with all versions of FT2.. Regards, and again sorry - David
Ove Kaaven wrote:
So FT_TRUETYPE_TABLES_H and FT_GLYPH_H is covered, but FT_NAMES_H and FT_TRUETYPE_NAMES_H is not. Apparently the defines were changed or something - FT_SFNT_NAMES_H is apparently the one you must use now?
Let me know if this works. -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ======================================================================== diff -urN ../wine-20010529cvs/dlls/wineps/truetype.c ./dlls/wineps/truetype.c --- ../wine-20010529cvs/dlls/wineps/truetype.c Tue May 29 18:16:33 2001 +++ ./dlls/wineps/truetype.c Wed May 30 13:24:37 2001 @@ -9,11 +9,31 @@ #ifdef HAVE_FREETYPE +/* + * These stupid ifdefs should work for FreeType 2.0.1 and 2.0.2. 2.0.3 and + * beyond are anybody's guess. + */ + #include <freetype/freetype.h> -#include FT_NAMES_H -#include FT_TRUETYPE_NAMES_H -#include FT_TRUETYPE_TABLES_H #include FT_GLYPH_H +#include FT_TRUETYPE_TABLES_H + +#ifdef FT_NAMES_H +#include FT_NAMES_H /* 2.0.1 */ +#endif + +#ifdef FT_SFNT_NAMES_H +#include FT_SFNT_NAMES_H /* 2.0.2 */ +#endif + +#ifdef FT_TRUETYPE_NAMES_H +#include FT_TRUETYPE_NAMES_H /* 2.0.1 */ +#endif + +#ifdef FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H /* 2.0.2 */ +#endif + #include <sys/types.h> #include <dirent.h> #include <string.h>
<!! You are not on my whitelist, to avoid spam, I have not recieved your email !!> If your message was not Spam or USE, I strongly apologize for the inconvenice cause by this block, but the ammount of spam recieved on this email address (around 10 per day) is too much for me, and I refuse to read it, so please, accept this appology and resend your message to the address below. Thank you for your time. This message was generated by antispam Your message was not accepted either because: * I don't recognize your address, or * The magic cookie in the 'dated' or 'sender' address you sent to has expired or is invalid. You can contact me using the address: <crazney-dated-80d93cd3482f4319(a)crazney.net> but it will only work for the next 5 days. If you're just sending me SPAM/UCE, buzz off. Regards, David Hammerton aka crazney --your email-- On Wed, 30 May 2001, Ian Pilcher wrote:
You're getting the error because FreeType's macros are not being defined by your include files. This is supposed to be the way to work around the fact that the FreeType guys rename their include files with every minor release.
freetype/freetype.h should either define the macros or include another file that does so. If you can figure out why that isn't happening, let me know.
It is happening, ftheader.h just doesn't define those two symbols. It defines these: #define FT_CONFIG_CONFIG_H <freetype/config/ftconfig.h> #define FT_CONFIG_OPTIONS_H <freetype/config/ftoption.h> #define FT_CONFIG_MODULES_H <freetype/config/ftmodule.h> #define FT_FREETYPE_H <freetype/freetype.h> #define FT_ERRORS_H <freetype/fterrors.h> #define FT_SYSTEM_H <freetype/ftsystem.h> #define FT_IMAGE_H <freetype/ftimage.h> #define FT_TYPES_H <freetype/fttypes.h> #define FT_LIST_H <freetype/ftlist.h> #define FT_OUTLINE_H <freetype/ftoutln.h> #define FT_MODULE_H <freetype/ftmodule.h> #define FT_RENDER_H <freetype/ftrender.h> #define FT_TYPE1_TABLES_H <freetype/t1tables.h> #define FT_TRUETYPE_IDS_H <freetype/ttnameid.h> #define FT_TRUETYPE_TABLES_H <freetype/tttables.h> #define FT_TRUETYPE_TAGS_H <freetype/tttags.h> #define FT_GLYPH_H <freetype/ftglyph.h> #define FT_BBOX_H <freetype/ftbbox.h> #define FT_BEZIER_H <freetype/ftbezier.h> #define FT_CACHE_H <freetype/ftcache.h> #define FT_CACHE_IMAGE_H <freetype/cache/ftcimage.h> #define FT_CACHE_SMALL_BITMAPS_H <freetype/cache/ftcsbits.h> #define FT_MAC_H <freetype/ftmac.h> #define FT_MULTIPLE_MASTERS_H <freetype/ftmm.h> #define FT_SFNT_NAMES_H <freetype/ftsnames.h> #define FT_TRIGONOMETRY_H <freetype/fttrigon.h> #define FT_SYNTHESIS_H <freetype/ftsynth.h> #define FT_CACHE_MANAGER_H <freetype/cache/ftcmanag.h> #define FT_CACHE_INTERNAL_LRU_H <freetype/cache/ftlru.h> #define FT_CACHE_INTERNAL_GLYPH_H <freetype/cache/ftcglyph.h> #define FT_CACHE_INTERNAL_CHUNK_H <freetype/cache/ftcchunk.h> #define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h> So FT_TRUETYPE_TABLES_H and FT_GLYPH_H is covered, but FT_NAMES_H and FT_TRUETYPE_NAMES_H is not. Apparently the defines were changed or something - FT_SFNT_NAMES_H is apparently the one you must use now?
Actually aren't you supposed to do this? #include <ft2build.h> #include FT_FREETYPE_H #include FT_xxxx_H Huw. -- Dr. Huw D M Davies | Clarendon Laboratory h.davies1(a)physics.ox.ac.uk | Parks Road Tel: +44 1865 272390 | Oxford OX1 3PU Fax: +44 1865 272400 | UK
Huw D M Davies wrote:
Actually aren't you supposed to do this?
#include <ft2build.h> #include FT_FREETYPE_H #include FT_xxxx_H
2.0.1 (at least as packaged by Red Hat) does not include a file named ft2build.h. -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================
On Wed, 30 May 2001, Ian Pilcher wrote:
Huw D M Davies wrote:
Actually aren't you supposed to do this?
#include <ft2build.h> #include FT_FREETYPE_H #include FT_xxxx_H
2.0.1 (at least as packaged by Red Hat) does not include a file named ft2build.h.
Just checking - are you sure? The ft2build.h isn't where the other freetype headers are, it is in /usr/include, not in /usr/include/freetype. (I wonder if these guys have written a readme file or something for using freetype that we haven't read)
Ove Kaaven wrote:
Just checking - are you sure? The ft2build.h isn't where the other freetype headers are, it is in /usr/include, not in /usr/include/freetype. (I wonder if these guys have written a readme file or something for using freetype that we haven't read)
Just checked. It's not in /usr/include/ or /usr/include/freetype2/. (Red Hat puts the FreeType 1.x headers in /usr/include/freetype/ and the 2.x headers in /usr/include/freetype2/freetype/). -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================
participants (5)
-
David Turner -
Huw D M Davies -
Ian Pilcher -
ian.pilcher＠home.com
-
Ove Kaaven