--- ./lib/XPat.ad.Xm2 Thu Nov 11 16:29:56 1999 +++ ../xpat2-1.07/./lib/XPat.ad.Xm2 Mon Dec 17 14:12:43 2001 @@ -3,7 +3,7 @@ XPat.AboutText: \ - -*-lucida sans-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ + -*-lucida-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ -*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=BoldItalic ! shellMain --- ./src/Imakefile Sun Nov 5 14:05:10 2000 +++ ../xpat2-1.07/./src/Imakefile Mon Dec 17 14:36:11 2001 @@ -135,12 +135,8 @@ #ifdef USE_SOUND SOUND_OPTION = -DSOUND -#ifndef SOUNDOBJ -SOUNDOBJ = X-sound_SUN.o -#endif #else SOUND_OPTION = -SOUNDOBJ = #endif #ifdef USE_CARD_CONSTRUCTION --- ./src/XPat.ad Sun Nov 5 14:46:34 2000 +++ ../xpat2-1.07/./src/XPat.ad Mon Dec 17 14:13:36 2001 @@ -3,7 +3,7 @@ XPat.AboutText: \ - -*-lucida sans-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ + -*-lucida-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ -*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=BoldItalic ! shellMain @@ -181,7 +181,7 @@ ! labelHelpAboutVersion XPat*labelHelpAboutVersion.mappedWhenManaged: false -XPat*labelHelpAboutVersion.labelString: X-Patience 2\nVersion 1.04.M\n(Alpha Motif GUI)\nfor Solaris 2.x +XPat*labelHelpAboutVersion.labelString: X-Patience 2\nVersion 1.07\n(Motif GUI)\nfor IRIX 6.5 ! labelHelpAboutAuthors XPat*labelHelpAboutAuthors.mappedWhenManaged: false --- ./src/Xm-fbres.c Thu Nov 11 16:23:16 1999 +++ ../xpat2-1.07/./src/Xm-fbres.c Mon Dec 17 14:16:46 2001 @@ -91,7 +91,7 @@ /* default font resources */ "XPat.AboutText: \ - -*-lucida sans-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ + -*-lucida-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ -*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=BoldItalic", /* default string resources */ --- ./src/XPat2.fr Thu Nov 11 16:29:56 1999 +++ ../xpat2-1.07/./src/XPat2.fr Mon Dec 17 14:14:06 2001 @@ -3,7 +3,7 @@ XPat.AboutText: \ - -*-lucida sans-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ + -*-lucida-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ -*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=BoldItalic ! shellMain @@ -179,7 +179,7 @@ ! labelHelpAboutVersion XPat*labelHelpAboutVersion.mappedWhenManaged: false -XPat*labelHelpAboutVersion.labelString: X-Patience 2\nVersion 1.04.M\n(Alpha Motif GUI)\nfor Solaris 2.x +XPat*labelHelpAboutVersion.labelString: X-Patience 2\nVersion 1.07\n(Motif GUI)\nfor IRIX 6.5 ! labelHelpAboutAuthors XPat*labelHelpAboutAuthors.mappedWhenManaged: false --- ./src/XPat2.de Thu Nov 11 16:29:56 1999 +++ ../xpat2-1.07/./src/XPat2.de Mon Dec 17 14:16:28 2001 @@ -1,7 +1,7 @@ ! Voreinstellungen für XPat2 (deutsch) ! Christian Anzenberger 1999 03 21 -XPat.AboutText: -*-lucida sans-medium-r-normal-sans-14-*-*-*-*-*-*-*=FontRegular,-*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=FontBoldItalic +XPat.AboutText: -*-lucida-medium-r-normal-sans-14-*-*-*-*-*-*-*=FontRegular,-*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=FontBoldItalic ! Main Window XPat.title: X-Patience @@ -100,9 +100,9 @@ XPat*labelHelpAboutSymbolB.labelType: PIXMAP XPat*labelHelpAboutSymbolB.labelPixmap: Xpat2.l.pm XPat*labelHelpAboutVersion.labelString: X-Patience 2\n\ -Version 1.06\n\ +Version 1.07\n\ (Motif Oberfläche)\n\ -für Linux 2.x +für IRIX 6.5 XPat*labelHelpAboutAuthors.labelString: Spiel geschrieben von Heiko Eissfeldt\n\ und Michael Bischoff (c) 1993, 1999.\n\ Motif Oberfläche entworfen und erstellt\n\ --- ./src/XPat2.en Thu Nov 11 16:29:56 1999 +++ ../xpat2-1.07/./src/XPat2.en Mon Dec 17 14:13:55 2001 @@ -3,7 +3,7 @@ XPat.AboutText: \ - -*-lucida sans-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ + -*-lucida-medium-r-normal-sans-14-*-*-*-*-*-*-*=Regular,\ -*-new century schoolbook-bold-i-normal--18-*-*-*-*-*-*-*=BoldItalic ! shellMain @@ -181,7 +181,7 @@ ! labelHelpAboutVersion XPat*labelHelpAboutVersion.mappedWhenManaged: false -XPat*labelHelpAboutVersion.labelString: X-Patience 2\nVersion 1.04.M\n(Alpha Motif GUI)\nfor Solaris 2.x +XPat*labelHelpAboutVersion.labelString: X-Patience 2\nVersion 1.07\n(Motif GUI)\nfor IRIX 6.5 ! labelHelpAboutAuthors XPat*labelHelpAboutAuthors.mappedWhenManaged: false --- ./src/Xm-appif.c Thu Nov 11 16:23:16 1999 +++ ../xpat2-1.07/./src/Xm-appif.c Mon Dec 17 14:39:22 2001 @@ -143,7 +143,7 @@ XtSetArg (al[ac], XmNwidth, width); ac++; XtSetValues (Tableau, al, ac); - printf("Resized to %d x &d\n", width, height); + printf("Resized to %d x %d\n", width, height); } --- ./src/Xm-about.c Thu Nov 11 16:23:16 1999 +++ ../xpat2-1.07/./src/Xm-about.c Mon Dec 17 14:17:30 2001 @@ -103,7 +103,7 @@ /* create compound string for "Help About" dialog */ from_value.addr = "-adobe-new century schoolbook-bold-i-normal--18-180-75-75-p-111-iso8859-1=BoldItalic, " - "-b&h-lucida sans-medium-r-normal-sans-14-140-72-72-p-82-iso8859-1=Regular"; + "-*-lucida-medium-r-normal-sans-14-*-*-*-*-*-iso8859-1=Regular"; from_value.size = strlen (from_value.addr)+1; to_value.addr = NULL; XtConvertAndStore (toplevel, XmRString, &from_value, XmRFontList, &to_value); --- ./src/Xm-platform.h Thu Nov 11 16:23:16 1999 +++ ../xpat2-1.07/./src/Xm-platform.h Mon Dec 17 13:41:39 2001 @@ -98,4 +98,9 @@ #endif #endif +#ifdef __sgi +# undef PLATFORM +# define PLATFORM "IRIX 6.5" +#endif + #endif /* XM_PLATFORM_H */ --- ./src/Xpat.tmpl Sun Nov 5 15:03:10 2000 +++ ../xpat2-1.07/./src/Xpat.tmpl Mon Dec 17 14:35:44 2001 @@ -42,11 +42,11 @@ #undef useXlib /* similar to xpat version 1.x, not all features */ #undef useXaw /* the classic Athena based interface for xpat2 */ #undef useXview /* Xview / OpenLook interface */ -#define useXQt /* Qt widgets, playable, but NOT YET FINISHED */ +#undef useXQt /* Qt widgets, playable, but NOT YET FINISHED */ /* advice on Qt improvements from experienced programmers welcome at Michael.Bischoff@gmx.net */ #undef useXm1 /* Motif based interface (first variant) */ -#undef useXm2 /* Motif based CDE/KDE-style/Gnome-style interface */ +#define useXm2 /* Motif based CDE/KDE-style/Gnome-style interface */ XCOMM 2. Specify, if you want online help (Motif and Athena GUI only) XCOMM (Why should somebody _NOT_ want help for free?) @@ -62,8 +62,10 @@ XCOMM Ignored if USE_SOUND is OFF. XCOMM Note: The default is to copy an .au-file to /dev/audio, XCOMM so /dev/audio must have 666 permissions */ -SOUNDOBJ = X-sound_SUN.o +SOUNDOBJ = X-sound_IRIX.o SOUNDLIB = +XCOMM SOUNDOBJ = X-sound_SUN.o +XCOMM SOUNDLIB = XCOMM Uncomment this if you're using the NAS audio system: XCOMM SOUNDOBJ = X-sound_NAS.o XCOMM SOUNDLIB = -laudio @@ -76,7 +78,7 @@ XCOMM Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */ #define USE_SOUND /* doesn't harm if you don't have a sound card */ XCOMM the default is to copy an .au-file to /dev/audio -SOUNDOBJ = X-sound_SUN.o +XCOMM SOUNDOBJ = X-sound_SUN.o XCOMM 5.) Specify, if you want the antialiased card construction set (slower) @@ -95,11 +97,11 @@ XCOMM 9.) For Motif GUI only: Do you want a KDE-like toolbar? XCOMM (includes FLAT_BUTTONS) -#define KDESTYLE +XCOMM #define KDESTYLE XCOMM 10.) For Motif GUI only: Do you want a GNOME-like toolbar? XCOMM (includes FLAT_BUTTONS) -XCOMM #define GNOMESTYLE +#define GNOMESTYLE XCOMM ######################################################################### @@ -113,7 +115,9 @@ #ifndef XPMINCLUDE XCOMM Default for most platforms -XPMINCLUDE = -I$(INCROOT)/X11 +XCOMM XPMINCLUDE = -I$(INCROOT)/X11 +XCOMM Default for IRIX Freeware builds. +XPMINCLUDE = -I$(ROOT)$(PREFIX)/include/X11 XCOMM Default for Solaris Visual Workshop XCOMM XPMINCLUDE = /opt/SUNWspro/WS4.0/contrib/xpm/lib #endif @@ -122,7 +126,9 @@ XCOMM Default for most platforms, statically linked XCOMM XPMLIB = -$(USRLIBDIR)/libXpm.a XCOMM Default for most platforms, dynamically linked -XPMLIB = -L$(USRLIBDIR) -lXpm +XCOMM XPMLIB = -L$(USRLIBDIR) -lXpm +XCOMM Default for IRIX Freeware builds, dynamically linked +XPMLIB = -L$(ROOT)$(PREFIX)/$(ABILIB) -lXpm XCOMM Default for Solaris Visual Workshop, statically linked XCOMM XPMLIB = /opt/SUNWspro/WS4.0/contrib/xpm/lib/libXpm.a #endif @@ -129,16 +135,17 @@ #ifndef XMINCLUDE XCOMM Default for most platforms -XMINCLUDE = -I$(INCROOT) +XCOMM XMINCLUDE = -I$(INCROOT) XCOMM Default path for Common Desktop Environment XCOMM XMINCLUDE = -I/usr/dt/include #endif #ifndef XMLIB +XMLIB = -lXm XCOMM Default for most platforms, statically linked XCOMM XMLIB = -$(USRLIBDIR)/libXm.a XCOMM Default for most platforms, dynamically linked -XMLIB = -L$(USRLIBDIR) -lXm +XCOMM XMLIB = -L$(USRLIBDIR) -lXm XCOMM Default path for Common Desktop Environment XCOMM XMLIB = -L/usr/dt/lib -lXm #endif @@ -161,7 +168,8 @@ XCOMM ######################################################################### XCOMM Root directory of xpat2 installation -XPATROOT = /usr/games/lib/xpat +XPATROOT = $(PREFIX)/lib/xpat +XCOMM XPATROOT = /usr/games/lib/xpat XCOMM XPATROOT = /usr/local/lib/xpat XCOMM XPATROOT = /opt/XPat2 @@ -170,8 +178,8 @@ XPATMANDIR = $(XPATROOT)/man/man6 XCOMM This is the name of the log-file, where solved games are stored: -SCOREFILE = /var/games/xpat.log -XCOMM SCOREFILE = $(XPATLIBDIR)/xpat.log +XCOMM SCOREFILE = /var/games/xpat.log +SCOREFILE = $(XPATLIBDIR)/xpat.log XCOMM paths for installation in user's home-directory. LXPATBINDIR = $(HOME)/bin