busybox64

adamyg · Mar 31, 2024 · 0b74603 · 0b74603
1 parent bcaaa9e
commit 0b74603
Show file tree

Hide file tree

Showing 7 changed files with 1,731 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -78,9 +78,11 @@ jobs:
         @if "${{ matrix.config.toolchain }}"=="mingw32" set PATH=c:\msys64\mingw32\bin;%PATH%
         @if "${{ matrix.config.toolchain }}"=="mingw64" set PATH=c:\msys64\mingw64\bin;%PATH%
         @if "${{ matrix.config.toolchain }}"=="owc20"   call .\mcwin32\support\owc20setenv.bat C:\Watcom
+        @set BUSYBOX=./support/busybox
+        @if "${{ matrix.config.toolchain }}"=="mingw64" set BUSYBOX=./support/busybox64
         @set PERL=c:/Strawberry/perl/bin/perl
         cd mcwin32
-        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=./support/busybox --verbose "${{ matrix.config.toolchain }}"
+        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=%BUSYBOX% --verbose "${{ matrix.config.toolchain }}"
 
     - name: Compile
       if: startsWith(matrix.config.name, 'Windows Latest')

diff --git a/mcwin32/releases/README.txt b/mcwin32/releases/README.txt
@@ -10,9 +10,10 @@ the current 4.8.x development stream.
 
         4.8.31          230 (mc merge 4.8.31)
 
+                                 - 4.8.31 (#74)
                                  - mbedtls 3.5.2 (#67)
                                  - AltGr detection (#71, #52)
-                                 - mcdiff integration (#74)
+                                 - mcdiff integration (#70)
                                  - cd/cdpath (#72)
 
         4.8.30          229 (mc merge 4.8.30)