Makefile.am

Branch :

Show log
Commit
Author : sammy
Date : 2008-04-13 21:14:44
Hash : d6a2d851
Message : * Merged trunk commits [664], [665], [666], [667], [669], [670], [671], [672] and [684], by patrick and henry: + Added FTLayout.h, FTSimpleLayout.h and FTSimpleLayout.cpp to implement a framework for layout managers and an implementation of a simple layout manager. + Updated FTGLDemo to use the new FTSimpleLayout. Changes include: - Added a font origin to specify the location to render the font. - The default text is now blatantly plagarized from the back cover of the OGL red book. - The font size is much smaller. - Font metrics are rendered differently depending on the current layout manager. - The FTSimpleLayout alignment mode is now output with other font information. - The space bar no longer cycles through the fonts. The cursor up/down keys do. - The cursor left/right keys increment/decrement the size of the current font. - The page up/page down keys cycle through the layout managers. - The home/end keys increment and decrement the line length of a simple layout - The tab key cycles through the alignment modes of a simple layout. + Fixed a bug where the trackball rotation was applied after translation. + Minor reformatting and enabled texture fonts to be selected + Un-inlined private methods...because they are called by other private inlined methods + Minor formatting changes + Adding FTLayout

src/Makefile.am

lib_LTLIBRARIES = libftgl.la

libftgl_la_SOURCES = \
	FTBitmapGlyph.cpp \
	FTCharmap.cpp \
	FTContour.cpp \
	FTExtrdGlyph.cpp \
	FTFace.cpp \
	FTFont.cpp \
	FTGLBitmapFont.cpp \
	FTGLExtrdFont.cpp \
	FTGLOutlineFont.cpp \
	FTGLPixmapFont.cpp \
	FTGLPolygonFont.cpp \
	FTGLTextureFont.cpp \
	FTGlyph.cpp \
	FTGlyphContainer.cpp \
	FTGlue.cpp \
	FTLibrary.cpp \
	FTOutlineGlyph.cpp \
	FTPixmapGlyph.cpp \
	FTPoint.cpp \
	FTPolyGlyph.cpp \
	FTSimpleLayout.cpp \
	FTSize.cpp \
	FTTextureGlyph.cpp \
	FTVectoriser.cpp \
	$(ftgl_HEADERS)
libftgl_la_CPPFLAGS = -I$(top_srcdir)/include
libftgl_la_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
libftgl_la_LDFLAGS = $(FT2_LIBS) $(GL_LIBS)

ftgldir = $(includedir)/FTGL
ftgl_HEADERS = \
	../include/FTBBox.h \
	../include/FTBitmapGlyph.h \
	../include/FTCharToGlyphIndexMap.h \
	../include/FTCharmap.h \
	../include/FTContour.h \
	../include/FTExtrdGlyph.h \
	../include/FTFace.h \
	../include/FTFont.h \
	../include/FTGL.h \
	../include/FTGLBitmapFont.h \
	../include/FTGLExtrdFont.h \
	../include/FTGLOutlineFont.h \
	../include/FTGLPixmapFont.h \
	../include/FTGLPolygonFont.h \
	../include/FTGLTextureFont.h \
	../include/FTGlyph.h \
	../include/FTGlyphContainer.h \
	../include/FTLayout.h \
	../include/FTLibrary.h \
	../include/FTList.h \
	../include/FTOutlineGlyph.h \
	../include/FTPixmapGlyph.h \
	../include/FTPoint.h \
	../include/FTPolyGlyph.h \
	../include/FTSimpleLayout.h \
	../include/FTSize.h \
	../include/FTTextureGlyph.h \
	../include/FTVector.h \
	../include/FTVectoriser.h

kc3-lang/ftgl/src/Makefile.am

Commit

kc3-lang/ftgl /src/Makefile.am