diff --git a/Makefile b/Makefile index ccc2ea57c..2db546df8 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,15 @@ VOLUME=TOTAL.REPLAY # third-party tools required to build # https://sourceforge.net/projects/acme-crossass/ +# version 0.96.3 or later ACME=acme -# https://github.com/sicklittlemonkey/cadius +# https://github.com/mach-kernel/cadius # version 1.4.0 or later CADIUS=cadius # https://bitbucket.org/magli143/exomizer/wiki/Home +# version 3.1.0 or later EXOMIZER=exomizer mem -q -P23 -lnone dsk: asm @@ -34,7 +36,9 @@ dsk: asm bin/buildokvs.sh "res/ATTRACT.CONF" "build/ATTRACT.IDX" >>build/log bin/buildfx.sh "res/FX.CONF" "build/FX.IDX" "build/FX.ALL" "build/FX" >>build/log bin/buildfx.sh "res/DFX.CONF" "build/DFX.IDX" "build/DFX.ALL" "build/FX" >>build/log - for f in res/GAMEHELP/*; do tr "\*\~\<\>\$$\%\[" "\020\021\010\025\016\017\000" < "$$f" > build/GAMEHELP/"$$(basename $$f)"; done >>build/log + bin/converthelp.sh res/HELPTEXT build/HELPTEXT >>build/log + bin/converthelp.sh res/CREDITS build/CREDITS >>build/log + for f in res/GAMEHELP/*; do bin/converthelp.sh "$$f" build/GAMEHELP/"$$(basename $$f)"; done >>build/log bin/buildhelp.sh "res/GAMES.CONF" "build/GAMEHELP.IDX" "build/GAMEHELP.ALL" "build/GAMEHELP" >>build/log rm -f build/SSDIR.CONF && touch build/SSDIR.CONF >>build/log for f in res/SS/*; do bin/buildokvs.sh "$$f" "build/SS/$$(basename $$f)" && echo "$$(basename $$f)" >> build/SSDIR.CONF; done >>build/log @@ -43,7 +47,7 @@ dsk: asm for f in res/ATTRACT/*; do bin/buildokvs.sh "$$f" "build/ATTRACT/$$(basename $$f)" && echo "$$(basename $$f)" >> build/ATTRACTDIR.CONF; done >>build/log bin/buildfx.sh "build/ATTRACTDIR.CONF" "build/MINIATTRACT.IDX" "build/MINIATTRACT.ALL" "build/ATTRACT" >>build/log bin/buildhelp.sh "res/GAMES.CONF" "build/PRELAUNCH.IDX" "build/PRELAUNCH.ALL" "build/PRELAUNCH" >>build/log - for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/PREFS.CONF res/CREDITS res/HELPTEXT build/ATTRACT.IDX build/FX.IDX build/FX.ALL build/DFX.IDX build/DFX.ALL build/GAMEHELP.IDX build/GAMEHELP.ALL build/SLIDESHOW.IDX build/SLIDESHOW.ALL build/MINIATTRACT.IDX build/MINIATTRACT.ALL build/PRELAUNCH.IDX build/PRELAUNCH.ALL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done + for f in res/TITLE res/COVER res/HELP res/GAMES.CONF build/PREFS.CONF build/CREDITS build/HELPTEXT build/ATTRACT.IDX build/FX.IDX build/FX.ALL build/DFX.IDX build/DFX.ALL build/GAMEHELP.IDX build/GAMEHELP.ALL build/SLIDESHOW.IDX build/SLIDESHOW.ALL build/MINIATTRACT.IDX build/MINIATTRACT.ALL build/PRELAUNCH.IDX build/PRELAUNCH.ALL res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log bin/buildfileinfo.sh res/ACTION.HGR "06" "3FF8" >>build/log diff --git a/bin/changebootloader.sh b/bin/changebootloader.sh index bb0417d50..851d2d3bf 100755 --- a/bin/changebootloader.sh +++ b/bin/changebootloader.sh @@ -1,3 +1,3 @@ #!/bin/sh -dd of="$1" bs=1 count=512 conv=notrunc < "$2" +dd of="$1" bs=1 count=512 conv=notrunc < "$2" 2>/dev/null diff --git a/bin/converthelp.sh b/bin/converthelp.sh new file mode 100755 index 000000000..c48bebc98 --- /dev/null +++ b/bin/converthelp.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +tr "\*\~\<\>\$$\%" "\020\021\010\025\016\017" < "$1" | sed '/^\[/d' > "$2" +dd if=/dev/zero bs=1 count=1 2>/dev/null >> "$2" diff --git a/bin/padto.sh b/bin/padto.sh index eb4deb7cb..1721ab3d3 100755 --- a/bin/padto.sh +++ b/bin/padto.sh @@ -8,4 +8,4 @@ outfile=$2 || filesize=$(stat -f "%z" "$outfile") padsize=$((512-$filesize)) -dd if=/dev/zero bs=1 count=$padsize >> "$outfile" +dd if=/dev/zero bs=1 count=$padsize 2>/dev/null >> "$outfile" diff --git a/res/HELPTEXT b/res/HELPTEXT index 11d72fa25..1680919e4 100644 Binary files a/res/HELPTEXT and b/res/HELPTEXT differ