From: <kw...@us...> - 2004-02-16 17:42:03
|
Update of /cvsroot/aedgui/aedGUI/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21593/include Modified Files: aedFont.h Log Message: Added DLLEXPORT to public functions in aedFont so they get properly exported with MinGW's gcc 3.2.3 Index: aedFont.h =================================================================== RCS file: /cvsroot/aedgui/aedGUI/include/aedFont.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** aedFont.h 6 Nov 2003 18:46:32 -0000 1.10 --- aedFont.h 16 Feb 2004 17:33:50 -0000 1.11 *************** *** 40,43 **** --- 40,45 ---- /** The aedFont class handles text rendering. */ + // Added DLLEXPORT to some functions to see if it solves the problem with + // MinGW gcc 3.2.3 not exporting the symbols class DLLEXPORT aedFont { *************** *** 54,74 **** int getLineSkip() const; ! bool getGlyphMetrics(Uint16 c, int *minx, int *maxx, int *miny, int *maxy, int *advance); ! int getTextSize(const char *text, Uint16 * w, Uint16 * h); // These return rendered string as a surface which the caller must free ! SDL_Surface *renderTextSolid(const char *str, const aedColor & color); ! SDL_Surface *renderTextShaded(const char *str, const aedColor & fg, const aedColor & bg); ! SDL_Surface *renderTextBlended(const char *str, const aedColor & color); // These are just for convenience, render directly to the given surface ! void renderTextSolid(SDL_Surface * s, int x, int y, const char *str, const aedColor & color); ! void renderTextShaded(SDL_Surface * s, int x, int y, const char *str, const aedColor & fg, const aedColor & bg); ! void renderTextBlended(SDL_Surface * s, int x, int y, const char *str, const aedColor & color); --- 56,76 ---- int getLineSkip() const; ! DLLEXPORT bool getGlyphMetrics(Uint16 c, int *minx, int *maxx, int *miny, int *maxy, int *advance); ! DLLEXPORT int getTextSize(const char *text, Uint16 * w, Uint16 * h); // These return rendered string as a surface which the caller must free ! DLLEXPORT SDL_Surface *renderTextSolid(const char *str, const aedColor & color); ! DLLEXPORT SDL_Surface *renderTextShaded(const char *str, const aedColor & fg, const aedColor & bg); ! DLLEXPORT SDL_Surface *renderTextBlended(const char *str, const aedColor & color); // These are just for convenience, render directly to the given surface ! DLLEXPORT void renderTextSolid(SDL_Surface * s, int x, int y, const char *str, const aedColor & color); ! DLLEXPORT void renderTextShaded(SDL_Surface * s, int x, int y, const char *str, const aedColor & fg, const aedColor & bg); ! DLLEXPORT void renderTextBlended(SDL_Surface * s, int x, int y, const char *str, const aedColor & color); *************** *** 85,89 **** public: ! static Uint16 getUnicode(const char *utf8, int *advance) { int i = 0; --- 87,91 ---- public: ! DLLEXPORT static Uint16 getUnicode(const char *utf8, int *advance) { int i = 0; |