Mercurial > hg > xemacs-beta
view nt/xpm.mak @ 4353:4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
2007-12-23 Aidan Kehoe <kehoea@parhasard.net>
* objects-tty.c (tty_find_charset_font):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_1):
* objects-xlike-inc.c (x_font_spec_matches_charset):
* objects-xlike-inc.c (gtk_font_spec_matches_charset):
If the charset is not specified when calling the
font_spec_matches_charset device method, its value is Qnil, not
Qunbound. See
http://mid.gmane.org/E1EfbmW-00029r-5G@iwi191.iwi.uni-sb.de and
Ben Wing's patch of
http://mid.gmane.org/439FA06B.3090007@xemacs.org.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 23 Dec 2007 15:29:17 +0100 |
parents | ece8c2170578 |
children | 5274591ce707 |
line wrap: on
line source
# # XPM Makefile for Microsoft NMAKE without X libraries # !if !defined(DEBUG) !if defined(DEBUG_XEMACS) DEBUG=$(DEBUG_XEMACS) !else DEBUG=0 !endif !endif !if !defined(USE_CRTDLL) USE_CRTDLL=1 !endif !if $(DEBUG) OPT=-Od -Zi LINK_DEBUG=-debug !else OPT=-Ox !endif !if $(USE_CRTDLL) !if $(DEBUG) C_LIBFLAG=-MDd !else C_LIBFLAG=-MD !endif !else !if $(DEBUG) C_LIBFLAG=-MLd !else C_LIBFLAG=-ML !endif !endif WARN_CPP_FLAGS = -W3 CC=cl CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \ $(OPT) $(INCLUDES) -c OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \ WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \ CrIFrBuf.obj CrBufFrI.obj \ RdFToDat.obj WrFFrDat.obj \ Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \ simx.obj # nmake rule .SUFFIXES: .SUFFIXES: .c .c.obj:: $(CC) $(CFLAGS) $< # targets all: ..\X11\xpm.h Xpm.lib ..\X11\xpm.h: ..\X11\NUL xpm.h copy xpm.h ..\X11 ..\X11\NUL: mkdir ..\X11 Xpm.lib: $(OBJS) lib -nologo -out:$@ $(OBJS)