Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lisp/Makefile.Linux: fix regression on x360 #513

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

lisp/Makefile.Linux: fix regression on x360 #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed7fb89
doc/*latex/*geometry.tex: fix typo extreme -> extream, see https://gi…
k-okada Apr 19, 2024
7cca3cf
lisp/Makefile.Linux: fix regression, set MACHINE if not defined
k-okada Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/jlatex/jgeometry.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ \subsection{種々の幾何学関数}
このメソッドは、{\bf :intersection}よりも速い。なぜなら、新しい
{\bf bounding-box}のインスタンスを作らないためである。}

\methoddesc{:extreme-point}{direction}{
\methoddesc{:extream-point}{direction}{
この{\bf bounding-box}の８つの頂点の中で、{\em direction}との内積が最大のものを
返す。}

Expand Down
2 changes: 1 addition & 1 deletion doc/latex/geometry.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ \subsection{Miscellaneous Geometric Functions}
This method is faster than {\bf :intersection} because no new instance
of bounding-box is created.}

\methoddesc{:extreme-point}{direction}{
\methoddesc{:extream-point}{direction}{
returns one of the eight corner points yielding the largest dot-product
with {\em direction}.}

Expand Down
19 changes: 9 additions & 10 deletions lisp/Makefile.Linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,21 @@ $(info "-- GCC_MACHINE = ${GCC_MACHINE}")
ifneq ($(GCC_MACHINE),)
ifneq (,$(findstring x86_64-linux-gnu,$(GCC_MACHINE)))
MACHINE=x86_64
endif
ifneq (,$(findstring i686-linux-gnu,$(GCC_MACHINE)))
else ifneq (,$(findstring i686-linux-gnu,$(GCC_MACHINE)))
MACHINE=i686
endif
ifneq (,$(findstring aarch64-linux-gnu,$(GCC_MACHINE)))
else ifneq (,$(findstring aarch64-linux-gnu,$(GCC_MACHINE)))
MACHINE=aarch64
endif
ifneq (,$(findstring arm-linux-gnu,$(GCC_MACHINE)))
else ifneq (,$(findstring arm-linux-gnu,$(GCC_MACHINE)))
MACHINE=arm
endif
ifneq (,$(findstring powerpc64le-linux-gnu,$(GCC_MACHINE)))
else ifneq (,$(findstring powerpc64le-linux-gnu,$(GCC_MACHINE)))
MACHINE=ppc64le
endif
ifneq (,$(findstring mips64el-linux-gnu,$(GCC_MACHINE)))
else ifneq (,$(findstring mips64el-linux-gnu,$(GCC_MACHINE)))
MACHINE=mips64
else
MACHINE=$(subst -linux-gnu,,$(GCC_MACHINE))
endif
else
MACHINE=$(shell uname -m)
endif
# need to set 'i486', for conditionals in c/*.[ch].
ifneq ($(shell gcc -dumpmachine | grep "i.*86-linux"),)
Expand Down
Loading