From: Glenn Morris Date: Fri, 14 May 2010 02:51:50 +0000 (-0700) Subject: * msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2633ef942080bd6ddf157ed821c1ac98f472914d;p=emacs.git * msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). Hopefully this is the right thing for msdos with X. --- diff --git a/msdos/ChangeLog b/msdos/ChangeLog index b40f0dc5c96..97c1f62340c 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,7 @@ 2010-05-14 Glenn Morris + * sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). + * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil. 2010-05-13 Glenn Morris diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index a89d7264416..4f76f1a97c4 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -99,7 +99,7 @@ s/\.h\.in/.h-in/ /^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ -/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ +/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o/ /^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/