generate 64-bit DLLs (and update gcc for it to work)

Author: dgruss

.github/workflows/main.yml

@@ -2,8 +2,8 @@ name: Build
 
 on: [push, pull_request]
 jobs:
-  build_i686:
-    name: Build for 32 bit x86
+  build_x86_64:
+    name: Build for 64 bit x86_64
     runs-on: ubuntu-22.04
     steps:
       - name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
       - name: Collect Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: usdx-dlls-i686
+          name: usdx-dlls-x86_64
           path: DLLs/*
           if-no-files-found: error
       - name: Cleanup Download Cache

build.sh

@@ -1,23 +1,63 @@
 #!/bin/sh
 MXE=/tmp/mxe
+TARGET=x86_64-w64-mingw32.shared
+DLL_DIR=$MXE/DLLs
+PORTAUDIO_NAME=portaudio_x64
 if [ "`pwd`" != $MXE ] ; then
 	echo Please clone this repository to /tmp/mxe for reproducible builds >&2
 	exit 1
 fi
 touch src/ffmpeg.mk src/dav1d.mk src/freetype-bootstrap.mk src/libjpeg-turbo.mk src/libpng.mk src/portaudio.mk src/sqlite.mk src/lua.mk src/sdl2.mk src/sdl2_image.mk src/zlib.mk src/libwebp.mk src/tiff.mk
 export SOURCE_DATE_EPOCH=0
-make -j 2 JOBS=2 MXE_TARGETS=i686-w64-mingw32.shared ffmpeg sdl2_image freetype-bootstrap portaudio sqlite lua
-mkdir -p $MXE/DLLs
-for i in avcodec-61 avformat-61 avutil-59 swresample-5 swscale-8 libdav1d libjpeg-8 libpng16-16 libtiff-6 libwebp-7 SDL2 SDL2_image zlib1 lua54:lua5.4 libsqlite3-0:sqlite3 libfreetype-6:freetype6 libportaudio-2:portaudio_x86 ; do
+# Prefer system tools over a possibly broken venv shim (e.g., mako-render).
+export PATH=/usr/bin:$PATH
+# Force DWARF debug info and assume .loc support to avoid stabs on x86_64.
+make -j 24 JOBS=24 MXE_TARGETS=$TARGET \
+	CFLAGS_FOR_TARGET='-O2 -gdwarf-2 -gas-loc-support' \
+	CXXFLAGS_FOR_TARGET='-O2 -gdwarf-2 -gas-loc-support' \
+	ffmpeg sdl2_image freetype-bootstrap portaudio sqlite lua projectm projectm-cwrapper glew
+
+# Optional: unpack proprietary BASS DLL if provided.
+if [ -f "$MXE/pkg/bass24.zip" ]; then
+	mkdir -p "$MXE/usr/$TARGET/bin"
+	unzip -p "$MXE/pkg/bass24.zip" x64/bass.dll > "$MXE/usr/$TARGET/bin/bass.dll"
+fi
+mkdir -p $DLL_DIR
+for i in avcodec-61 avformat-61 avutil-59 swresample-5 swscale-8 libdav1d libjpeg-8 libpng16-16 libtiff-6 libwebp-7 SDL2 SDL2_image zlib1 lua54:lua libsqlite3-0:sqlite3 libfreetype-6 libharfbuzz-0 libglib-2.0-0 libpcre-1 libintl-8 libiconv-2 libdl libbz2 libportaudio-2:$PORTAUDIO_NAME libstdc++-6 libwinpthread-1 libgcc_s_seh-1 GLEW:glew32 bass projectM-cwrapper ; do
 	j=${i##*:}
 	i=${i%%:*}
-	$MXE/usr/bin/i686-w64-mingw32.shared-objcopy --only-keep-debug $MXE/usr/i686-w64-mingw32.shared/bin/$i.dll $MXE/DLLs/$j.debug
+	$MXE/usr/bin/$TARGET-objcopy --only-keep-debug $MXE/usr/$TARGET/bin/$i.dll $DLL_DIR/$j.debug 2>/dev/null || true
 	(
-		cd $MXE/DLLs
-		set -- `md5sum $j.debug`
-		k=$j-$1
-		mv $j.debug $k.debug
-		$MXE/usr/bin/i686-w64-mingw32.shared-objcopy -S --add-gnu-debuglink=$k.debug $MXE/usr/i686-w64-mingw32.shared/bin/$i.dll $j.dll
-		chmod a-x $j.dll $k.debug
+		cd $DLL_DIR
+		if [ -f "$j.debug" ]; then
+			set -- `md5sum $j.debug`
+			k=$j-$1
+			mv $j.debug $k.debug
+			$MXE/usr/bin/$TARGET-objcopy -S --add-gnu-debuglink=$k.debug $MXE/usr/$TARGET/bin/$i.dll $j.dll
+			chmod a-x $j.dll $k.debug
+		else
+			cp -f $MXE/usr/$TARGET/bin/$i.dll $j.dll
+			chmod a-x $j.dll
+		fi
 	)
 done
+
+# Add projectM DLL (keep only libprojectM-0.dll).
+if [ -f "$MXE/usr/$TARGET/bin/libprojectM-0.dll" ]; then
+	dll="$MXE/usr/$TARGET/bin/libprojectM-0.dll"
+	base=libprojectM-0
+	$MXE/usr/bin/$TARGET-objcopy --only-keep-debug "$dll" "$DLL_DIR/$base.debug" 2>/dev/null || true
+	(
+		cd "$DLL_DIR"
+		if [ -f "$base.debug" ]; then
+			set -- `md5sum "$base.debug"`
+			k=$base-$1
+			mv "$base.debug" "$k.debug"
+			$MXE/usr/bin/$TARGET-objcopy -S --add-gnu-debuglink="$k.debug" "$dll" "$base.dll"
+			chmod a-x "$base.dll" "$k.debug"
+		else
+			cp -f "$dll" "$base.dll"
+			chmod a-x "$base.dll"
+		fi
+	)
+fi

src/gcc-1-fixes.patch

@@ -12,10 +12,10 @@ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7
 
 clang can build it correctly and this should probably be a feature test
 
-diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
+diff --git a/gcc/config/i386/driver-i386.cc b/gcc/config/i386/driver-i386.cc
 index 1111111..2222222 100644
---- a/gcc/config/i386/driver-i386.c
-+++ b/gcc/config/i386/driver-i386.c
+--- a/gcc/config/i386/driver-i386.cc
++++ b/gcc/config/i386/driver-i386.cc
 @@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 
  const char *host_detect_local_cpu (int argc, const char **argv);
@@ -36,20 +36,16 @@ diff --git a/gcc/config.gcc b/gcc/config.gcc
 index 1111111..2222222 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
-@@ -2207,7 +2207,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
- 			tmake_file="${tmake_file} i386/t-mingw-w32"
- 			;;
- 	esac
+@@
 -        native_system_header_dir=/mingw/include
 +        native_system_header_dir=/include
- 	target_gtfiles="$target_gtfiles \$(srcdir)/config/i386/winnt.c"
- 	extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
- 	case ${target} in
+
+
 diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
 index 1111111..2222222 100644
 --- a/gcc/config/i386/mingw32.h
 +++ b/gcc/config/i386/mingw32.h
-@@ -198,7 +198,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -207,7 +207,7 @@ along with GCC; see the file COPYING3.  If not see
 
  /* Override startfile prefix defaults.  */
  #ifndef STANDARD_STARTFILE_PREFIX_1
@@ -58,7 +54,7 @@ index 1111111..2222222 100644
  #endif
  #ifndef STANDARD_STARTFILE_PREFIX_2
  #define STANDARD_STARTFILE_PREFIX_2 ""
-@@ -207,7 +207,7 @@ along with GCC; see the file COPYING3.  If not see
+@@ -216,7 +216,7 @@ along with GCC; see the file COPYING3.  If not see
  /* For native mingw-version we need to take care that NATIVE_SYSTEM_HEADER_DIR
     macro contains POSIX-style path.  See bug 52947.  */
  #undef NATIVE_SYSTEM_HEADER_DIR
@@ -81,22 +77,22 @@ diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
 index 1111111..2222222 100644
 --- a/libgomp/libgomp.h
 +++ b/libgomp/libgomp.h
-@@ -69,6 +69,14 @@
+@@ -66,6 +66,13 @@
+ #  endif
  # endif
  #endif
- 
-+#include <stdio.h>
++
 +#include <stdio.h>
 +#ifdef __MINGW_PRINTF_FORMAT
 +#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
 +#else
 +#define PRINTF_FORMAT printf
 +#endif
-+
+ 
  #ifdef HAVE_ATTRIBUTE_VISIBILITY
  # pragma GCC visibility push(hidden)
  #endif
-@@ -173,7 +181,7 @@ team_free (void *ptr)
+@@ -168,7 +175,7 @@ extern void gomp_aligned_free (void *);
 
  extern void gomp_vdebug (int, const char *, va_list);
  extern void gomp_debug (int, const char *, ...)
@@ -105,7 +101,7 @@ index 1111111..2222222 100644
  #define gomp_vdebug(KIND, FMT, VALIST) \
    do { \
      if (__builtin_expect (gomp_debug_var, 0)) \
-@@ -186,11 +194,11 @@ extern void gomp_debug (int, const char *, ...)
+@@ -182,11 +189,11 @@ extern void gomp_debug (int, const char *, ...)
    } while (0)
  extern void gomp_verror (const char *, va_list);
  extern void gomp_error (const char *, ...)

src/gcc-2-stabs.patch

@@ -4,9 +4,9 @@ PKG             := gcc
 $(PKG)_WEBSITE  := https://gcc.gnu.org/
 $(PKG)_DESCR    := GCC
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 11.5.0
+$(PKG)_VERSION  := 13.3.0
 $(PKG)_RELEASE  := $($(PKG)_VERSION)
-$(PKG)_CHECKSUM := a6e21868ead545cf87f0c01f84276e4b5281d672098591c1c896241f09363478
+$(PKG)_CHECKSUM := 0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -79,6 +79,9 @@ define $(PKG)_BUILD_mingw-w64
         --with-default-win32-winnt=0x0601 \
         $(mingw-w64-headers_CONFIGURE_OPTS)
     $(MAKE) -C '$(BUILD_DIR).headers' install
+    # GCC fixincludes expects headers in $(TARGET)/mingw/include.
+    mkdir -p '$(PREFIX)/$(TARGET)/mingw/include'
+    cp -a '$(PREFIX)/$(TARGET)/include/.' '$(PREFIX)/$(TARGET)/mingw/include'
 
     # build standalone gcc
     $($(PKG)_CONFIGURE)

src/gcc.mk

@@ -24,7 +24,9 @@ define $(PKG)_BUILD
         -DWITH_JPEG8=ON \
         -DBUILD=reproducible \
         -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)' \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_ASM_NASM_FLAGS='-g null' \
+        -DCMAKE_ASM_NASM_FLAGS_RELEASE='-g null' \
         -DCMAKE_ASM_NASM_COMPILER=$(TARGET)-yasm
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install

src/libjpeg-turbo.mk

@@ -0,0 +1,38 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MXE <mxe@example.invalid>
+Date: Wed, 28 Jan 2026 00:00:00 +0000
+Subject: [PATCH] Fix Windows OpenGL includes and font defaults
+
+
+diff --git a/src/libprojectM/projectM-opengl.h b/src/libprojectM/projectM-opengl.h
+index 6c9d3d3..f0d7c5f 100644
+--- a/src/libprojectM/projectM-opengl.h
++++ b/src/libprojectM/projectM-opengl.h
+@@ -8,6 +8,7 @@
+ #ifdef __APPLE__
+ # include <OpenGL/gl.h>
+ #elif defined(_WIN32)
+ # include <windows.h>
++# include <GL/gl.h>
+ #else /* linux/unix/other */
+ # ifdef USE_GLES1
+ #  include <GLES/gl.h>
+
+diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp
+index 9a0b0c6..cb2ff4a 100644
+--- a/src/libprojectM/projectM.cpp
++++ b/src/libprojectM/projectM.cpp
+@@ -208,9 +208,9 @@ void projectM::readConfig (const std::string & configFile )
+ 
+     #ifdef WIN32
+     _settings.titleFontURL = config.read<string>
+-    ( "Title Font", projectM_FONT_TITLE );
++    ( "Title Font", "Vera.ttf" );
+     _settings.menuFontURL = config.read<string>
+-    ( "Menu Font", projectM_FONT_MENU );
++    ( "Menu Font", "VeraMono.ttf" );
+     #endif

src/projectm-1-fixes.patch

@@ -0,0 +1,20 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MXE <mxe@example.invalid>
+Date: Wed, 28 Jan 2026 00:00:00 +0000
+Subject: [PATCH] Link libprojectM against dlfcn-win32
+
+
+diff --git a/src/libprojectM/Makefile.in b/src/libprojectM/Makefile.in
+index 4f7cfc9..f342b3c 100644
+--- a/src/libprojectM/Makefile.in
++++ b/src/libprojectM/Makefile.in
+@@ -437,4 +437,5 @@ libprojectM_la_LIBADD = \
+ $(top_srcdir)/src/libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.la \
+ $(top_srcdir)/src/libprojectM/NativePresetFactory/libNativePresetFactory.la \
+-$(top_srcdir)/src/libprojectM/Renderer/libRenderer.la
++$(top_srcdir)/src/libprojectM/Renderer/libRenderer.la \
++-ldl

src/projectm-2-fixes.patch

@@ -0,0 +1,21 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MXE <mxe@example.invalid>
+Date: Wed, 28 Jan 2026 00:00:00 +0000
+Subject: [PATCH] Skip NativePresets subdir on Windows
+
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 26ceca6..b4c57b7 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -161,2 +161,2 @@
+-DIST_SUBDIRS = libprojectM NativePresets projectM-sdl projectM-qt \
++DIST_SUBDIRS = libprojectM projectM-sdl projectM-qt \
+ 	projectM-pulseaudio
+@@ -331,1 +331,1 @@
+-SUBDIRS = libprojectM NativePresets ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR}
++SUBDIRS = libprojectM ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR}

src/projectm-3-fixes.patch

@@ -0,0 +1,27 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG             := projectm-cwrapper
+$(PKG)_WEBSITE  := https://github.com/UltraStar-Deluxe/usdx
+$(PKG)_DESCR    := projectM C wrapper
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1
+$(PKG)_CHECKSUM :=
+$(PKG)_DEPS     := cc projectm
+
+# Local sources live in src/projectm-cwrapper
+
+define $(PKG)_BUILD
+    # Build in local tmp dir so we can pick up the import lib.
+    '$(TARGET)-g++' -shared -Wl,--export-all-symbols -Wl,--out-implib,libprojectM-cwrapper.dll.a \
+        -I'$(TOP_DIR)/src/projectm-cwrapper' -I'$(PREFIX)/$(TARGET)/include' -I'$(PREFIX)/$(TARGET)/include/libprojectM' \
+        -L'$(PREFIX)/$(TARGET)/bin' -L'$(PREFIX)/$(TARGET)/lib' \
+        -o projectM-cwrapper.dll \
+        '$(TOP_DIR)/src/projectm-cwrapper/projectM-cwrapper.cpp' \
+        -l:libprojectM-0.dll
+
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'
+    $(INSTALL) -m755 projectM-cwrapper.dll '$(PREFIX)/$(TARGET)/bin/'
+
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
+    $(INSTALL) -m644 libprojectM-cwrapper.dll.a '$(PREFIX)/$(TARGET)/lib/'
+endef