diff --git a/ChangeLog.n b/ChangeLog.n index 647eabc7c77838a63b15bd6286ac4532e7bdaa05..42bd2bac1a72add38415e4db78e943c0384af969 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -1,3 +1,15 @@ +******************************************************************************* +4.3.devel.17 + +Sat Mar 23 17:46:14 1996 Duane Rettig (duane at clay) + + * Makefile.linux86: New file + + * Makefile.sunx86: Change name + + * misc/compile-1.lisp: misc/compile-1.lisp: Conditionalize on ics + + ************************************************************* Thu Mar 14 21:11:06 PST 1996 Colin Meldrum (colin@vapor) diff --git a/Makefile.linux86 b/Makefile.linux86 new file mode 100644 index 0000000000000000000000000000000000000000..b5085ab0ca899d3082164c6be42ed6a1edea0ae4 --- /dev/null +++ b/Makefile.linux86 @@ -0,0 +1,42 @@ +# $fiHeader: Makefile.sun4-svr4,v 1.8 1995/10/17 05:00:59 colin Exp $ +# +# Makefile.sun4-svr4 for CLIM 2.0 +# + +include Makefile.defs + +Makefile=Makefile.linux86 + +# for other Motif versions use +# /net/sole/opt/ICS/Motif1.2.4/usr/include +# /net/vapor/3rd/motif-1.2.2-sol2/ICS/Motif/usr/include + +XINCLUDES=-I/usr/X11R6/include + +TKLIB=-L/usr/X11R6/lib -lXm +XTLIB=-lXt +XLIB= -lXpm -lXext -lX11 + +SET_LIBRARY_PATH= \ + LD_LIBRARY_PATH=/usr/X11R6/lib:/lib:/usr/lib:/usr/i486-linux/lib; export LD_LIBRARY_PATH + +# for other Motif versions use +# /net/sole/opt/ICS/Motif1.2.4/usr/lib:/usr/lib +# /net/vapor/3rd/motif-1.2.2-sol2/ICS/Motif/usr/lib:/usr/lib + +PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) + +# from here on this file should be the same as Makefile.sun4-svr4-ol + +MOTIFXTRAS= + +PICFLAGS = -fPIC +SHAREFLAGS = -shared +MAKE_SHARED = ld +STD_DEFINES = +AR = ar cq + +ICS-PRODUCT-OBJS = +ICS-PRODUCT-FASLS = + +include Makefile.generic diff --git a/Makefile.sunx86 b/Makefile.sunx86 index c4f5408a3d14929b8b98d2f76534adad590596ad..4bf813e0ec0b3225ee74529a6a57280784236f61 100644 --- a/Makefile.sunx86 +++ b/Makefile.sunx86 @@ -8,7 +8,7 @@ include Makefile.defs # temp hack for sole TMP=/tmp -Makefile=Makefile.sun4-svr4 +Makefile=Makefile.sunx86 # for other Motif versions use # /net/sole/opt/ICS/Motif1.2.4/usr/include diff --git a/misc/compile-1.lisp b/misc/compile-1.lisp index 98c9b40d79fdd1a7fdcc26d98a9b5ebb8fbc5cb1..db18ddf906be4afdc07132a93ba5ff8142ce51ce 100644 --- a/misc/compile-1.lisp +++ b/misc/compile-1.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: user -*- ;; -;; -[Thu Nov 10 02:16:15 1994 by smh]- +;; -[Mon Mar 18 19:27:39 1996 by duane]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. @@ -58,6 +58,7 @@ (tenuring (excl:load-system sys)) + #+ics (progn (excl:compile-system 'wnn :include-components t) (excl:load-system 'wnn)) diff --git a/tk/font.lisp b/tk/font.lisp index ff236f319eed29c9535d294c67941e7bcacf2a9d..4658e9157e3db47aba93ae30f664ad2f30405ade 100644 --- a/tk/font.lisp +++ b/tk/font.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: tk -*- ;; -;; -[]- +;; -[Sat Mar 23 17:50:57 1996 by duane]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA All rights reserved. @@ -134,6 +134,7 @@ (setf (elt seq i) (char*-to-string (xfontname-list names i)))) (x11::xfreefontnames names))))) + (defun list-font-names-with-info (display pattern &key (max-fonts 65535) (result-type 'list)) (with-ref-par ((n 0 :int) (fonts 0 *))