x64 builds

mcwin32/ChangeLog.txt

@@ -1,11 +1,14 @@
-Mon Oct  2 13:20:09 2023 adamy
+Sun Nov 12 11:36:11 2023 adamy
 
 	* build-229
 
+	* x64 build (msvc/mingw)
+
 	* 4.8.30 merge
 
 	* package upgrades
 
+                o libappupdater 1.0.2
                 o pcre2 10.42
                 o mbedtls 3.4.1
                 o enca 1.19

mcwin32/Makefile.in

@@ -697,6 +697,17 @@ IMPORT+=\
 	$(D_BIN)/$(MT7RNAME).dll		\
 	$(D_BIN)/$(PLBRNAME).dll
 endif
+ifeq (mingw,$(findstring mingw,"@TOOLCHAIN@"))
+ifeq (mingw64,$(findstring mingw64,"@TOOLCHAIN@"))
+LIBGCCDLL=libgcc_s_seh-1.dll
+else
+LIBGCCDLL=libgcc_s_dw2-1.dll
+endif
+IMPORT+=\
+	$(D_BIN)/$(LIBGCCDLL)			\
+	$(D_BIN)/libstdc++-6.dll		\
+	$(D_BIN)/libwinpthread-1.dll
+endif
 
 AUTOUPDATER=	no
 ifeq (vs,$(findstring vs,"@TOOLCHAIN@"))
@@ -858,6 +869,22 @@ $(D_BIN)/$(PLBRNAME).dll:	$(LIBPLBRPATH)
 		@$(CP) -f $(subst /,\,$^) $@
 endif
 
+ifeq (mingw,$(findstring mingw,"@TOOLCHAIN@"))
+GCCBIN=		$(dir $(shell which gcc 2>/dev/null))
+
+$(D_BIN)/$(LIBGCCDLL):		$(GCCBIN)/$(LIBGCCDLL)
+		@echo importing $^
+		@$(CP) -f $(subst /,\,$^) $@
+
+$(D_BIN)/libstdc++-6.dll:	$(GCCBIN)/libstdc++-6.dll
+		@echo importing $^
+		@$(CP) -f $^ $@
+
+$(D_BIN)/libwinpthread-1.dll:	$(GCCBIN)/libwinpthread-1.dll
+		@echo importing $^
+		@$(CP) -f $(subst /,\,$^) $@
+endif
+
 .PHONY:		package
 package:	packageinfo
 	$(INNO) ./releases/mc-inno-setup.iss

mcwin32/__wcl__.lnk

@@ -0,0 +1,2 @@
+option quiet
+system nt

mcwin32/autoupdater/Makefile.in

@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.12 2023/09/10 10:01:04 cvsuser Exp $
+# $Id: Makefile.in,v 1.13 2023/11/12 04:38:09 cvsuser Exp $
 # libautoupdater and utils makefile
 #
 #
@@ -141,7 +141,6 @@ DLLOBJS=\
 	$(D_OBJ)/AutoLogger.lo		\
 	$(D_OBJ)/AutoManifest.lo	\
 	$(D_OBJ)/AutoUpdater.lo		\
-	$(D_OBJ)/AutoUpdater.res	\
 	$(D_OBJ)/AutoVersion.lo		\
 	\
 	$(D_OBJ)/CProgressDialog.lo	\
@@ -162,6 +161,12 @@ DLLOBJS=\
 	$(D_OBJ)/xmlrole.lo		\
 	$(D_OBJ)/xmltok.lo
 
+ifeq (mingw,$(findstring mingw,"@TOOLCHAIN@"))
+DLLOBJS+=	$(D_OBJ)/AutoUpdater_res.o
+else
+DLLOBJS+=	$(D_OBJ)/AutoUpdater.res
+endif
+
 UPDATEROBJS=\
 	$(D_OBJ)/mcupdater$(O)		\
 	$(D_OBJ)/getopt$(O)
@@ -178,7 +183,7 @@ SIGNATUREOBJS=\
 	$(D_OBJ)/getopt$(O)
 
 OBJS=		$(DLLOBJS) $(UPDATEROBJS) $(SIGNATUREOBJS)
-LIBS=		
+LIBS=
 DLLS=		$(UPDATERDLL)
 TSKS=		$(UPDATERTSK) $(SIGNATURETSK)
 INSTALLED=

mcwin32/autoupdater/mcsignature.cpp

@@ -1,4 +1,4 @@
-//  $Id: mcsignature.cpp,v 1.5 2022/06/09 02:57:03 cvsuser Exp $
+//  $Id: mcsignature.cpp,v 1.6 2023/12/03 16:16:13 cvsuser Exp $
 //
 //  AutoUpdater: Manifest generation tool.
 //
@@ -206,4 +206,3 @@ ExeVersion(const char *executable, char *version, size_t versize)
 }
 
 /*end*/
-

mcwin32/autoupdater/updater.rc

@@ -49,7 +49,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
 #define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
 #endif
+#ifdef _WIN64
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "./libappupdater/manifest_x64.xml"
+#else
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "./libappupdater/manifest.xml"
+#endif
 
 /*
  * Updater Meta Data

mcwin32/busyboxcmds.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # -*- mode: perl; -*-
-# $Id: busyboxcmds.pl,v 1.2 2023/10/07 10:05:38 cvsuser Exp $
+# $Id: busyboxcmds.pl,v 1.3 2023/11/26 15:05:41 cvsuser Exp $
 # busybox command line generation
 #
 # Copyright Adam Young 2023
@@ -49,6 +49,7 @@
 sub
 Generate	#()
 {
+	# cmd, list
 	my ($cmdhelp) = capture_merged {
 		system("cmd", "/c help");
 	};
@@ -58,7 +59,19 @@
 		$cmdhash{lc($1)} = 1 if (/^([A-Za-z]+)/);
 	}
 
+	$cmdhash{'busybox'} = 1;
+	$cmdhash{'link'} = 1;
+
+	# busybox, version
 	my ($bxout, $bxerr, $bxexit) = capture {
+		system($busybox, "--help");
+	};
+	(0 == $bxexit) || die "cannot exec <${busybox}> : ${bxexit}\n";
+	($bxerr eq '') || die "cannot exec <${busybox}> : ${bxerr}\n";
+	my @bxhelp = split(/[\r\n]+/, $bxout);
+
+	# busybox, cmd-list
+	($bxout, $bxerr, $bxexit) = capture {
 		system($busybox, "--list");
 	};
 
@@ -69,8 +82,14 @@
 	open(FILE, ">${output}") or
 		die "cannot create <${output}> : $!\n";
 	my $timestamp = asctime(localtime);
+	$timestamp = chomp($timestamp);
+
 	print FILE <<"EOT";
 // Auto-generated by Makefile ${timestamp}
+//
+// $bxhelp[0]
+// $bxhelp[1]
+
 static const char *busyboxcmds[] = {
 EOT