AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preparing makefiles for freetype

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2000-09-03 11:51:42 +00:00
parent 239c1f50b0
commit 3fed184012
4 changed files with 787 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Makefile.in
View File

@ -43,10 +43,29 @@ VP9 = @top_srcdir@/src/tiff
VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc
FTVP01 = @top_srcdir@/src/freetype/unix
FTVP02 = @top_srcdir@/src/freetype/autohint
FTVP03 = @top_srcdir@/src/freetype/base
FTVP04 = @top_srcdir@/src/freetype/cff
FTVP05 = @top_srcdir@/src/freetype/cid
FTVP06 = @top_srcdir@/src/freetype/macfond
FTVP07 = @top_srcdir@/src/freetype/otlayout
FTVP08 = @top_srcdir@/src/freetype/psnames
FTVP09 = @top_srcdir@/src/freetype/raster1
FTVP10 = @top_srcdir@/src/freetype/sfnt
FTVP11 = @top_srcdir@/src/freetype/smooth
FTVP12 = @top_srcdir@/src/freetype/truetype
FTVP13 = @top_srcdir@/src/freetype/type1
FTVP14 = @top_srcdir@/src/freetype/type1z
FTVP15 = @top_srcdir@/src/freetype/winfonts
VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
# the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
top_srcdir = @top_srcdir@
prefix = @prefix@
@ -119,6 +138,7 @@ MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw
PMDIR = $(WXDIR)/src/os2
ODBCDIR = $(WXDIR)/src/iodbc
FTDIR = $(WXDIR)/src/freetype
INCDIR = $(WXDIR)/include
SAMPDIR = $(WXDIR)/samples
DEMODIR = $(WXDIR)/demos
@ -195,6 +215,78 @@ PNGOBJS = \
pngget.o \
pngset.o
FREETYPEOBJS = \
ftsystem.o \
ahangles.o \
ahglobal.o \
ahglyph.o \
ahhint.o \
ahmodule.o \
ahoptim.o \
autohint.o \
ftbase.o \
ftcalc.o \
ftdebug.o \
ftextend.o \
ftglyph.o \
ftinit.o \
ftlist.o \
ftmm.o \
ftnames.o \
ftobjs.o \
ftoutln.o \
ftstream.o \
cff.o \
t2driver.o \
t2gload.o \
t2load.o \
t2objs.o \
t2parse.o \
cidafm.o \
cidgload.o \
cidload.o \
cidobjs.o \
cidparse.o \
ciddriver.o \
type1cid.o \
fonddrvr.o \
oltypes.o \
psmodule.o \
psnames.o \
ftraster.o \
ftrend1.o \
raster1.o \
sfdriver.o \
sfnt.o \
sfobjs.o \
ttcmap.o \
ttload.o \
ttsbits.o \
ftgrays.o \
ftsmooth.o \
smooth.o \
truetype.o \
ttdriver.o \
ttgload.o \
ttobjs.o \
ttpload.o \
t1afm.o \
t1driver.o \
t1gload.o \
t1hinter.o \
t1load.o \
t1objs.o \
t1parse.o \
t1tokens.o \
type1.o \
z1afm.o \
z1driver.o \
z1gload.o \
z1load.o \
z1objs.o \
z1parse.o \
type1z.o \
winfnt.o
JPEGOBJS = \
jcomapi.o \

1183
configure vendored
View File

File diff suppressed because it is too large Load Diff

29
configure.in
View File

@ -709,6 +709,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_LIBJPEG=no
DEFAULT_wxUSE_LIBTIFF=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_FREETYPE=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
@ -830,6 +831,7 @@ else
DEFAULT_wxUSE_LIBJPEG=yes
DEFAULT_wxUSE_LIBTIFF=yes
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_FREETYPE=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
@ -971,6 +973,7 @@ AC_ARG_WITH(gtk-exec-prefix, [ --with-gtk-exec-prefix=PFX Exec prefix where GT
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
WX_ARG_SYS_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF)
WX_ARG_SYS_WITH(freetype, [ --with-freetype use freetype (font rasterizer)], wxUSE_FREETYPE)
WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL)
fi
@ -1944,6 +1947,9 @@ fi
if test "$wxUSE_ZLIB" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
fi
if test "$wxUSE_FREETYPE" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
fi
ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"
PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
@ -2847,6 +2853,25 @@ if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
fi
fi
FREETYPE_INCLUDE=
if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then
AC_DEFINE(wxUSE_FREETYPE)
if test "$wxUSE_FREETYPE" = "yes" ; then
FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
else
FREETYPE_LINK=
AC_CHECK_HEADER(freetype.h,
AC_CHECK_LIB(freetype, FT_Render_Glyph,
FREETYPE_LINK="-lfreetype",
,
[-lm])
)
if test "x$FREETYPE_LINK" = "x" ; then
AC_MSG_ERROR(system freetype library not found! Use --with-freetype=yes to use the built-in freetype)
fi
fi
fi
if test "$wxUSE_OPENGL" = "yes"; then
AC_CHECK_HEADER(GL/gl.h, [
AC_DEFINE(wxUSE_OPENGL)
@ -3724,7 +3749,7 @@ dnl note that we always link with -lm - extended.c uses floor() and is always
dnl linked in
EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
if test "$wxUSE_GUI" = "yes"; then
EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $EXTRA_LIBS"
EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
fi
dnl all the libraries needed to link wxWindows programs when using the
@ -3732,7 +3757,7 @@ dnl makefile system without libtool
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
dnl all -I options we must pass to the compiler
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
dnl wxGTK does not need TOOLKIT includes in wx-config
if test "$wxUSE_GTK" = 1; then

4
setup.h.in
View File

@ -143,6 +143,10 @@
#define wxUSE_ODBC 0
#define wxODBC_FWD_ONLY_CURSORS 1
#define wxODBC_BACKWARD_COMPATABILITY 0
/*
* Use freetype
*/
#define wxUSE_FREETYPE 0
/*
* Use Threads
*/