diff --git a/.github/workflows/binaries-win32.yml b/.github/workflows/binaries-win32.yml index 75c903df..c2503c67 100644 --- a/.github/workflows/binaries-win32.yml +++ b/.github/workflows/binaries-win32.yml @@ -64,7 +64,7 @@ jobs: - name: Create mes shell: pwsh run: | - ..\src\.win32vc16-release-mecw\mecw32.exe -p -n "@mesgen" -f -p ..\src\.win32vc16s-release-mew\mew32.exe -o ../../binaries-win32/mes-win32.exe + ..\src\.win32vc16-release-mecw\mecw32.exe -p -n "@mesgen" -f -p ..\src\.win32vc16s-release-mew\mew32.exe -o ../../binaries-win32/mes-win32.exe -t ..\3rdparty\tfs\.win32vc16-release\tfs.exe working-directory: ./microemacs/mesingle - name: Upload Packages diff --git a/microemacs/mesingle/mesgen.emf b/microemacs/mesingle/mesgen.emf index 17c8f3ba..0041ce6d 100644 --- a/microemacs/mesingle/mesgen.emf +++ b/microemacs/mesingle/mesgen.emf @@ -9,6 +9,7 @@ ; ;set-variable $debug 8 set-variable %mes-opts "" +set-variable %mes-tfs "tfs" set-variable #l0 0 !while &exi &cat ".about.arg" #l0 set-variable #l1 &ind &cat ".about.arg" &pinc #l0 1 @@ -27,6 +28,8 @@ set-variable #l0 0 -1 ml-write " : Output file name" -1 ml-write " -p " -1 ml-write " : MicroEmacs program/executable file" + -1 ml-write " -t " + -1 ml-write " : TFS executable - must run on current platform" 4 exit-emacs 1 !endif set-variable %mes-opts &cat %mes-opts &rig #l1 1 @@ -34,6 +37,8 @@ set-variable #l0 0 set-variable %mes-outn &ind &cat ".about.arg" &pinc #l0 1 !elif &sin "p" #l1 set-variable %mes-prog &ind &cat ".about.arg" &pinc #l0 1 + !elif &sin "t" #l1 + set-variable %mes-tfs &ind &cat ".about.arg" &pinc #l0 1 !endif !done set-variable %mes-verb &sub &len %mes-opts &len &rep %mes-opts "V" "" @@ -78,7 +83,7 @@ define-macro mesingle-gen !return !endif !if &seq &set #l1 &whi &cat #l0 "tfs" "ERROR" - !if &seq &set #l1 &whi "tfs" "ERROR" + !if &seq &set #l1 &whi %mes-tfs "ERROR" -2 ml-write "mesgen Error: failed to locate tfs executable" !abort !endif