diff --git a/bin/buildpreall.bat b/bin/buildpreall.bat index 762078f1e..2fd2a0951 100644 --- a/bin/buildpreall.bat +++ b/bin/buildpreall.bat @@ -1,4 +1,3 @@ @echo off -setlocal enabledelayedexpansion -1>nul copy /y %1\STANDARD %2 +1>nul copy /y %3 %2 for /f "tokens=*" %%a in (build\games.lst) do 1>nul copy /b /y %2+%1\%%a %2 diff --git a/bin/buildss.js b/bin/buildss.js index 2587e1f40..da7d24697 100644 --- a/bin/buildss.js +++ b/bin/buildss.js @@ -8,6 +8,7 @@ for (b = new Enumerator(a.GetFolder(WScript.Arguments(0)).files); !b.atEnd(); b. } entries.sort() +a.createtextfile("build\\games.lst").write(entries.toString().replace(/,/g, "\n")) ss_off = 0 groups = "*=0\n" + "!le16 " + entries.length.toString() + ", 0\n" diff --git a/bin/buildssall.bat b/bin/buildssall.bat deleted file mode 100644 index dfb921b4d..000000000 --- a/bin/buildssall.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -1>nul copy /y nul %2 -rem requires sorted file-system -for %%a in (%1\*) do 1>nul copy /b /y %2+%%a %2 diff --git a/winmake.bat b/winmake.bat index 24bfb3555..fdee1d355 100644 --- a/winmake.bat +++ b/winmake.bat @@ -55,15 +55,15 @@ cscript /nologo bin\buildfx.js "res\FX.CONF" "build\fx.inc" "build\FX.IDX" >>bui cscript /nologo bin\buildfx.js "res\DFX.CONF" "build\dfx.inc" "build\DFX.IDX" >>build\log for %%q in (res\GAMEHELP\*) do cscript /nologo bin\subst.js %%q "build\GAMEHELP\%%~nxq" >>build\log cscript /nologo bin\buildpre.js "build\GAMEHELP" "build\help.inc" "build\GAMEHELP.IDX" >>build\log -call bin\buildpreall.bat build\GAMEHELP build\GAMEHELP.ALL >>build\log +call bin\buildpreall.bat build\GAMEHELP build\GAMEHELP.ALL build\GAMEHELP\STANDARD >>build\log for %%q in (res\SS\*) do cscript /nologo bin\buildokvs.js "%%q" "build\SS\%%~nxq" >>build\log -call bin\buildssall.bat build\SS build\SLIDESHOW.ALL >>build\log cscript /nologo bin\buildss.js "build\SS" "build\ss.inc" "build\SLIDESHOW.IDX" >>build\log +call bin\buildpreall.bat build\SS build\SLIDESHOW.ALL nul >>build\log for %%q in (res\ATTRACT\*) do cscript /nologo bin\buildokvs.js "%%q" "build\ATTRACT\%%~nxq" >>build\log -call bin\buildssall.bat build\ATTRACT build\MINIATTRACT.ALL>>build\log cscript /nologo bin\buildss.js "build\ATTRACT" "build\attract.inc" "build\MINIATTRACT.IDX" >>build\log +call bin\buildpreall.bat build\ATTRACT build\MINIATTRACT.ALL nul >>build\log cscript /nologo bin\buildpre.js "build\PRELAUNCH" "build\prelaunch.inc" "build\PRELAUNCH.IDX" >>build\log -call bin\buildpreall.bat build\PRELAUNCH build\PRELAUNCH.ALL >>build\log +call bin\buildpreall.bat build\PRELAUNCH build\PRELAUNCH.ALL build\PRELAUNCH\STANDARD >>build\log %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\TITLE" >>build\log %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\COVER" >>build\log %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "res\HELP" >>build\log