Merge branch 'make-fix'

appveyor.yml

@@ -11,6 +11,21 @@ install:
     cargo -V
 build_script:
 - cmd: |-
+    rem make
+    cd make
+    rem To build make we need mingw...
+    path %path%;C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\bin
+    call bootstrap.bat
+    rem We omit support for the Guile scripting language which doesn't work right in Windows anyway
+    call build_w32.bat --without-guile
+    copy WinRel\gnumake.exe make.exe
+    copy COPYING make.license.txt
+    for /f %%s in ('git rev-parse --short HEAD') do set git-rev=%%s
+    for /f "delims=" %%s in ('make.exe --version ^| find "Make"') do set reported=%%s
+    echo %reported% %git-rev% >> ..\versions.txt
+    cd ..
+    7z a tools.7z ./make/make.exe ./make/make.license.txt
+
     rem Z80Bench
     cd z80bench
     msbuild z80bench.sln /m /p:Platform="Any CPU";Configuration=Release;RestorePackagesConfig=true /t:restore;build 
@@ -76,21 +91,6 @@ build_script:
     rem Compile.bat
     7z a tools.7z Compile.bat
     
-    rem make
-    cd make
-    rem To build make we need sed...
-    path %path%;C:\msys64\bin
-    call bootstrap.bat
-    rem We omit support for the Guile scripting language which doesn't work right in Windows anyway
-    call build_w32.bat --without-guile
-    copy WinRel\gnumake.exe make.exe
-    copy COPYING make.license.txt
-    for /f %%s in ('git rev-parse --short HEAD') do set git-rev=%%s
-    for /f "delims=" %%s in ('make.exe --version ^| find "Make"') do set reported=%%s
-    echo %reported% %git-rev% >> ..\versions.txt
-    cd ..
-    7z a tools.7z ./make/make.exe ./make/make.license.txt
-
     7z a tools.7z versions.txt
 
 artifacts: