Commit 74e37670 authored by Florian Ernst's avatar Florian Ernst

New upstream version 8.0.8

parent 215d7b8e
David A. Bagley <bagleyd@tux.org>
David A. Bagley <bagleyd AT verizon.net>
Thanks to :
Luis Fernandes <elf AT ee.ryerson.ca> - independent xabacus 1.00, initial demo
......
!!!!
! Abacus: Class resource for xabacus
!!!!
*buttonFontList: *times-bold-r-normal--14*
*labelFontList: *times-bold-r-normal--14*
*textFontList: *times-bold-r-normal--14*
Abacus*pixmapSize: 16
*buttonFontList: *7x14bold*
*labelFontList: *7x14bold*
*textFontList: *7x14bold*
!*buttonFontList: *times-bold-r-normal--14*
!*labelFontList: *times-bold-r-normal--14*
!*textFontList: *times-bold-r-normal--14*
!Abacus*pixmapSize: 16
!Abacus*pixmapSize: 22
!Abacus*pixmapSize: 24
!Abacus*pixmapSize: 32
Abacus*pixmapSize: 32
!Abacus*pixmapSize: 48
!Abacus*pixmapSize: 64
Abacus*mono: false
......@@ -25,14 +28,18 @@ Abacus*primaryRailColor: gold
Abacus*secondaryRailColor: LightSteelBlue1
Abacus*highlightRailColor: Purple
Abacus*lineRailColor: Black
Abacus*bumpSound: @READPATH@/bump.au
Abacus*moveSound: @READPATH@/move.au
Abacus*bumpSound: /usr/local/share/games/xabacus/bump.au
Abacus*moveSound: /usr/local/share/games/xabacus/move.au
Abacus*dripSound: /usr/local/share/games/xabacus/drip.au
!Abacus*bumpSound: ./bump.au
!Abacus*moveSound: ./move.au
!Abacus*dripSound: ./drip.au
!Abacus*bumpSound: /usr/local/share/games/xabacus/bump.au
!Abacus*moveSound: /usr/local/share/games/xabacus/move.au
!Abacus*dripSound: /usr/local/share/games/xabacus/drip.au
!Abacus*bumpSound: /usr/share/games/xabacus/bump.au
!Abacus*moveSound: /usr/share/games/xabacus/move.au
!Abacus*dripSound: /usr/share/games/xabacus/drip.au
Abacus*sound: false
Abacus*delay: 50
Abacus*script: false
......@@ -42,7 +49,7 @@ Abacus*demoFont: 9x15bold
!Abacus*demoFont: 9x15
!Abacus*demoFont: 8x13bold
!Abacus*demoFont: 5x7
Abacus*demoPath: @READPATH@
Abacus*demoPath: /usr/local/share/games/xabacus
!Abacus*demoPath: .
!Abacus*demoPath: /usr/local/share/games/xabacus
!Abacus*demoPath: /usr/share/games/xabacus
......
This diff is collapsed.
/*
* @(#)Abacus.h
*
* Copyright 1994 - 2014 David A. Bagley, bagleyd@tux.org
* Copyright 1994 - 2016 David A. Bagley, bagleyd AT verizon.net
*
* Abacus demo and neat pointers from
* Copyright 1991 - 1998 Luis Fernandes, elf@ee.ryerson.ca
* Copyright 1991 - 1998 Luis Fernandes, elf AT ee.ryerson.ca
*
* All rights reserved.
*
......@@ -204,7 +204,6 @@
#define XtCLeftAuxAbacus ((char *) "LeftAuxAbacus")
#define XtCRightAuxAbacus ((char *) "RightAuxAbacus")
typedef struct _AbacusClassRec *AbacusWidgetClass;
typedef struct _AbacusDemoClassRec *AbacusDemoWidgetClass;
extern WidgetClass abacusWidgetClass;
extern WidgetClass abacusDemoWidgetClass;
......@@ -342,7 +341,7 @@ typedef struct {
#define GENERIC 7
#define MAX_FORMATS 7
#define MAX_MODES 8
#define TEACH_STRING0 "Enter calculation X+Y, X-Y, X*Y, X/Y, Xv, or Xu where X positive and result positive."
#define TEACH_STRING0 "Enter calculation X+Y, X-Y, X*Y, X/Y, Xv, or Xu where X and result nonnegative."
#define TEACH_STRING1 "Press enter to go through calculation steps."
#define ZERO_STRING "0.0"
......
/*
* @(#)AbacusC.c
*
* Copyright 1992 - 2012 David A. Bagley, bagleyd@tux.org
* Copyright 1992 - 2016 David A. Bagley, bagleyd AT verizon.net
*
* All rights reserved.
*
......@@ -223,6 +223,7 @@ static const short unsigned int operationASCII[] =
/* True for period, +/-, or operator */
#define IS_VALID(v, b) ((IS_DIGIT(v)) ? (CHAR_TO_DIGIT(v) < b) : True)
#define MAX_VALUE_LENGTH 64
#define CALC_STRING_SIZE 256
enum Stackusage {paren, order};
......@@ -262,9 +263,9 @@ static Boolean negateNext = False; /* handles unary '-' */
static double left, right; /* sides of a binary operation */
static char pendingOperation; /* operation to be performed on left (& right if not unary) */
static Boolean hub; /* intermediate result? usually a ')' or pi pressed */
static char memoryBuf[256];
static char displayBuf[256];
static char stringBuf[256];
static char memoryBuf[CALC_STRING_SIZE];
static char displayBuf[CALC_STRING_SIZE];
static char stringBuf[CALC_STRING_SIZE];
static int digits = 1;
static int currentBase = DEFAULT_BASE, currentDigits = DEFAULT_DECIMAL_DIGITS;
static char decimalPoint = '.';
......@@ -1209,7 +1210,7 @@ convertStringBases(char *sb, char *buf, int displayBase, int base) {
for (i = 0; buf[i] != '\0'; i++) {
if (IS_NUMBER(buf[i])) {
char numberString[256];
char numberString[CALC_STRING_SIZE];
double num;
int j = 0;
......
/*
* @(#)AbacusD.c
*
* Copyright 1999 - 2014 David A. Bagley, bagleyd@tux.org
* Copyright 1999 - 2014 David A. Bagley, bagleyd AT verizon.net
*
* Abacus demo and neat pointers from
* Copyright 1991 - 1998 Luis Fernandes, elf@ee.ryerson.ca
* Copyright 1991 - 1998 Luis Fernandes, elf AT ee.ryerson.ca
*
* All rights reserved.
*
......
/*
* @(#)AbacusM.c
*
* Copyright 1994 - 2013 David A. Bagley, bagleyd@tux.org
* Copyright 1994 - 2016 David A. Bagley, bagleyd AT verizon.net
*
* All rights reserved.
*
......@@ -149,11 +149,11 @@ int2Char(int digit)
/* ASCII or EBCDIC */
if (charValue > '9' || charValue < '0') {
charValue = (char) (digit + 'A' - '9' - 1);
charValue = (char) (charValue + 'A' - '9' - 1);
if (charValue > 'I')
charValue = (char) (digit + 'J' - 'I' - 1);
charValue = (char) (charValue + 'J' - 'I' - 1);
if (charValue > 'R')
charValue = (char) (digit + 'S' - 'R' - 1);
charValue = (char) (charValue + 'S' - 'R' - 1);
}
return charValue;
}
......@@ -466,7 +466,7 @@ convertString(char * buf, char * inbuf, int base, int displayBase,
int anomalySq, int shiftAnomalySq, Boolean carryAnomalySq,
char decimalPoint)
{
char fltbuf[256];
char fltbuf[STRING_SIZE];
int i, last, place = -1, decimalPlace, decimalPointPlace, mult;
Boolean negative, gotDecimal = False;
LONG intPart = 0, floatPart = 0, tmpPower;
......
/*
* @(#)AbacusP.h
*
* Copyright 1994 - 2014 David A. Bagley, bagleyd@tux.org
* Copyright 1994 - 2016 David A. Bagley, bagleyd AT verizon.net
*
* Abacus demo and neat pointers from
* Copyright 1991 - 1998 Luis Fernandes, elf@ee.ryerson.ca
* Copyright 1991 - 1998 Luis Fernandes, elf AT ee.ryerson.ca
*
* All rights reserved.
*
......@@ -152,7 +152,7 @@ extern AbacusClassRec abacusClassRec;
#define MAX_SLICES 10
#define COUNTRY_SIZE 3
#define STRING_SIZE 81
#define STRING_SIZE 256
#define MAX_SHADES 12
#define NORMAL 1
......
/*
* @(#)AbacusT.c
*
* Copyright 2009 - 2013 David A. Bagley, bagleyd@tux.org
* Copyright 2009 - 2013 David A. Bagley, bagleyd AT verizon.net
*
* All rights reserved.
*
......@@ -1454,6 +1454,11 @@ static Boolean pendingUpdate(AbacusWidget w, char * buffer,
int line, int aux, int position, int bottomNumber)
{
Boolean done;
#ifdef OLD_DEBUG
(void) printf("pendingUpdate %s, %d, %d, %d, %d, %d, %d\n",
buffer, line, aux, position, bottomNumber,
w->abacus.lower, w->abacus.upper);
#endif
(void) sprintf(buffer, "For rail %d", position);
if (w->abacus.lower == 0 && w->abacus.upper == 0 &&
......
Copyright 1994 - 2014 David A. Bagley, bagleyd@tux.org
Copyright 1994 - 2016 David A. Bagley, bagleyd AT verizon.net
All Rights Reserved
......
[Sep 03, 2016] V8.0.8:
Updates to Roman display.
Old website http://www.tux.org/~bagleyd died, shifted code base to new
website http://www.sillycycle.com
[Jan 18, 2016] V8.0.7:
Bases other than 10 broken since 8.0.0.
[Dec 12, 2015] V8.0.6:
Fixed the "wrench" look for X when showing anomalies.
Added group markers after last anomaly.
[Oct 22, 2015] V8.0.5:
Added small pointer for feedback when moving decimal point.
[Sep 28, 2015] V8.0.4:
Some lessons had some lines too long causing problem.
[Feb 24, 2015] V8.0.3:
Sound and install fixes.
Fix for switching from Chinese to Medieval and vice versa.
[Nov 28, 2014] V8.0.2:
Many bugs fixed for the new Counter including highlighting.
[Nov 18, 2014] V8.0.1: Not released
......
......@@ -3,7 +3,7 @@
#endif
XCOMM @(#)Imakefile
XCOMM
XCOMM Copyright 1994 - 2014 David A. Bagley, bagleyd@tux.org
XCOMM Copyright 1994 - 2016 David A. Bagley, bagleyd AT verizon.net
XCOMM
XCOMM All Rights Reserved
XCOMM
......@@ -118,7 +118,6 @@ XCOMM *** END XM CONFIG SECTION ***
XCOMM *** BEGIN SOUND CONFIG SECTION ***
XCOMM Only xlock.c and resource.c use this
XCOMM if your system has these sound libraries, remove the 'XCOMM '
XCOMM #define RplayLibrary
XCOMM #define NasLibrary
......@@ -222,7 +221,7 @@ XCOMM READPATH = /usr/share/games/$(GROUP)
DEFINES = -DHAVE_FCNTL_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 \
$(XMDEF) $(XPMDEF) $(EDITRESDEF) $(SOUNDDEF) $(SLEEPDEF) $(RANDDEF) \
-DSOUNDPATH=\"$(READPATH)\" -DSOUNDEXT=\".au\" \
-DBUMPSOUND=\"bump\" -DMOVESOUND=\"move\" \ -DDRIPSOUND=\"drip\" \
-DBUMPSOUND=\"bump\" -DMOVESOUND=\"move\" -DDRIPSOUND=\"drip\" \
$(XMINC) $(XPMINC) -DLEE_ABACUS
LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB) $(XPMLIB) $(EDITRESLIB) -lm
# -lICE -lSM
......@@ -269,6 +268,3 @@ distclean:: clean
clean.all:: distclean
$(RM) Makefile config.status*
$(WIDGET).ad : $(WIDGET).ad.in
sed s:@READPATH@:$(READPATH):g $(WIDGET).ad.in > $@
This diff is collapsed.
......@@ -3,12 +3,12 @@ xabacus
An Abacus Widget
Web: http://www.tux.org/~bagleyd/abacus.html
Web: http://www.sillycycle.com/abacus.html
Download: Primary site: ftp://ftp.tux.org/pub/tux/bagleyd/xabacus
Download: Primary site: http://www.sillycycle.com/abacus/
Secondary site: ftp://ibiblio.org/pub/Linux/apps/math
Maintainer: David A. Bagley <bagleyd@tux.org>
Maintainer: David A. Bagley <bagleyd AT verizon.net>
By default, this is an implementation of the classic Chinese abacus
(Saun-pan). Other implementations are easily configurable including
......@@ -23,9 +23,17 @@ Maintainer: David A. Bagley <bagleyd@tux.org>
one row at a time with 10 fingers. But on the other hand, a real abacus
does not have the current sum displayed as an integer.
To build you need at minimum both of these, X11 and Xt (unless you are
looking to build win32).
sudo apt-get install libx11-dev
sudo apt-get install libxt-dev
You may need to install one of these to build Motif version:
sudo apt-get install libmotif-dev
sudo apt-get install lesstif2-dev
You need to install XPM if you want color icons:
sudo apt-get install libxpm-dev
You need to install rplay if you want sound (also available esd or nas):
sudo apt-get install librplay3-dev
Then should be a simple
configure; make
......@@ -51,6 +59,8 @@ Maintainer: David A. Bagley <bagleyd@tux.org>
- subtraction
- multiplication
- division
- square root
- cube root
In addition, there is a rudimentary facility for generating data that
may be used to write customized scripts for teaching other concepts.
......
#! /bin/sh
#PWD=`pwd`
#DIR=`basename ${PWD}`
#NAME=${DIR}
NAME=abacus
GROUP=x${NAME}
if test "$1" == ""; then
VERSION=`sed 's/^.*"\(.*\)"/\1/' ./version.h`
RELEASE=1
else
VERSION=$1
if test "$2" == ""; then
RELEASE=1
else
RELEASE=$2
fi
fi
CATEGORY="Games Math X11"
SUMMARY="An implementation of the classic Chinese Abacus"
DESCRIPTION="An implementation of the classic Chinese Abacus,
Japanese Abacus, Korean Abacus, Roman Hand Abacus, Russian Abacus,
Danish Abacus, and Medieval Abacus."
DIR_URI="http://www.sillycycle.com/${GROUP}"
PKG=tar.xz
SRC_DIR=${NAME}-${VERSION}
SRC_URI=${DIR_URI}/${SRC_DIR}.${PKG}
FILE=${SRC_DIR}-${RELEASE}.cygport
echo "# package name
NAME=\"${NAME}\"
VERSION=${VERSION}
RELEASE=${RELEASE}
#SRC_DIR=${SRC_DIR}
# setup.hint generation
CATEGORY=\"${CATEGORY}\"
SUMMARY=\"${SUMMARY}\"
DESCRIPTION=\"${DESCRIPTION}\"
#REQUIRES=\"libaudiofile1 libesd0 libX11_6 libXm4 libXpm4 libXt6\"
# source and patch files
SRC_URI=\"${SRC_URI}\"
#PATCH_URI=\"\"
# use the standard src_compile, src_install and src_test"\
> ../${FILE}
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2013-06-10'
timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
......@@ -826,7 +826,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:MSYS*:*)
*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
......@@ -969,10 +969,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
or1k:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
or32:Linux:*:*)
or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
......@@ -1260,16 +1260,26 @@ EOF
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
# that puts up a graphical alert prompting to install
# developer tools. Any system running Mac OS X 10.7 or
# later (Darwin 11 and later) is required to have a 64-bit
# processor. This is not true of the ARM version of Darwin
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
......@@ -1361,154 +1371,6 @@ EOF
exit ;;
esac
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
#endif
main ()
{
#if defined (sony)
#if defined (MIPSEB)
/* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
I don't know.... */
printf ("mips-sony-bsd\n"); exit (0);
#else
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
"4"
#else
""
#endif
); exit (0);
#endif
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
printf ("m68k-hp-bsd\n"); exit (0);
#endif
#if defined (NeXT)
#if !defined (__ARCHITECTURE__)
#define __ARCHITECTURE__ "m68k"
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
if (version < 4)
printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
else
printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
#if defined (MULTIMAX) || defined (n16)
#if defined (UMAXV)
printf ("ns32k-encore-sysv\n"); exit (0);
#else
#if defined (CMU)
printf ("ns32k-encore-mach\n"); exit (0);
#else
printf ("ns32k-encore-bsd\n"); exit (0);
#endif
#endif
#endif
#if defined (__386BSD__)
printf ("i386-pc-bsd\n"); exit (0);
#endif
#if defined (sequent)
#if defined (i386)
printf ("i386-sequent-dynix\n"); exit (0);
#endif
#if defined (ns32000)
printf ("ns32k-sequent-dynix\n"); exit (0);
#endif
#endif
#if defined (_SEQUENT_)
struct utsname un;
uname(&un);
if (strncmp(un.version, "V2", 2) == 0) {
printf ("i386-sequent-ptx2\n"); exit (0);
}
if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
printf ("i386-sequent-ptx1\n"); exit (0);
}
printf ("i386-sequent-ptx\n"); exit (0);
#endif
#if defined (vax)
# if !defined (ultrix)
# include <sys/param.h>
# if defined (BSD)
# if BSD == 43
printf ("vax-dec-bsd4.3\n"); exit (0);
# else
# if BSD == 199006
printf ("vax-dec-bsd4.3reno\n"); exit (0);
# else
printf ("vax-dec-bsd\n"); exit (0);
# endif
# endif
# else
printf ("vax-dec-bsd\n"); exit (0);
# endif
# else
printf ("vax-dec-ultrix\n"); exit (0);
# endif
#endif
#if defined (alliant) && defined (i860)
printf ("i860-alliant-bsd\n"); exit (0);
#endif
exit (1);
}
EOF
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
{ echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
if [ -x /usr/convex/getsysinfo ]
then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
exit ;;
c34*)
echo c34-convex-bsd
exit ;;
c38*)
echo c38-convex-bsd
exit ;;
c4*)
echo c4-convex-bsd
exit ;;
esac
fi
cat >&2 <<EOF
$0: unable to guess system type
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright 1992-2014 Free Software Foundation, Inc.
timestamp='2013-04-24'
timestamp='2014-05-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -257,7 +257,7 @@ case $basic_machine in
| avr | avr32 \
| be32 | be64 \
| bfin \
| c4x | clipper \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
......@@ -265,6 +265,7 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
......@@ -282,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
......@@ -295,8 +298,7 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
| or1k | or32 \
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
......@@ -324,7 +326,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
......@@ -372,7 +374,7 @@ case $basic_machine in
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
......@@ -381,6 +383,7 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
......@@ -400,8 +403,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
......@@ -413,6 +418,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
......@@ -794,7 +800,7 @@ case $basic_machine in
os=-mingw64
;;
mingw32)
basic_machine=i386-pc
basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
......@@ -830,7 +836,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i386-pc
basic_machine=i686-pc
os=-msys
;;
mvs)
......@@ -1374,7 +1380,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1546,6 +1552,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
c8051-*)
os=-elf
;;
hexagon-*)
os=-elf
;;
......@@ -1589,9 +1598,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
or1k-*)
os=-elf
;;
or32-*)
os=-coff
;;
......
This diff is collapsed.
This diff is collapsed.
......@@ -48,4 +48,4 @@
extern char * findFile(char *fileName);
extern char * getPWD(void);
#endif /* _timer_h */
#endif /* _file_h */
This diff is collapsed.
0 0 0 0 4
Lesson 1.1: Counting from 1 to 20 on Japanese or Roman abacus
Lesson 1.1: Counting from 1 to 20 for Japanese Abacus
The beads will move at each step with an
appropriate explanation in this window.
Press Space-bar to Begin, press q to Exit
......