#105 - cleanup

adamyg · Feb 7, 2025 · 7dacec4 · 7dacec4
1 parent c1dc653
commit 7dacec4
Show file tree

Hide file tree

Showing 318 changed files with 3,203 additions and 2,261 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; -*-
-# $Id: Makefile.in,v 1.81 2025/01/17 19:07:47 cvsuser Exp $
+# $Id: Makefile.in,v 1.82 2025/02/07 02:56:58 cvsuser Exp $
 # GRIEF - top level makefile.
 #
 # Copyright (c) 1998 - 2025, Adam Young.
@@ -135,10 +135,13 @@ endif
 define usage =
 	@$(ECHO) -n -e "\
 	|\n\
-	| make [release or debug] target \n\
+	| make [VERBOSE=1] [release or debug] target \n\
 	|\n\
 	|	Build one or more of the following targets recursively within each sub-directory\n\
-	|	for the toolchain @TOOLCHAIN@. \n\
+	|	for the toolchain "@TOOLCHAINNAME@" (@TOOLCHAIN@). \n\
+	|\n\
+	| Options: \n\
+	|	VERBOSE - increase run-time diagnostics; suppress stderr filtering. \n\
 	|\n\
 	| Targets: \n\
 	|\n\
@@ -215,8 +218,8 @@ endif
 
 D_INC=		$(ROOT)/include
 D_BIN=		$(ROOT)/bin@TOOLCHAINEXT@/$(BUILD_TYPE)
-D_OBJ=		$(ROOT)/obj@TOOLCHAINEXT@/$(BUILD_TYPE)
 D_LIB=		$(ROOT)/lib@TOOLCHAINEXT@/$(BUILD_TYPE)
+D_OBJ=		$(ROOT)/obj@TOOLCHAINEXT@/$(BUILD_TYPE)
 
 D_GR=		$(ROOT)/gr
 D_GM=		$(ROOT)/gm
@@ -466,13 +469,13 @@ $(BUILDINFO):		Makefile $(BUILDNUMBER) buildinfo
 buildinfo:
 		@echo updating buildinfo.h ...
 		-@$(PERL) ./buildinfo.pl -o $(BUILDINFO) --prefix="GR_" --package="$(PACKAGE)" --name="$(PKG_NAME)" --version="$(PKG_VERSION)" \
-			--date="$(BUILD_DATE)" --build="$(BUILD_NUMBER)" --toolchain="@TOOLCHAINEXT@" --type="$(BUILD_TYPE)" \
+			--date="$(BUILD_DATE)" --build="$(BUILD_NUMBER)" --toolchain="@TOOLCHAINEXT@" --type="$(BUILD_TYPE)" --iswin64="@ISWIN64@" \
 			--bindir="$(BINDIR)" --sbindir="$(SBINDIR)" --libexecdir="$(LIBEXECDIR)" --libdir="$(LIBDIR)" --datadir="$(DATADIR)"
 
 .PHONY:		packageinfo
 packageinfo:
 		-@$(PERL) ./buildinfo.pl -o $(PACKAGEINFO) --prefix="GR_" --package="$(PACKAGE)" --name="$(PKG_NAME)" --version="$(PKG_VERSION)" \
-			--date="$(BUILD_DATE)" --build="$(BUILD_NUMBER)" --toolchain="@TOOLCHAINEXT@" --type="$(BUILD_TYPE)"
+			--date="$(BUILD_DATE)" --build="$(BUILD_NUMBER)" --toolchain="@TOOLCHAINEXT@" --type="$(BUILD_TYPE)" --iswin64="@ISWIN64@"
 
 buildinfo.h:			BUILDNUMBER buildinfo.pl
 

diff --git a/buildinfo.pl b/buildinfo.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # -*- mode: perl; -*-
-# $Id: buildinfo.pl,v 1.12 2025/01/13 14:57:54 cvsuser Exp $
+# $Id: buildinfo.pl,v 1.13 2025/02/07 02:53:07 cvsuser Exp $
 # buildinfo generation
 #
 # Copyright 2018 - 2025, Adam Young
@@ -48,6 +48,7 @@
 my $buildnumber = "1";
 my $buildtype = undef;
 my $buildtoolchain = undef;
+my $iswin64 = undef;
 
 my $bindir  = undef;
 my $sbindir = undef;
@@ -67,6 +68,7 @@
 		'date=i'        => \$builddate,
 		'build=i'       => \$buildnumber,
 		'toolchain=s'   => \$buildtoolchain,
+		'iswin64=s'     => \$iswin64,
 		'type:s'        => \$buildtype,
 		'bindir:s'      => \$bindir,
 		'sbindir:s'     => \$sbindir,
@@ -153,6 +155,14 @@
 			if ($buildtoolname =~ /64$/);
 	}
 
+	if (defined $iswin64) {
+		if ($iswin64 eq 'yes') {
+			print FILE "#define BUILD_ISWIN64 1\n";
+		} else {
+			print FILE "#define BUILD_ISWIN32 1\n";
+		}
+	}
+
 	if ($buildtype) {
 		print FILE "#define BUILD_TYPE \"${buildtype}\"\n";
 
@@ -204,6 +214,7 @@
     --date <date>           Build date.
     --build <number>        Build number.
     --toolchain <desc>      Toolchain.
+    --iswin64 <yes|no>      Optional architecture, win64 otherwise win32.
 
     --bindir <path>         bindir path.
     --sbindir <path>        sbindir path.

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
@@ -1,9 +1,9 @@
 # -*- mode: mak; -*-
-# $Id: Makefile.in,v 1.22 2024/05/28 08:45:43 cvsuser Exp $
+# $Id: Makefile.in,v 1.23 2025/01/23 14:34:55 cvsuser Exp $
 # External packages.
 #
 #
-# Copyright (c) 1998 - 2024, Adam Young.
+# Copyright (c) 1998 - 2025, Adam Young.
 # All rights reserved.
 #
 # This file is part of the GRIEF Editor.

diff --git a/contrib/byacc/Makefile.in b/contrib/byacc/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.3 2024/05/28 15:00:35 cvsuser Exp $
+# $Id: Makefile.in,v 1.4 2025/02/07 03:03:20 cvsuser Exp $
 # byacc makefile.
 #
 # License:
@@ -79,9 +79,6 @@ endif
 
 CINCLUDE=	-I. -I$(D_INC) @CINCLUDE@
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-endif
 
 ifeq ("$(BUILD_TYPE)","release")
 CFLAGS+=	$(CRELEASE) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)

diff --git a/contrib/extags/Makefile.in b/contrib/extags/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.9 2024/04/16 11:37:12 cvsuser Exp $
+# $Id: Makefile.in,v 1.10 2025/02/07 03:03:20 cvsuser Exp $
 # extags makefile
 #
 #
@@ -57,7 +57,7 @@ LDRELEASE=	@LDRELEASE@
 CINCLUDE=	-I. -I$(D_INC) @CINCLUDE@
 
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 CEXTRA+=	-DWIN32
 endif
 

diff --git a/contrib/flex/Makefile.in b/contrib/flex/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.6 2024/05/28 15:00:29 cvsuser Exp $
+# $Id: Makefile.in,v 1.7 2025/02/07 03:03:20 cvsuser Exp $
 # flex 2.5.10 makefile.
 #
 #
@@ -91,9 +91,6 @@ endif
 
 CINCLUDE=	-I. -I$(D_INC) @CINCLUDE@
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-endif
 
 ifeq ("$(BUILD_TYPE)","release")
 CFLAGS+=	$(CRELEASE) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)

diff --git a/contrib/hunspell/Makefile.in b/contrib/hunspell/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.26 2024/04/16 11:37:12 cvsuser Exp $
+# $Id: Makefile.in,v 1.27 2025/02/07 03:03:20 cvsuser Exp $
 # libhunspell, hunspell, hzip and hunzip makefile.
 #
 #
@@ -75,9 +75,6 @@ LDRELEASE=	@LDRELEASE@
 
 CINCLUDE=	-I. -I./win32 -I$(D_INC)
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-endif
 
 ifeq ("$(BUILD_TYPE)","release")
 CFLAGS+=	$(CRELEASE) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)

diff --git a/contrib/libarchive/Makefile.in b/contrib/libarchive/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.18 2024/04/16 11:37:12 cvsuser Exp $
+# $Id: Makefile.in,v 1.19 2025/02/07 03:03:20 cvsuser Exp $
 # libarchive makefile
 #
 #
@@ -58,9 +58,6 @@ LDRELEASE=	@LDRELEASE@
 
 CINCLUDE=	-I. -I$(D_INC) @CINCLUDE@
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-endif
 
 ifeq ("$(BUILD_TYPE)","release")
 CFLAGS+=	$(CRELEASE) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)
@@ -223,7 +220,7 @@ LIBOBJS+=\
 	$(D_OBJ)/archive_ppmd8$(O)
 endif
 
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 LIBOBJS+=\
 	$(D_OBJ)/archive_windows$(O)				\
 	$(D_OBJ)/filter_fork_windows$(O)

diff --git a/contrib/libbzip2/Makefile.in b/contrib/libbzip2/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.14 2024/04/16 11:37:12 cvsuser Exp $
+# $Id: Makefile.in,v 1.15 2025/02/07 03:03:20 cvsuser Exp $
 # libbz2 makefile
 #
 #
@@ -62,9 +62,6 @@ LDRELEASE=	@LDRELEASE@
 
 CINCLUDE=	-I. -I$(D_INC) @CINCLUDE@
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-endif
 
 ifeq ("$(BUILD_TYPE)","release")
 CFLAGS+=	$(CRELEASE) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)
@@ -142,7 +139,7 @@ $(BZ2LIB):		$(LIBOBJS)
 		$(RANLIB) $@
 
 $(BZ2DLL):		CEXTRA += -DLIBBZIP2_DYNAMIC -D__LIBBZIP2_BUILD
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 $(BZ2DLL):		BZ2DEF = -export-symbols libbz2_win32.def
 endif
 $(BZ2DLL):		MAPFILE=$(basename $@).map

diff --git a/contrib/libcitrus/Makefile.in b/contrib/libcitrus/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.13 2024/06/04 13:28:57 cvsuser Exp $
+# $Id: Makefile.in,v 1.15 2025/02/07 03:05:28 cvsuser Exp $
 # libcitrus and modules makefile
 #
 #
@@ -73,13 +73,14 @@ XFLAGS+=\
 	-Wno-unused-variable \
 	-Wno-implicit-fallthrough \
 	-Wno-unused-but-set-variable \
-	-Wno-sign-compare
+	-Wno-sign-compare \
+	-Wno-pointer-compare
 endif
 
 CINCLUDE=	-I. -I./src -I$(D_INC) @CINCLUDE@
 
 CEXTRA=		$(filter-out -D_WIN32_WINNT%,@DEFS@)
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 CEXTRA+=	-DWIN32
 endif
 

diff --git a/contrib/libguess/Makefile.in b/contrib/libguess/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.10 2024/05/28 15:22:44 cvsuser Exp $
+# $Id: Makefile.in,v 1.11 2025/02/07 03:03:20 cvsuser Exp $
 # libguess makefile
 #
 #
@@ -70,9 +70,6 @@ endif
 
 CINCLUDE=	-I. -I$(D_INC) @CINCLUDE@
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-endif
 
 ifeq ("$(BUILD_TYPE)","release")
 CFLAGS+=	$(CRELEASE) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS)
@@ -118,7 +115,7 @@ LIBOBJS=\
 
 DLLOBJS=\
 	$(subst $(O),.lo,$(LIBOBJS))
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 DLLOBJS+=\
 	$(D_OBJ)/dllmain.lo
 endif

diff --git a/contrib/libiconv/Makefile.in b/contrib/libiconv/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.18 2024/06/04 16:05:16 cvsuser Exp $
+# $Id: Makefile.in,v 1.19 2025/02/07 03:03:20 cvsuser Exp $
 # libiconv/iconv makefile
 #
 #
@@ -61,8 +61,8 @@ LDRELEASE=	@LDRELEASE@
 CINCLUDE=	-I. -I../libcitrus/src -I$(D_INC) @CINCLUDE@
 
 CEXTRA=		$(filter-out -D_WIN32_WINNT%,@DEFS@)
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
+CEXTRA+=	-DWIN32
 endif
 
 ifeq ("$(BUILD_TYPE)","release")
@@ -86,6 +86,7 @@ RMDFLAGS=	-rf
 ICONVLIB=	$(D_LIB)/$(LP)iconv_static$(A)
 ICONVDLL=	$(D_LIB)/$(LP)iconv.la
 
+#TODO: verify matches makelib.def
 VERSION=	1.0.3
 VERSIONSPEC=	$(subst .,:,$(VERSION))
 VPATH=		.

diff --git a/contrib/libiconv/iconv/Makefile.in b/contrib/libiconv/iconv/Makefile.in
@@ -1,6 +1,6 @@
 # Generated by makelib.pl, Thu Aug 30 15:46:54 2012
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.7 2024/04/16 11:37:13 cvsuser Exp $
+# $Id: Makefile.in,v 1.8 2025/02/07 03:03:20 cvsuser Exp $
 # libiconv/iconv makefile
 #
 #
@@ -61,7 +61,7 @@ LDRELEASE=	@LDRELEASE@
 CINCLUDE=	-I. -I.. -I../../libcitrus/src -I../../libcitrus/modules -I$(D_INC) @CINCLUDE@
 
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 CEXTRA+=	-DWIN32
 endif
 

diff --git a/contrib/libiconv/mkcsmapper/Makefile.in b/contrib/libiconv/mkcsmapper/Makefile.in
@@ -1,6 +1,6 @@
 # Generated by makelib.pl, Thu Aug 30 15:46:54 2012
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.7 2024/04/16 11:37:13 cvsuser Exp $
+# $Id: Makefile.in,v 1.8 2025/02/07 03:03:20 cvsuser Exp $
 # libiconv/mkcsmapper makefile
 #
 #
@@ -48,7 +48,7 @@ D_BIN=		$(ROOT)/bin@TOOLCHAINEXT@/$(BUILD_TYPE)
 D_OBJ=		$(ROOT)/obj@TOOLCHAINEXT@/$(BUILD_TYPE)/mkcsmapper
 D_LIB=		$(ROOT)/lib@TOOLCHAINEXT@/$(BUILD_TYPE)
 
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 LEX=		$(D_BIN)/flex
 endif
 
@@ -65,7 +65,7 @@ LDRELEASE=	@LDRELEASE@
 CINCLUDE=	-I. -I.. -I../../libcitrus/src -I../../libcitrus/modules -I$(D_INC) @CINCLUDE@
 
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 CEXTRA+=	-DWIN32
 endif
 

diff --git a/contrib/libiconv/mkesdb/Makefile.in b/contrib/libiconv/mkesdb/Makefile.in
@@ -1,6 +1,6 @@
 # Generated by makelib.pl, Thu Aug 30 15:46:54 2012
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.7 2024/04/16 11:37:13 cvsuser Exp $
+# $Id: Makefile.in,v 1.8 2025/02/07 03:03:20 cvsuser Exp $
 # libiconv/mkesdb makefile
 #
 #
@@ -48,7 +48,7 @@ D_BIN=		$(ROOT)/bin@TOOLCHAINEXT@/$(BUILD_TYPE)
 D_OBJ=		$(ROOT)/obj@TOOLCHAINEXT@/$(BUILD_TYPE)/mkesdb
 D_LIB=		$(ROOT)/lib@TOOLCHAINEXT@/$(BUILD_TYPE)
 
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 LEX=		$(D_BIN)/flex
 endif
 
@@ -65,7 +65,7 @@ LDRELEASE=	@LDRELEASE@
 CINCLUDE=	-I. -I.. -I../../libcitrus/src -I../../libcitrus/modules -I$(D_INC) @CINCLUDE@
 
 CEXTRA=		@DEFS@
-ifeq ("yes","@ISWIN32@")
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
 CEXTRA+=	-DWIN32
 endif
 

diff --git a/contrib/libintl/Makefile.in b/contrib/libintl/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.13 2024/06/04 13:17:24 cvsuser Exp $
+# $Id: Makefile.in,v 1.14 2025/02/07 03:03:20 cvsuser Exp $
 # libintl makefile
 #
 #
@@ -67,8 +67,8 @@ endif
 
 CINCLUDE=	-I. -I../libcitrus/src -I$(D_INC) @CINCLUDE@
 CEXTRA=		$(filter-out -D_WIN32_WINNT%,@DEFS@)
-ifeq ("yes","@ISWIN32@")
-CEXTRA+=	-DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+ifeq (yes,$(findstring yes,"@ISWIN32@ or @ISWIN64@"))
+CEXTRA+=	-DWIN32
 endif
 
 ifeq ("$(BUILD_TYPE)","release")