From 6f72cb7eb693aa8c752b784c01c8909accb67e25 Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Fri, 20 Sep 2019 12:39:52 -0700
Subject: [PATCH] sync

---
 bin/extract.js |  8 --------
 winmake.bat    | 12 ++++++++----
 2 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 bin/extract.js

diff --git a/bin/extract.js b/bin/extract.js
deleted file mode 100644
index 1179e9a08..000000000
--- a/bin/extract.js
+++ /dev/null
@@ -1,8 +0,0 @@
-a = new ActiveXObject("scripting.filesystemobject")
-for (b = new Enumerator(a.GetFolder(WScript.Arguments(0)).files); !b.atEnd(); b.moveNext())
-{
-    if (a.GetExtensionName(b.item()).toLowerCase() == "po")
-    {
-        new ActiveXObject("WScript.Shell").run("cadius.exe EXTRACTVOLUME " + '"' + b.item() + '"' + " build/X/", 0)
-    }
-}
diff --git a/winmake.bat b/winmake.bat
index d63980a72..eb5dc6db8 100644
--- a/winmake.bat
+++ b/winmake.bat
@@ -20,11 +20,9 @@ set CADIUS=cadius
 if "%1" equ "asm" (
 :asm
 call :md
+call :asmlauncher
 call :asmfx
 call :asmprelaunch
-2>build\relbase.log %ACME% src\4cade.a
-for /f "tokens=*" %%q in (build\relbase.log) do set _make=%%q
-%ACME% -DRELBASE=$!_make:~-5,4! -r build\4cade.lst src\4cade.a
 goto :EOF
 )
 
@@ -93,7 +91,7 @@ cscript /nologo bin\rsync.js res\fx\* build\FX >>build\log
 %CADIUS% CREATEFOLDER "build\%DISK%" "/%VOLUME%/X/" >>build\log
 cscript /nologo bin\do2po.js res\dsk build\po
 cscript /nologo bin\rsync.js res\dsk\*.po build\po
-cscript /nologo bin\extract.js build\po >>build\log
+for %%q in (build\po\*.po) do %CADIUS% EXTRACTVOLUME "%%q" build\X\ >>build\log
 echo y|1>nul 2>nul del /s build\X\.DS_Store
 echo y|1>nul 2>nul del /s build\X\PRODOS
 echo y|1>nul 2>nul del /s build\X\LOADER.SYSTEM
@@ -130,6 +128,12 @@ goto :EOF
 2>nul md build\PRELAUNCH
 goto :EOF
 
+:asmlauncher
+2>build\relbase.log %ACME% src\4cade.a
+for /f "tokens=*" %%q in (build\relbase.log) do set _make=%%q
+%ACME% -DRELBASE=$!_make:~-5,4! -r build\4cade.lst src\4cade.a
+goto :EOF
+
 :asmfx
 for %%q in (src\fx\*.a) do (
   for /f "tokens=* usebackq" %%k in (`find "^!to" %%q`) do set _to=%%k