- turn off building freetype-gl unless enabled in cmake flags

This commit is contained in:
Mark Vejvoda
2011-12-16 05:30:46 +00:00
parent 138d5b1295
commit 6a6b58fa20
17 changed files with 79 additions and 9 deletions

View File

@@ -55,6 +55,9 @@
* Updated in 2011 to avoid a corner case infinite loop.
*
*/
#ifdef USE_FREETYPEGL
#include <math.h>
@@ -575,3 +578,4 @@ void edtaa3(double *img, double *gx, double *gy, int w, int h, short *distx, sho
/* The transformation is completed. */
}
#endif

View File

@@ -30,6 +30,9 @@
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#ifdef HAVE_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif
@@ -231,3 +234,5 @@ font_manager_set_cache( FontManager *self,
}
self->cache = wcsdup( cache );
}
#endif

View File

@@ -30,6 +30,9 @@
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -292,3 +295,5 @@ markup_set_strikethrough_color( Markup *self,
const Color * color )
{
}
#endif

View File

@@ -31,6 +31,8 @@
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#ifdef WIN32
#include <windows.h>
#endif
@@ -343,3 +345,5 @@ texture_atlas_clear( TextureAtlas *self )
}
}
}
#endif

View File

@@ -30,6 +30,9 @@
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#include <ft2build.h>
#include FT_FREETYPE_H
// #include FT_ADVANCES_H
@@ -434,3 +437,5 @@ texture_font_load_face( FT_Library * library,
return 1;
}
#endif

View File

@@ -30,6 +30,9 @@
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
@@ -233,3 +236,5 @@ texture_glyph_get_kerning( TextureGlyph *self,
}
return 0;
}
#endif

View File

@@ -30,6 +30,8 @@
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -404,3 +406,5 @@ vector_sort( Vector *self,
assert( self->size );
qsort(self->items, self->size, self->item_size, cmp);
}
#endif

View File

@@ -30,6 +30,9 @@
* those of the authors and should not be interpreted as representing official
* policies, either expressed or implied, of Nicolas P. Rougier.
* ========================================================================= */
#ifdef USE_FREETYPEGL
#include <assert.h>
#include <string.h>
#include <stdlib.h>
@@ -757,3 +760,5 @@ GL_TYPE_STRING( GLenum gtype )
default: return "GL_VOID";
}
}
#endif