diff --git a/Makefile.in b/Makefile.in index d010a49..6224470 100644 --- a/Makefile.in +++ b/Makefile.in @@ -89,8 +89,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -248,8 +247,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/aclocal.m4 b/aclocal.m4 index 455d8c8..6018590 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1431,7 +1431,6 @@ m4_include([macros/aclocal-include.m4]) m4_include([macros/alsa.m4]) m4_include([macros/argz.m4]) m4_include([macros/esd.m4]) -m4_include([macros/freetype.m4]) m4_include([macros/freetype2.m4]) m4_include([macros/gettext.m4]) m4_include([macros/glib-2.0.m4]) diff --git a/config.h.in b/config.h.in index 5dc60e1..71d5f82 100644 --- a/config.h.in +++ b/config.h.in @@ -88,18 +88,12 @@ /* define this if you use sun stlye audio interface */ #undef ENABLE_SUNAUDIO -/* Define this if you have old(1.x) freetype installed */ -#undef ENABLE_TTF - /* define this if you use X11 font interface */ #undef ENABLE_X11FONT /* define this if you use X11 render etension */ #undef ENABLE_XRENDER -/* define this if you have freetype/freetype.h */ -#undef FREETYPE_HAVE_DIR - /* Define to 1 if you have the `argz_add' function. */ #undef HAVE_ARGZ_ADD diff --git a/configure b/configure index 7d582e6..32bdc33 100755 --- a/configure +++ b/configure @@ -659,8 +659,6 @@ VORBIS_CFLAGS SRC_ABLEND HAVE_NASM SRC_FONT -FREETYPE_INCLUDES -FREETYPE_LIBS FT2_LIBS FT2_CFLAGS FT2_CONFIG @@ -916,7 +914,6 @@ with_joydev with_ft_prefix with_ft_exec_prefix enable_freetypetest -with_freetype_prefix enable_xrender enable_mmx with_ogg @@ -1663,7 +1660,6 @@ Optional Packages: --with-ft-prefix=PREFIX Prefix where FreeType is installed (optional) --with-ft-exec-prefix=PREFIX Exec prefix where FreeType is installed (optional) - --with-freetype-prefix=PFX Prefix for Freetype (optional) --with-ogg=PFX Prefix where libogg is installed (optional) --with-ogg-libraries=DIR Directory where libogg library is installed @@ -18457,7 +18453,6 @@ _ACEOF -have_ttf=no SRC_FONT= if test "x$have_sdl" = xyes; then if test "x$enable_gtk" = xyes; then @@ -18822,132 +18817,10 @@ $as_echo "$as_me: WARNING: -if test "x$no_ft" = xyes; then - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Check whether --with-freetype-prefix was given. -if test "${with_freetype_prefix+set}" = set; then : - withval=$with_freetype_prefix; freetype_prefix="$withval" -else - freetype_prefix="" -fi - - - if test ".$freetype_prefix" != . ; then - FREETYPE_INCLUDES=-I$freetype_prefix/include - fi - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$FREETYPE_INCLUDES $CPPFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$ac_includes_default" -if test "x$ac_cv_header_freetype_freetype_h" = xyes; then : - -$as_echo "#define FREETYPE_HAVE_DIR 1" >>confdefs.h - -fi - - - CPPFLAGS="$save_CPPFLAGS" - - if test x$no_freetype = x ; then - if test x$freetype_prefix != x ; then - freetype_libs=-L$freetype_prefix/lib - fi - freetype_libs="$freetype_libs -lttf" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Freetype environment" >&5 -$as_echo_n "checking for working Freetype environment... " >&6; } -if ${ac_cv_lib_freetype+:} false; then : - $as_echo_n "(cached) " >&6 -else - - save_LDFLAGS="$LDFLAGS" - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - LIBS="$LIBS $freetype_libs" - LDFLAGS="$LDFLAGS" - CPPFLAGS="$CPPFLAGS $FREETYPE_INCLUDES" - - if test "$cross_compiling" = yes; then : - ac_cv_lib_freetype=yes -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef FREETYPE_HAVE_DIR -#include -#else -#include -#endif -#include -int main (int argc, char* argv[]) -{ - TT_Engine library; - if(TT_Init_FreeType(&library) != 0) - { - printf("Error: Could not initialize FreeType engine!\n"); - return 1; - } - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_lib_freetype=yes -else - ac_cv_lib_freetype=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype" >&5 -$as_echo "$ac_cv_lib_freetype" >&6; } - fi - - if test x$ac_cv_lib_freetype = xyes ; then - FREETYPE_LIBS=$freetype_libs - -$as_echo "#define ENABLE_TTF 1" >>confdefs.h - have_ttf=yes - else - - if test ".1.0.0" = .mandatory ; then - as_fn_error $? "Could not find freetype library!" "$LINENO" 5 - fi - have_ttf=no - fi - - - - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi if test "x$no_ft" != xyes; then SRC_FONT="$SRC_FONT font_freetype2.c cp932tojis0213.c" EXTRALIBS="$EXTRALIBS $FT2_LIBS" EXTRACFLAGS="$EXTRACFLAGS $FT2_CFLAGS" -elif test "x$have_ttf" = xyes; then - SRC_FONT="$SRC_FONT font_ttf.c" - EXTRALIBS="$EXTRALIBS $FREETYPE_LIBS" - EXTRACFLAGS="$EXTRACFLAGS $FREETYPE_INCLUDES" fi if test x"SRC_FONT" = "x"; then as_fn_error $? "\"*** No font device available ***\"" "$LINENO" 5; @@ -19621,9 +19494,6 @@ if test "x$have_sdl" = xyes; then else echo " - x11 font" fi -if test "x$have_ttf" = xyes; then - echo " - old truetype font library" -fi if test "x$no_ft" != xyes; then echo " - freetype2 library" fi diff --git a/configure.ac b/configure.ac index 009254d..cb816f8 100644 --- a/configure.ac +++ b/configure.ac @@ -772,7 +772,6 @@ AC_DEFINE_UNQUOTED(JOY_DEVICE,"$joydev",[joystick device]) dnl dnl FreeType (Font) dnl -have_ttf=no SRC_FONT= if test "x$have_sdl" = xyes; then if test "x$enable_gtk" = xyes; then @@ -786,18 +785,10 @@ else fi AC_CHECK_FT2(2.0.0, AC_DEFINE(ENABLE_FT2,1,[Define this if you have freetype2 installed])) -if test "x$no_ft" = xyes; then - AM_PATH_FREETYPE(1.0.0, - AC_DEFINE(ENABLE_TTF,1,[Define this if you have old(1.x) freetype installed]) have_ttf=yes,have_ttf=no) -fi if test "x$no_ft" != xyes; then SRC_FONT="$SRC_FONT font_freetype2.c cp932tojis0213.c" EXTRALIBS="$EXTRALIBS $FT2_LIBS" EXTRACFLAGS="$EXTRACFLAGS $FT2_CFLAGS" -elif test "x$have_ttf" = xyes; then - SRC_FONT="$SRC_FONT font_ttf.c" - EXTRALIBS="$EXTRALIBS $FREETYPE_LIBS" - EXTRACFLAGS="$EXTRACFLAGS $FREETYPE_INCLUDES" fi dnl dnl check null @@ -986,9 +977,6 @@ if test "x$have_sdl" = xyes; then else echo " - x11 font" fi -if test "x$have_ttf" = xyes; then - echo " - old truetype font library" -fi if test "x$no_ft" != xyes; then echo " - freetype2 library" fi diff --git a/macros/Makefile.am b/macros/Makefile.am index fdbcf52..e947794 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -7,7 +7,6 @@ MACROS= \ codeset.m4 \ esd.m4 \ freetype2.m4 \ - freetype.m4 \ gettext.m4 \ glib-2.0.m4 \ glibc21.m4 \ diff --git a/macros/Makefile.in b/macros/Makefile.in index 01e6c85..96341f7 100644 --- a/macros/Makefile.in +++ b/macros/Makefile.in @@ -84,8 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -163,8 +162,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ @@ -339,7 +336,6 @@ MACROS = \ codeset.m4 \ esd.m4 \ freetype2.m4 \ - freetype.m4 \ gettext.m4 \ glib-2.0.m4 \ glibc21.m4 \ diff --git a/macros/freetype.m4 b/macros/freetype.m4 deleted file mode 100644 index 99a12d3..0000000 --- a/macros/freetype.m4 +++ /dev/null @@ -1,84 +0,0 @@ -dnl -dnl Borrow form Berlin Project. -dnl http://www.berlin-consortium.org -dnl -dnl Checks if FreeType is found. If it is, $ac_cv_lib_freetype is -dnl set to "yes". - -AC_DEFUN([AM_PATH_FREETYPE], -[dnl Get the cflags and librarie - AC_LANG_SAVE - AC_LANG_C - AC_ARG_WITH(freetype-prefix, [ --with-freetype-prefix=PFX Prefix for Freetype (optional)], - freetype_prefix="$withval", freetype_prefix="") - -dnl Check for Freetype includes. - if test ".$freetype_prefix" != . ; then - FREETYPE_INCLUDES=-I$freetype_prefix/include - fi - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$FREETYPE_INCLUDES $CPPFLAGS" - AC_CHECK_HEADER(freetype/freetype.h,AC_DEFINE(FREETYPE_HAVE_DIR,1,[define this if you have freetype/freetype.h])) - CPPFLAGS="$save_CPPFLAGS" - -dnl Check for Freetype libs - if test x$no_freetype = x ; then - if test x$freetype_prefix != x ; then - freetype_libs=-L$freetype_prefix/lib - fi - freetype_libs="$freetype_libs -lttf" - - AC_CACHE_CHECK([for working Freetype environment], - ac_cv_lib_freetype, [ - save_LDFLAGS="$LDFLAGS" - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - LIBS="$LIBS $freetype_libs" - LDFLAGS="$LDFLAGS" - CPPFLAGS="$CPPFLAGS $FREETYPE_INCLUDES" - - dnl Check if everything works - AC_TRY_RUN([ -#ifdef FREETYPE_HAVE_DIR -#include -#else -#include -#endif -#include -int main (int argc, char* argv[]) -{ - TT_Engine library; - if(TT_Init_FreeType(&library) != 0) - { - printf("Error: Could not initialize FreeType engine!\n"); - return 1; - } - return 0; -} - ], ac_cv_lib_freetype=yes, - ac_cv_lib_freetype=no, - ac_cv_lib_freetype=yes) - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ]) dnl End of AC_CACHE_CHECK - - fi - - if test x$ac_cv_lib_freetype = xyes ; then - FREETYPE_LIBS=$freetype_libs - ifelse([$2], , :, [$2]) - else - - if test ".$1" = .mandatory ; then - AC_MSG_ERROR(Could not find freetype library!) - fi - ifelse([$3], , :, [$3]) - fi - - AC_SUBST(FREETYPE_LIBS) - AC_SUBST(FREETYPE_INCLUDES) - - AC_LANG_RESTORE -]) diff --git a/modules/AliceLogo/Makefile.in b/modules/AliceLogo/Makefile.in index d0c28aa..f8e5439 100644 --- a/modules/AliceLogo/Makefile.in +++ b/modules/AliceLogo/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/Confirm/Makefile.in b/modules/Confirm/Makefile.in index 73d0224..bfa1748 100644 --- a/modules/Confirm/Makefile.in +++ b/modules/Confirm/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/Gpx/Makefile.in b/modules/Gpx/Makefile.in index fcc8731..49c36fa 100644 --- a/modules/Gpx/Makefile.in +++ b/modules/Gpx/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/Makefile.in b/modules/Makefile.in index a51769f..2fed532 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -84,8 +84,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -223,8 +222,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/Math/Makefile.in b/modules/Math/Makefile.in index 869403c..e03bdb5 100644 --- a/modules/Math/Makefile.in +++ b/modules/Math/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/MsgSkip/Makefile.in b/modules/MsgSkip/Makefile.in index bc2db67..fb19573 100644 --- a/modules/MsgSkip/Makefile.in +++ b/modules/MsgSkip/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -249,8 +248,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/NIGHTDLL/Makefile.in b/modules/NIGHTDLL/Makefile.in index 54a186d..ce7535b 100644 --- a/modules/NIGHTDLL/Makefile.in +++ b/modules/NIGHTDLL/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -246,8 +245,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/NightDemonDemo/Makefile.in b/modules/NightDemonDemo/Makefile.in index cd10705..bd9da23 100644 --- a/modules/NightDemonDemo/Makefile.in +++ b/modules/NightDemonDemo/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -245,8 +244,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/RandMT/Makefile.in b/modules/RandMT/Makefile.in index 9c2fe1e..7841043 100644 --- a/modules/RandMT/Makefile.in +++ b/modules/RandMT/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/SACT/Makefile.in b/modules/SACT/Makefile.in index 6e88661..d9a4370 100644 --- a/modules/SACT/Makefile.in +++ b/modules/SACT/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -250,8 +249,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/ShArray/Makefile.in b/modules/ShArray/Makefile.in index b14c4c5..7eae12c 100644 --- a/modules/ShArray/Makefile.in +++ b/modules/ShArray/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/ShCalc/Makefile.in b/modules/ShCalc/Makefile.in index 2cc9f20..4479f41 100644 --- a/modules/ShCalc/Makefile.in +++ b/modules/ShCalc/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/ShGraph/Makefile.in b/modules/ShGraph/Makefile.in index a0a17ff..36e9bca 100644 --- a/modules/ShGraph/Makefile.in +++ b/modules/ShGraph/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/ShPort/Makefile.in b/modules/ShPort/Makefile.in index 221e434..8994500 100644 --- a/modules/ShPort/Makefile.in +++ b/modules/ShPort/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/ShSound/Makefile.in b/modules/ShSound/Makefile.in index 0ea0475..cd15143 100644 --- a/modules/ShSound/Makefile.in +++ b/modules/ShSound/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/ShString/Makefile.in b/modules/ShString/Makefile.in index 4cfd49a..8f555d4 100644 --- a/modules/ShString/Makefile.in +++ b/modules/ShString/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/dDemo/Makefile.in b/modules/dDemo/Makefile.in index 15dda77..67f7d30 100644 --- a/modules/dDemo/Makefile.in +++ b/modules/dDemo/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/eDemo/Makefile.in b/modules/eDemo/Makefile.in index 2f308c0..a367fa8 100644 --- a/modules/eDemo/Makefile.in +++ b/modules/eDemo/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/eeDemo/Makefile.in b/modules/eeDemo/Makefile.in index b31f458..891ca10 100644 --- a/modules/eeDemo/Makefile.in +++ b/modules/eeDemo/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/lib/Makefile.in b/modules/lib/Makefile.in index 4f81405..32146dc 100644 --- a/modules/lib/Makefile.in +++ b/modules/lib/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -228,8 +227,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/nDEMO/Makefile.in b/modules/nDEMO/Makefile.in index 5daf8ce..1f58ce6 100644 --- a/modules/nDEMO/Makefile.in +++ b/modules/nDEMO/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/nDEMOE/Makefile.in b/modules/nDEMOE/Makefile.in index 470b1a5..9326ab1 100644 --- a/modules/nDEMOE/Makefile.in +++ b/modules/nDEMOE/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/oDEMO/Makefile.in b/modules/oDEMO/Makefile.in index 90d17f5..1e94d09 100644 --- a/modules/oDEMO/Makefile.in +++ b/modules/oDEMO/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/oujimisc/Makefile.in b/modules/oujimisc/Makefile.in index cdb8679..6233013 100644 --- a/modules/oujimisc/Makefile.in +++ b/modules/oujimisc/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/modules/tDemo/Makefile.in b/modules/tDemo/Makefile.in index 1f4b911..3b457ac 100644 --- a/modules/tDemo/Makefile.in +++ b/modules/tDemo/Makefile.in @@ -85,8 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -243,8 +242,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/src/Makefile.in b/src/Makefile.in index dcf2000..c5ec315 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -90,8 +90,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/alsa.m4 $(top_srcdir)/macros/argz.m4 \ - $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype.m4 \ - $(top_srcdir)/macros/freetype2.m4 \ + $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 $(top_srcdir)/macros/glib.m4 \ $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ @@ -255,8 +254,6 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRALDFLAGS = @EXTRALDFLAGS@ EXTRALIBS = @EXTRALIBS@ FGREP = @FGREP@ -FREETYPE_INCLUDES = @FREETYPE_INCLUDES@ -FREETYPE_LIBS = @FREETYPE_LIBS@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_CONFIG = @FT2_CONFIG@ FT2_LIBS = @FT2_LIBS@ diff --git a/src/font.c b/src/font.c index 79e9e44..f081d03 100644 --- a/src/font.c +++ b/src/font.c @@ -40,11 +40,6 @@ void font_init(int dev) { nact->ags.font = font_gtk_new(); break; #endif -#ifdef ENABLE_TTF - case FONT_TTF: - nact->ags.font = font_ttf_new(); - break; -#endif #ifdef ENABLE_FT2 case FONT_FT2: nact->ags.font = font_ft2_new(); diff --git a/src/font.h b/src/font.h index c0ac8fd..2a217ae 100644 --- a/src/font.h +++ b/src/font.h @@ -57,10 +57,6 @@ typedef struct _FONT FONT; extern void font_init(int dev); -#ifdef ENABLE_TTF -extern FONT *font_ttf_new(); -#endif - #ifdef ENABLE_FT2 extern FONT *font_ft2_new(); #endif diff --git a/src/font_ttf.c b/src/font_ttf.c deleted file mode 100644 index 0bda51f..0000000 --- a/src/font_ttf.c +++ /dev/null @@ -1,313 +0,0 @@ -/* - * font_ttf.c access to ttf font device - * - * Copyright (C) 2000- Fumihiko Murata - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/* $Id: font_ttf.c,v 1.6 2002/09/18 13:16:22 chikama Exp $ */ - -#include "config.h" - -#include -#include -#include - -#ifdef FREETYPE_HAVE_DIR -#include -#include -#else -#include -#include -#endif - -#include "portab.h" -#include "system.h" -#include "font.h" -#include "ags.h" -#include "s2utbl.h" - -typedef struct { - int fnn; - int size, ysize; - TT_Face face; - TT_Face_Properties pp; - TT_Glyph glyph; - TT_Instance inst; - TT_Matrix mat; - TT_Raster_Map r; -} ttfont; - -typedef struct { - int etype; /* font char map ... sjis:0, unicode:1 */ - TT_CharMap map; -} ttmap; - -typedef struct { - int size; - int type; - ttfont *id; -} FontTable; - -#define FONTTABLEMAX 256 -static FontTable fonttbl[FONTTABLEMAX]; -static int fontcnt = 0; -static TT_Engine eng; -static ttfont *fontset; -static ttmap fontmaps[4]; -static TT_Byte rpal_na[5]={ 0, 0, 0xff, 0xff, 0xff}; -static TT_Byte rpal_an[5]={0x20, 0x3f, 0xc0, 0xf0, 0xff}; - -#define GLYPH_PIXMAP_WIDTH 800 /* 文字イメージを取得する為のPixmapの大きさ */ -#define GLYPH_PIXMAP_HEIGHT 150 - -static agsurface_t img_glyph; - -static FONT *this; - -static void font_insert(int size, int type, ttfont *fontset) { - fonttbl[fontcnt].size = size; - fonttbl[fontcnt].type = type; - fonttbl[fontcnt].id = fontset; - - if (fontcnt >= (FONTTABLEMAX -1)) { - WARNING("Font table is full.\n"); - } else { - fontcnt++; - } -} - -static FontTable *font_lookup(int size, int type) { - int i; - - for (i = 0; i < fontcnt; i++) { - if (fonttbl[i].size == size && fonttbl[i].type == type) { - return &fonttbl[i]; - } - } - return NULL; -} - -static void font_ttf_sel_font(int type, int size) { - FontTable *tbl; - - - if (NULL == (tbl = font_lookup(size, type))) { - char *name; - ttfont *fs; - TT_Error err; - int i, map_sjis = 0, map_uni = 0; - TT_UShort platform, encoding; - TT_Instance_Metrics imt; - - if (type > 3) type = FONT_GOTHIC; - - name = this->name[type]; - - fs = g_new0(ttfont, 1); - fs->fnn = type; - fs->size = size; - - err = TT_Open_Face(eng, name, &fs->face); - NOTICE("TTF open %s size %d\n", name, size); - if (err) { - WARNING("%s is not found: %s\n", name, TT_ErrToString18(err)); - g_free(fs); - return; - } - - TT_Get_Face_Properties(fs->face, &fs->pp); - fs->ysize = (fs->pp.header->yMax * size) / (fs->pp.header->yMax - fs->pp.header->yMin + 1); - - err = TT_New_Glyph(fs->face, &fs->glyph); - if (err) { - WARNING("TTfont %s couldn't create glyph container: %s\n",name, TT_ErrToString18(err)); - g_free(fs); - return; - } - err = TT_New_Instance(fs->face, &fs->inst); - err = TT_Set_Instance_Resolutions(fs->inst, 76, 76); - err = TT_Set_Instance_CharSize(fs->inst, size*64); - - /* character map is sjis or unicode */ - if (fontmaps[type].etype < 0) { - for (i = 0; i < TT_Get_CharMap_Count(fs->face); i++) { - TT_Get_CharMap_ID(fs->face, i, &platform, &encoding); - if (platform == TT_PLATFORM_MICROSOFT) { - if (encoding == TT_MS_ID_SJIS) map_sjis = i + 1; - if (encoding == TT_MS_ID_UNICODE_CS) map_uni = i + 1; - } - } - if (map_sjis) { - fontmaps[type].etype = 0; - TT_Get_CharMap(fs->face, map_sjis -1, &fontmaps[type].map); - } else if (map_uni) { - fontmaps[type].etype = 1; - TT_Get_CharMap(fs->face, map_uni -1, &fontmaps[type].map); - } - } - - TT_Get_Instance_Metrics(fs->inst, &imt); - fs->r.rows = size; - fs->r.width = size; - fs->r.flow = TT_Flow_Up; - fs->r.cols = size + 3; - fs->r.size = fs->r.rows * fs->r.cols; - fs->r.bitmap = g_malloc((int)fs->r.size); - font_insert(size, type, fs); - fontset = fs; - } else { - fontset = tbl->id; - } -} - -static void pixmap2comimg(BYTE *src, int x, int y, int w, int h, int src_bpl) { - int yy; - BYTE *dst = GETOFFSET_PIXEL(&img_glyph, x, y + h - 2); /* must be -1 XXX */ - - for (yy = 0; yy < h; yy++) { - memcpy(dst, src, w); - src += src_bpl; - dst -= img_glyph.bytes_per_line; - } -} - -static void clear_canvas(void) { - memset(img_glyph.pixel, 0, GLYPH_PIXMAP_WIDTH * GLYPH_PIXMAP_HEIGHT); -} - -static void *font_ttf_get_glyph(unsigned char *msg) { - TT_UShort code; - guint16 w = 0; - int ww, hh; - int index; - TT_Glyph_Metrics mt; - TT_Error err; - int x = 0; - - boolean isHalfWidth = FALSE; /* half width character ? */ - - clear_canvas(); - - if (this->antialiase_on) { - TT_Set_Raster_Gray_Palette(eng, rpal_an); - } else { - TT_Set_Raster_Gray_Palette(eng, rpal_na); - } - - while(*msg) { - if (fontmaps[fontset->fnn].etype) { - /* sjis to unicode */ - if (*msg >= 0xa0 && *msg <= 0xdf) { - code = 0xff60 + *(msg++) - 0xa0; - isHalfWidth = TRUE; - } else if( *msg&0x80 ) { - code = s2u[msg[0] - 0x80][msg[1] - 0x40]; - msg+=2; - isHalfWidth = FALSE; - } else { - code = *(msg++); - isHalfWidth = TRUE; - } - } else { - if (*msg >= 0xa0 && *msg <= 0xdf) { - code = *(msg++); - isHalfWidth = TRUE; - } else if (*msg & 0x80) { - code = (msg[0] << 8) + msg[1]; - msg += 2; - isHalfWidth = FALSE; - } else { - code = *(msg++); - isHalfWidth = TRUE; - } - } - - index = TT_Char_Index(fontmaps[fontset->fnn].map, code); - if (!(err = TT_Load_Glyph(fontset->inst, fontset->glyph, index, TTLOAD_DEFAULT)) ) { - TT_Get_Glyph_Metrics(fontset->glyph, &mt); - - memset(fontset->r.bitmap, 0, fontset->r.size); - TT_Get_Glyph_Pixmap(fontset->glyph, &fontset->r, - -mt.bbox.xMin, -mt.bbox.yMin); - - ww = (mt.bbox.xMax - mt.bbox.xMin) / 64; - if (ww > fontset->r.cols) ww = fontset->size; - - hh = (mt.bbox.yMax - mt.bbox.yMin) / 64; - if (hh > fontset->r.rows) hh = fontset->size; - - pixmap2comimg(fontset->r.bitmap, - x + mt.bbox.xMin/64, fontset->size - mt.bbox.yMax/64, - ww, hh, fontset->r.cols); - - if (isHalfWidth) { - x += (fontset->size / 2); - w += (fontset->size / 2); - } else { - x += fontset->size; - w += fontset->size; - } - } - } - - img_glyph.width = x; - img_glyph.height = fontset->size; - - return &img_glyph; -} - -static int font_ttf_draw_glyph(int x, int y, unsigned char *str, int col) { - return 0; -} - -static boolean drawable() { - return FALSE; -} - -FONT *font_ttf_new() { - int err, i; - FONT *f = g_new(FONT, 1); - - f->sel_font = font_ttf_sel_font; - f->get_glyph = font_ttf_get_glyph; - f->draw_glyph = font_ttf_draw_glyph; - f->self_drawable = drawable; - f->antialiase_on = FALSE; - - for (i = 0; i < 4; i++) { - fontmaps[i].etype = -1; - } - err = TT_Init_FreeType(&eng); -#if 0 - if (err >= 0) { - TT_Set_Raster_Gray_Palette(eng, rpal); - } -#endif - - img_glyph.width = GLYPH_PIXMAP_WIDTH; - img_glyph.height = GLYPH_PIXMAP_HEIGHT; - img_glyph.bytes_per_line = GLYPH_PIXMAP_WIDTH; - img_glyph.depth = 8; - img_glyph.bytes_per_pixel = 1; - img_glyph.pixel = g_malloc(GLYPH_PIXMAP_WIDTH * GLYPH_PIXMAP_HEIGHT); - - this = f; - - NOTICE("FontDevice freetype 1.x\n"); - - return f; -} diff --git a/src/xsystem35.c b/src/xsystem35.c index 00e9092..f4c85f5 100644 --- a/src/xsystem35.c +++ b/src/xsystem35.c @@ -170,7 +170,7 @@ static void sys35_usage(boolean verbose) { #ifdef DEBUG puts(" -devfont device: select font device"); -#if defined(ENABLE_TTF) || defined(ENABLE_FT2) +#ifdef ENABLE_FT2 puts(" -devfont ttf : FreerType (True Type Font)"); #endif #ifdef ENABLE_X11FONT @@ -190,7 +190,7 @@ static void sys35_usage(boolean verbose) { puts(" : default is x11"); #endif -#if defined(ENABLE_TTF) || defined(ENABLE_SDLTTF) || defined(ENABLE_FT2) +#if defined(ENABLE_SDLTTF) || defined(ENABLE_FT2) puts(" -ttfont_mincho: set TrueType font for mincho"); puts(" -ttfont_gothic: set TrueType font for mincho"); #endif @@ -252,12 +252,6 @@ void sys_exit(int code) { } static int check_fontdev(char *devname) { -#ifdef ENABLE_TTF - if (0 == strcmp(devname, "ttf")) { - return FONT_TTF; - } -#endif - #ifdef ENABLE_FT2 if (0 == strcmp(devname, "ft2")) { return FONT_FT2;