dmagnetic: update patches for 0.30
Add host_build step to build dMagnetic for host architecture, to avoid ./dMagnetic -helpini >dMagnetic.ini bin/sh: 1: ./dMagnetic: Exec format error
This commit is contained in:
parent
488e0708ec
commit
b7bf4d0d3d
@ -5,3 +5,16 @@ TERMUX_PKG_VERSION=0.30
|
||||
TERMUX_PKG_SRCURL=https://www.dettus.net/dMagnetic/dMagnetic_${TERMUX_PKG_VERSION}.tar.bz2
|
||||
TERMUX_PKG_SHA256=9eb825290495150b8ae4eeb0ff04aba724c1fd8f6052b0c4cb90865787f922be
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_HOSTBUILD=true
|
||||
|
||||
termux_step_host_build() {
|
||||
cd $TERMUX_PKG_BUILDDIR
|
||||
make -j $TERMUX_MAKE_PROCESSES dMagnetic
|
||||
mv dMagnetic ../$TERMUX_PKG_HOSTBUILD_DIR/
|
||||
make clean
|
||||
}
|
||||
|
||||
termux_step_post_configure() {
|
||||
# find our host-built dMagnetic
|
||||
export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
|
||||
}
|
||||
|
@ -24,89 +24,6 @@
|
||||
|
||||
f_inifile=NULL;
|
||||
if (f_inifile==NULL)
|
||||
@@ -298,57 +311,57 @@
|
||||
printf(";-------------------------------------------------------------------------------\n");
|
||||
printf(";you can download the files from https://msmemorial.if-legends.org/magnetic.php\n");
|
||||
printf("[FILES]\n");
|
||||
- printf("pawnmag=/usr/local/share/games/magneticscrolls/pawn.mag\n");
|
||||
- printf("pawngfx=/usr/local/share/games/magneticscrolls/pawn.gfx\n");
|
||||
- printf(";pawnmsdos=/usr/local/share/games/magneticscrolls/msdosversions/PAWN\n");
|
||||
+ printf("pawnmag=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.mag\n");
|
||||
+ printf("pawngfx=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.gfx\n");
|
||||
+ printf(";pawnmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/PAWN\n");
|
||||
printf(";pawnd64=/d64/PAWN1.d64,/d64/PAWN2.d64\n");
|
||||
printf(";pawnamstradcpc=/dsk/PAWN1.DSK,/dsk/PAWN2.DSK\n");
|
||||
printf(";pawnspectrum=/dsk/PAWNspectrum.DSK\n");
|
||||
printf(";pawnarchimedes=/adf/PAWNarchimedes.adf\n");
|
||||
printf(";pawnatarixl=/atr/PAWN1.ATR,/atr/PAWN2.ATR\n");
|
||||
- printf("guildmag=/usr/local/share/games/magneticscrolls/guild.mag\n");
|
||||
- printf("guildgfx=/usr/local/share/games/magneticscrolls/guild.gfx\n");
|
||||
- printf(";guildmsdos=/usr/local/share/games/magneticscrolls/msdosversions/GUILD\n");
|
||||
- printf(";guildtworsc=/usr/local/share/games/magneticscrolls/MSC/GTWO.RSC\n");
|
||||
+ printf("guildmag=@TERMUX_PREFIX@/share/games/magneticscrolls/guild.mag\n");
|
||||
+ printf("guildgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/guild.gfx\n");
|
||||
+ printf(";guildmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/GUILD\n");
|
||||
+ printf(";guildtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/GTWO.RSC\n");
|
||||
printf(";guild64=/d64/GUILD1.d64,/d64/GUILD2.d64\n");
|
||||
printf(";guildamstradcpc=/dsk/GUILD1.DSK,/dsk/GUILD2.DSK\n");
|
||||
printf(";guildspectrum=/dsk/GUILDspectrum.DSK\n");
|
||||
printf(";guildarchimedes=/adf/GUILDarchimedes.adf\n");
|
||||
printf(";guildatarixl=/atr/GUILD1.ATR,/atr/GUILD2.ATR\n");
|
||||
- printf("jinxtermag=/usr/local/share/games/magneticscrolls/jinxter.mag\n");
|
||||
- printf("jinxtergfx=/usr/local/share/games/magneticscrolls/jinxter.gfx\n");
|
||||
- printf(";jinxtermsdos=/usr/local/share/games/magneticscrolls/msdosversions/JINXTER\n");
|
||||
+ printf("jinxtermag=@TERMUX_PREFIX@/share/games/magneticscrolls/jinxter.mag\n");
|
||||
+ printf("jinxtergfx=@TERMUX_PREFIX@/share/games/magneticscrolls/jinxter.gfx\n");
|
||||
+ printf(";jinxtermsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/JINXTER\n");
|
||||
printf(";jinxterd64=/d64/JINXTER1.d64,/d64/JINXTER2.d64\n");
|
||||
printf(";jinxteramstradcpc=/dsk/JINXTER1.DSK,/dsk/JINXTER2.DSK\n");
|
||||
printf(";jinxterspectrum=/dsk/JINXTERspectrum.DSK\n");
|
||||
printf(";jinxterarchimedes=/adf/JINXTERarchimedes.adf\n");
|
||||
printf(";jinxteratarixl=/atr/JINXTER1.ATR,/atr/JINXTER2.ATR\n");
|
||||
- printf("corruptionmag=/usr/local/share/games/magneticscrolls/ccorrupt.mag\n");
|
||||
- printf("corruptiongfx=/usr/local/share/games/magneticscrolls/ccorrupt.gfx\n");
|
||||
- printf(";corruptionmsdos=/usr/local/share/games/magneticscrolls/msdosversions/CORRUPT\n");
|
||||
- printf(";corruptiontworsc=/usr/local/share/games/magneticscrolls/MSC/CTWO.RSC\n");
|
||||
+ printf("corruptionmag=@TERMUX_PREFIX@/share/games/magneticscrolls/ccorrupt.mag\n");
|
||||
+ printf("corruptiongfx=@TERMUX_PREFIX@/share/games/magneticscrolls/ccorrupt.gfx\n");
|
||||
+ printf(";corruptionmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/CORRUPT\n");
|
||||
+ printf(";corruptiontworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/CTWO.RSC\n");
|
||||
printf(";corruptiond64=/d64/CORRUPT1.d64,/d64/CORRUPT2.d64\n");
|
||||
printf(";corruptionamstradcpc=/dsk/CORRUPTION1.DSK,/dsk/CORRUPTION2.DSK\n");
|
||||
printf(";corruptionspectrum=/dsk/CORRUPTIONspectrum.DSK\n");
|
||||
printf(";corruptionarchimedes=/adf/CORRUPTIONarchimedes.adf\n");
|
||||
- printf("fishmag=/usr/local/share/games/magneticscrolls/fish.mag\n");
|
||||
- printf("fishgfx=/usr/local/share/games/magneticscrolls/fish.gfx\n");
|
||||
- printf(";fishmsdos=/usr/local/share/games/magneticscrolls/msdosversions/FISH\n");
|
||||
- printf(";fishtworsc=/usr/local/share/games/magneticscrolls/MSC/FTWO.RSC\n");
|
||||
+ printf("fishmag=@TERMUX_PREFIX@/share/games/magneticscrolls/fish.mag\n");
|
||||
+ printf("fishgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/fish.gfx\n");
|
||||
+ printf(";fishmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/FISH\n");
|
||||
+ printf(";fishtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/FTWO.RSC\n");
|
||||
printf(";fishd64=/d64/FISH1.d64,/d64/FISH2.d64\n");
|
||||
printf(";fishamstradcpc=/dsk/FISH1.DSK,/dsk/FISH2.DSK\n");
|
||||
printf(";fishspectrum=/dsk/FISHspectrum.DSK\n");
|
||||
printf(";fisharchimedes=/adf/FISHarchimedes.adf\n");
|
||||
- printf("mythmag=/usr/local/share/games/magneticscrolls/myth.mag\n");
|
||||
- printf("mythgfx=/usr/local/share/games/magneticscrolls/myth.gfx\n");
|
||||
- printf(";mythmsdos=/usr/local/share/games/magneticscrolls/msdosversions/MYTH\n");
|
||||
- printf(";mythd64=/usr/local/share/games/magneticscrolls/MYTH.d64\n");
|
||||
+ printf("mythmag=@TERMUX_PREFIX@/share/games/magneticscrolls/myth.mag\n");
|
||||
+ printf("mythgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/myth.gfx\n");
|
||||
+ printf(";mythmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/MYTH\n");
|
||||
+ printf(";mythd64=@TERMUX_PREFIX@/share/games/magneticscrolls/MYTH.d64\n");
|
||||
printf(";mythamstradcpc=/dsk/MYTH1.DSK,/dsk/MYTH2.DSK\n");
|
||||
printf(";mythspectrum=/dsk/MYTHspectrum.DSK\n");
|
||||
printf(";mytharchimedes=/adf/MYTHarchimedes.adf\n");
|
||||
- printf("wonderlandmag=/usr/local/share/games/magneticscrolls/wonder.mag\n");
|
||||
- printf("wonderlandgfx=/usr/local/share/games/magneticscrolls/wonder.gfx\n");
|
||||
- printf(";wonderlandtworsc=/usr/local/share/games/magneticscrolls/WONDER/TWO.RSC\n");
|
||||
+ printf("wonderlandmag=@TERMUX_PREFIX@/share/games/magneticscrolls/wonder.mag\n");
|
||||
+ printf("wonderlandgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/wonder.gfx\n");
|
||||
+ printf(";wonderlandtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/WONDER/TWO.RSC\n");
|
||||
printf("\n");
|
||||
printf("[RANDOM]\n");
|
||||
printf("mode=pseudo\n");
|
||||
--- ../README.txt.orig 2020-12-30 19:24:18.486339201 +0100
|
||||
+++ ./README.txt 2020-12-30 19:24:48.622986868 +0100
|
||||
@@ -56,7 +56,7 @@
|
||||
@ -118,91 +35,6 @@
|
||||
|
||||
TO SEE GRAPHICS IN WONDERLAND OR ANY GAME FROM THE MAGNETIC SCROLLS COLLECTION,
|
||||
you have to type in 'GRAPHICS'. To see the EGA version of those pictures, run
|
||||
--- ../dMagnetic.ini.orig 2020-12-30 19:24:26.906333879 +0100
|
||||
+++ ./dMagnetic.ini 2020-12-30 19:24:48.622986868 +0100
|
||||
@@ -4,57 +4,57 @@
|
||||
;-------------------------------------------------------------------------------
|
||||
;you can download the files from https://msmemorial.if-legends.org/magnetic.php
|
||||
[FILES]
|
||||
-pawnmag=/usr/local/share/games/magneticscrolls/pawn.mag
|
||||
-pawngfx=/usr/local/share/games/magneticscrolls/pawn.gfx
|
||||
-;pawnmsdos=/usr/local/share/games/magneticscrolls/msdosversions/PAWN
|
||||
+pawnmag=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.mag
|
||||
+pawngfx=@TERMUX_PREFIX@/share/games/magneticscrolls/pawn.gfx
|
||||
+;pawnmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/PAWN
|
||||
;pawnd64=/d64/PAWN1.d64,/d64/PAWN2.d64
|
||||
;pawnamstradcpc=/dsk/PAWN1.DSK,/dsk/PAWN2.DSK
|
||||
;pawnspectrum=/dsk/PAWNspectrum.DSK
|
||||
;pawnarchimedes=/adf/PAWNarchimedes.adf
|
||||
;pawnatarixl=/atr/PAWN1.ATR,/atr/PAWN2.ATR
|
||||
-guildmag=/usr/local/share/games/magneticscrolls/guild.mag
|
||||
-guildgfx=/usr/local/share/games/magneticscrolls/guild.gfx
|
||||
-;guildmsdos=/usr/local/share/games/magneticscrolls/msdosversions/GUILD
|
||||
-;guildtworsc=/usr/local/share/games/magneticscrolls/MSC/GTWO.RSC
|
||||
+guildmag=@TERMUX_PREFIX@/share/games/magneticscrolls/guild.mag
|
||||
+guildgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/guild.gfx
|
||||
+;guildmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/GUILD
|
||||
+;guildtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/GTWO.RSC
|
||||
;guild64=/d64/GUILD1.d64,/d64/GUILD2.d64
|
||||
;guildamstradcpc=/dsk/GUILD1.DSK,/dsk/GUILD2.DSK
|
||||
;guildspectrum=/dsk/GUILDspectrum.DSK
|
||||
;guildarchimedes=/adf/GUILDarchimedes.adf
|
||||
;guildatarixl=/atr/GUILD1.ATR,/atr/GUILD2.ATR
|
||||
-jinxtermag=/usr/local/share/games/magneticscrolls/jinxter.mag
|
||||
-jinxtergfx=/usr/local/share/games/magneticscrolls/jinxter.gfx
|
||||
-;jinxtermsdos=/usr/local/share/games/magneticscrolls/msdosversions/JINXTER
|
||||
+jinxtermag=@TERMUX_PREFIX@/share/games/magneticscrolls/jinxter.mag
|
||||
+jinxtergfx=@TERMUX_PREFIX@/share/games/magneticscrolls/jinxter.gfx
|
||||
+;jinxtermsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/JINXTER
|
||||
;jinxterd64=/d64/JINXTER1.d64,/d64/JINXTER2.d64
|
||||
;jinxteramstradcpc=/dsk/JINXTER1.DSK,/dsk/JINXTER2.DSK
|
||||
;jinxterspectrum=/dsk/JINXTERspectrum.DSK
|
||||
;jinxterarchimedes=/adf/JINXTERarchimedes.adf
|
||||
;jinxteratarixl=/atr/JINXTER1.ATR,/atr/JINXTER2.ATR
|
||||
-corruptionmag=/usr/local/share/games/magneticscrolls/ccorrupt.mag
|
||||
-corruptiongfx=/usr/local/share/games/magneticscrolls/ccorrupt.gfx
|
||||
-;corruptionmsdos=/usr/local/share/games/magneticscrolls/msdosversions/CORRUPT
|
||||
-;corruptiontworsc=/usr/local/share/games/magneticscrolls/MSC/CTWO.RSC
|
||||
+corruptionmag=@TERMUX_PREFIX@/share/games/magneticscrolls/ccorrupt.mag
|
||||
+corruptiongfx=@TERMUX_PREFIX@/share/games/magneticscrolls/ccorrupt.gfx
|
||||
+;corruptionmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/CORRUPT
|
||||
+;corruptiontworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/CTWO.RSC
|
||||
;corruptiond64=/d64/CORRUPT1.d64,/d64/CORRUPT2.d64
|
||||
;corruptionamstradcpc=/dsk/CORRUPTION1.DSK,/dsk/CORRUPTION2.DSK
|
||||
;corruptionspectrum=/dsk/CORRUPTIONspectrum.DSK
|
||||
;corruptionarchimedes=/adf/CORRUPTIONarchimedes.adf
|
||||
-fishmag=/usr/local/share/games/magneticscrolls/fish.mag
|
||||
-fishgfx=/usr/local/share/games/magneticscrolls/fish.gfx
|
||||
-;fishmsdos=/usr/local/share/games/magneticscrolls/msdosversions/FISH
|
||||
-;fishtworsc=/usr/local/share/games/magneticscrolls/MSC/FTWO.RSC
|
||||
+fishmag=@TERMUX_PREFIX@/share/games/magneticscrolls/fish.mag
|
||||
+fishgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/fish.gfx
|
||||
+;fishmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/FISH
|
||||
+;fishtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/MSC/FTWO.RSC
|
||||
;fishd64=/d64/FISH1.d64,/d64/FISH2.d64
|
||||
;fishamstradcpc=/dsk/FISH1.DSK,/dsk/FISH2.DSK
|
||||
;fishspectrum=/dsk/FISHspectrum.DSK
|
||||
;fisharchimedes=/adf/FISHarchimedes.adf
|
||||
-mythmag=/usr/local/share/games/magneticscrolls/myth.mag
|
||||
-mythgfx=/usr/local/share/games/magneticscrolls/myth.gfx
|
||||
-;mythmsdos=/usr/local/share/games/magneticscrolls/msdosversions/MYTH
|
||||
-;mythd64=/usr/local/share/games/magneticscrolls/MYTH.d64
|
||||
+mythmag=@TERMUX_PREFIX@/share/games/magneticscrolls/myth.mag
|
||||
+mythgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/myth.gfx
|
||||
+;mythmsdos=@TERMUX_PREFIX@/share/games/magneticscrolls/msdosversions/MYTH
|
||||
+;mythd64=@TERMUX_PREFIX@/share/games/magneticscrolls/MYTH.d64
|
||||
;mythamstradcpc=/dsk/MYTH1.DSK,/dsk/MYTH2.DSK
|
||||
;mythspectrum=/dsk/MYTHspectrum.DSK
|
||||
;mytharchimedes=/adf/MYTHarchimedes.adf
|
||||
-wonderlandmag=/usr/local/share/games/magneticscrolls/wonder.mag
|
||||
-wonderlandgfx=/usr/local/share/games/magneticscrolls/wonder.gfx
|
||||
-;wonderlandtworsc=/usr/local/share/games/magneticscrolls/WONDER/TWO.RSC
|
||||
+wonderlandmag=@TERMUX_PREFIX@/share/games/magneticscrolls/wonder.mag
|
||||
+wonderlandgfx=@TERMUX_PREFIX@/share/games/magneticscrolls/wonder.gfx
|
||||
+;wonderlandtworsc=@TERMUX_PREFIX@/share/games/magneticscrolls/WONDER/TWO.RSC
|
||||
|
||||
[RANDOM]
|
||||
mode=pseudo
|
||||
--- ../dMagneticini.5.orig 2020-12-30 19:24:36.349661263 +0100
|
||||
+++ ./dMagneticini.5 2020-12-30 19:24:48.622986868 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
|
11
packages/dmagnetic/use-dMagnetic-from-PATH.patch
Normal file
11
packages/dmagnetic/use-dMagnetic-from-PATH.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- ../Makefile.orig 2021-02-11 07:22:47.083353961 +0000
|
||||
+++ ./Makefile 2021-02-11 07:24:28.119942571 +0000
|
||||
@@ -110,7 +110,7 @@
|
||||
$(LINK) $(LDFLAGS) -o $@ $(OBJ_LOADER) $(OBJ_LINEA) $(OBJ_VM68K) $(OBJ_GUI) $(OBJ_TOPLEVEL)
|
||||
|
||||
dMagnetic.ini: dMagnetic
|
||||
- ./dMagnetic -helpini >dMagnetic.ini
|
||||
+ dMagnetic -helpini >dMagnetic.ini
|
||||
|
||||
.c.o:
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(INCFLAGS) -c -o $@ $<
|
Loading…
x
Reference in New Issue
Block a user