This commit is contained in:
nhmall
2026-04-26 11:08:10 -04:00
parent ab730b70da
commit 3cb7bfc0b3
7 changed files with 18 additions and 18 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ Cross-compilation from Linux using bebbo's m68k-amigaos-gcc toolchain
# Install toolchain to /opt/amiga
# Clone NetHack 5.0 source
cd NetHack
sys/unix/setup.sh sys/unix/hints/linux.370
sys/unix/setup.sh sys/unix/hints/linux.500
make fetch-lua
make CROSS_TO_AMIGA=1 fetch-regex
make CROSS_TO_AMIGA=1 all
+2 -2
View File
@@ -12,14 +12,14 @@ Generally the build is the same as the unix build:
[Edit Oct 4, 2020: Use the existing Makefile and hints, hints/include system for cross-compiles]
1. `cd sys/unix`
2. `./setup.sh hints/macOS.370`
2. `./setup.sh hints/macOS.500`
3. `cd ../..`
4. For `libnethack.a`: `make WANT_LIBNH=1 all`
5. For `nethack.js`: `make CROSS_TO_WASM=1 all`
[Original text was:]
1. `cd sys/lib`
2. For `libnethack.a`: `./setup.sh hints/macOS.370`; for `nethack.js`: `./setup.sh hints/wasm`
2. For `libnethack.a`: `./setup.sh hints/macOS.500`; for `nethack.js`: `./setup.sh hints/wasm`
3. `cd ../..`
4. `make`
+3 -3
View File
@@ -6,7 +6,7 @@ if [ x$1 == "xlib" ]; then
make spotless
fi
cd sys/unix
./setup.sh hints/macOS.370
./setup.sh hints/macOS.500
cd ../..
make WANT_LIBNH=1
fi
@@ -25,7 +25,7 @@ if [ x$1 == "xwasm" ]; then
make spotless
fi
cd sys/unix
./setup.sh hints/macOS.370
./setup.sh hints/macOS.500
cd ../..
make CROSS_TO_WASM=1
fi
@@ -38,7 +38,7 @@ if [ x$1 == "xbin" ]; then
echo Doing bin...
make spotless
cd sys/unix
./setup.sh hints/macOS.370
./setup.sh hints/macOS.500
cd ../..
make
fi
+3 -3
View File
@@ -61,7 +61,7 @@ II. There once was a time when people built NetHack right on their DOS machine.
sys/msdos/fetch-cross-compiler.sh
That script won't install anything, it just does file fetches and stores
them in subfolders of lib. The linux.370 and macOS.370 hints files are
them in subfolders of lib. The linux.500 and macOS.500 hints files are
configured to find the cross-compiler there if you add
CROSS_TO_MSDOS=1
on your make command line.
@@ -72,12 +72,12 @@ II. There once was a time when people built NetHack right on their DOS machine.
On your linux host:
cd sys/unix ; sh setup.sh hints/linux.370 ; cd ../..
cd sys/unix ; sh setup.sh hints/linux.500 ; cd ../..
make fetch-lua
On your macOS host:
cd sys/unix ; sh setup.sh hints/macOS.370 ; cd ../..
cd sys/unix ; sh setup.sh hints/macOS.500 ; cd ../..
make fetch-lua
The MSDOS cross-compile can then be carried out by specifying
+2 -2
View File
@@ -34,13 +34,13 @@ if [ "$(uname)" = "Darwin" ]; then
#Mac
DJGPP_FILE="djgpp-osx-$GCCVER.tar.bz2"
if [ -z "HINTS" ]; then
export HINTS=macOS.370
export HINTS=macOS.500
fi
elif [ "$(expr substr $(uname -s) 1 5)" = "Linux" ]; then
#Linux
DJGPP_FILE="djgpp-linux64-$GCCVER.tar.bz2"
if [ -z "$HINTS" ]; then
export HINTS=linux.370
export HINTS=linux.500
fi
elif [ "$(expr substr $(uname -s) 1 10)" = "MINGW32_NT" ]; then
#mingw
+6 -6
View File
@@ -9,11 +9,11 @@ is included in the distributed Makefiles.
There are two .370 series hints files provided with NetHack:
linux.370 for use on Linux
macOS.370 for use on macOS
linux.500 for use on Linux
macOS.500 for use on macOS
Those will also pull in content from sys/unix/hints/include/*.370,
that is shared between the linux.370 and macOS.370 hints files.
that is shared between the linux.500 and macOS.500 hints files.
[.370 make build options]
@@ -57,9 +57,9 @@ make CROSS_TO_MSDOS=1 package Cross-compile for an MSDOS target package.
make CROSS_TO_WASM=1 Cross-compile for a WASM target.
make CROSS_TO_MIPS=1 Cross-compile for a mips target.
make WANT_BUNDLE=1 For macOS.370 only, place the build results into
make WANT_BUNDLE=1 For macOS.500 only, place the build results into
a macOS bundle layout.
make WANT_MACSOUND=1 For macOS.370, include support for built-in macOS
make WANT_MACSOUND=1 For macOS.500, include support for built-in macOS
sound libraries.
make WANT_SPEECH=1 If one of the sound libraries was included, also
include speech synthesis support (Recent macOS
@@ -74,7 +74,7 @@ make WANT_UBSAN=1 Include support for the undefined behaviour
make WANT_SHARE_INSTALL=1 Place the results of the install/update portion
of the build into a shared area on a multiuser
system.
make WANT_SOURCE_INSTALL=1 Place the results of the install/update portion
of the build into a subfolder of the source
tree, rather than in a system-wide shared area.
+1 -1
View File
@@ -357,7 +357,7 @@ endif
ifeq "$(GCC_EXTRA_WARNINGS)" "Y"
#
# These match the warnings enabled on the linux.370 and macOS.370 hints builds
# These match the warnings enabled on the linux.500 and macOS.500 hints builds
#
CFLAGSXTRA = -Wall -Wextra -Wreturn-type -Wunused -Wswitch -Wshadow \
-Wwrite-strings -pedantic -Wmissing-declarations \