Checkpoint - Windows 11 with Cygwin and MinGW64 packages.

This commit is contained in:
Landon Curt Noll
2022-02-12 12:44:32 -08:00
parent 8217c49b94
commit 4470f1f62e
4 changed files with 27 additions and 25 deletions

View File

@@ -23,8 +23,8 @@ The following are the changes from calc version 2.14.0.15 to date:
Added .PHONY rule, just after all rule, to Makefiles. Added .PHONY rule, just after all rule, to Makefiles.
Added ${MSYS} Makefile variable for users under Windows 11 who Added ${WINGM} Makefile variable for users under Windows 11 who
use MINGW64_NT. use Cygwin and the MinGW64 packages.
Fixed missing quotes in the PASSDOWN makefile variables. Fixed missing quotes in the PASSDOWN makefile variables.

View File

@@ -77,8 +77,8 @@ endif
ifeq ($(hardware),) ifeq ($(hardware),)
hardware=$(shell uname -m 2>/dev/null) hardware=$(shell uname -m 2>/dev/null)
endif endif
ifeq ($(MSYS),) ifeq ($(MINGW),)
MSYS=$(shell uname -o 2>/dev/null) MINGW=$(shell uname -o 2>/dev/null)
endif endif
# #
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
@@ -107,8 +107,13 @@ SHELL= /bin/bash
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
SHELL:= /bin/sh SHELL:= /bin/sh
endif endif
ifeq ($(MSYS),Msys) #
SHELL:= "git-bash.exe" # If you are using Cygwin with MinGW64 packages
# then we will also need to use the Cygwin runtime enviroment
# and the calc Cygwin make target.
##
ifeq ($(MINGW),Cygwin)
target:= Cygwin
endif endif
# #
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */
@@ -2202,7 +2207,7 @@ CUSTOM_PASSDOWN= \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MV="${MV}" \ MV="${MV}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
PURIFY="${PURIFY}" \ PURIFY="${PURIFY}" \
Q="${Q}" \ Q="${Q}" \
@@ -2255,7 +2260,7 @@ HELP_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
MV="${MV}" \ MV="${MV}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -2290,7 +2295,7 @@ CAL_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
MV="${MV}" \ MV="${MV}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -2326,7 +2331,7 @@ CSCRIPT_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
MV="${MV}" \ MV="${MV}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -4876,7 +4881,7 @@ env:
@echo 'MANMAKE=${MANMAKE}'; echo '' @echo 'MANMAKE=${MANMAKE}'; echo ''
@echo 'MANMODE=${MANMODE}'; echo '' @echo 'MANMODE=${MANMODE}'; echo ''
@echo 'MKDIR=${MKDIR}'; echo '' @echo 'MKDIR=${MKDIR}'; echo ''
@echo 'MSYS=${MSYS}'; echo '' @echo 'MINGW=${MINGW}'; echo ''
@echo 'MV=${MV}'; echo '' @echo 'MV=${MV}'; echo ''
@echo 'NROFF=${NROFF}'; echo '' @echo 'NROFF=${NROFF}'; echo ''
@echo 'NROFF_ARG=${NROFF_ARG}'; echo '' @echo 'NROFF_ARG=${NROFF_ARG}'; echo ''

View File

@@ -1614,7 +1614,7 @@ CUSTOM_PASSDOWN= \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MV="${MV}" \ MV="${MV}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
PURIFY="${PURIFY}" \ PURIFY="${PURIFY}" \
Q="${Q}" \ Q="${Q}" \
@@ -1667,7 +1667,7 @@ HELP_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
MV="${MV}" \ MV="${MV}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -1702,7 +1702,7 @@ CAL_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
MV="${MV}" \ MV="${MV}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -1738,7 +1738,7 @@ CSCRIPT_PASSDOWN= \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
MKDIR="${MKDIR}" \ MKDIR="${MKDIR}" \
MSYS="${MSYS}" \ MINGW="${MINGW}" \
MV="${MV}" \ MV="${MV}" \
PREFIX="${PREFIX}" \ PREFIX="${PREFIX}" \
Q="${Q}" \ Q="${Q}" \
@@ -4169,7 +4169,7 @@ env:
@echo 'MANMAKE=${MANMAKE}'; echo '' @echo 'MANMAKE=${MANMAKE}'; echo ''
@echo 'MANMODE=${MANMODE}'; echo '' @echo 'MANMODE=${MANMODE}'; echo ''
@echo 'MKDIR=${MKDIR}'; echo '' @echo 'MKDIR=${MKDIR}'; echo ''
@echo 'MSYS=${MSYS}'; echo '' @echo 'MINGW=${MINGW}'; echo ''
@echo 'MV=${MV}'; echo '' @echo 'MV=${MV}'; echo ''
@echo 'NROFF=${NROFF}'; echo '' @echo 'NROFF=${NROFF}'; echo ''
@echo 'NROFF_ARG=${NROFF_ARG}'; echo '' @echo 'NROFF_ARG=${NROFF_ARG}'; echo ''

View File

@@ -27,18 +27,15 @@ NOTE: The main developers do not have access to a Windows based platform.
We were given this advice from a Windows 11 developer: We were given this advice from a Windows 11 developer:
Windows 11 users should try: Windows 11 users could use Cygwin:
https://git-scm.com/downloads https://cygwin.com/install.html
When you run the installer wizard, make sure you choose/check and include all MinGW64 packages.
the git bash installer option.
https://www.mingw-w64.org/ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
=-= Compiling calc via virtual machine under Windows 11 =-=
Runtime environment for GCC & LLVM for 32 and 64 bit Windows =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
We suggest Windows 11 users consider using MINGW64.
We would prefer a Windows 11 solution that does not require a Windows 11 We would prefer a Windows 11 solution that does not require a Windows 11
developer to install a Linux virtual machine. Nevertheless, a Windows 11 developer to install a Linux virtual machine. Nevertheless, a Windows 11