Try and fix the Windows builds.

.github/workflows/ccpp.yml

@@ -24,28 +24,28 @@ jobs:
     - name: make
       run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine
 
-  build-linux-debian-11:
-    runs-on: ubuntu-22.04
-    container: debian:11
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        repository: 'davidgiven/fluxengine'
-        path: 'fluxengine'
-    - uses: actions/checkout@v4
-      with:
-        repository: 'davidgiven/fluxengine-testdata'
-        path: 'fluxengine-testdata'
-    - name: apt update
-      run: apt update
-    - name: apt
-      run: >
-        apt install -y python3 make xz-utils python3 python3-hamcrest
-        protobuf-compiler libprotobuf-dev libsqlite3-dev
-        libfmt-dev libprotobuf-dev wx-common pkg-config
-        libudev-dev g++ libwxgtk3.0-gtk3-dev
-    - name: make
-      run: make -C fluxengine
+  #build-linux-debian-11:
+  #  runs-on: ubuntu-22.04
+  #  container: debian:11
+  #  steps:
+  #  - uses: actions/checkout@v4
+  #    with:
+  #      repository: 'davidgiven/fluxengine'
+  #      path: 'fluxengine'
+  #  - uses: actions/checkout@v4
+  #    with:
+  #      repository: 'davidgiven/fluxengine-testdata'
+  #      path: 'fluxengine-testdata'
+  #  - name: apt update
+  #    run: apt update
+  #  - name: apt
+  #    run: >
+  #      apt install -y python3 make xz-utils python3 python3-hamcrest
+  #      protobuf-compiler libprotobuf-dev libsqlite3-dev
+  #      libfmt-dev libprotobuf-dev wx-common pkg-config
+  #      libudev-dev g++ libwxgtk3.0-gtk3-dev
+  #  - name: make
+  #    run: make -C fluxengine
 
   build-macos-current:
     strategy:
@@ -78,15 +78,15 @@ jobs:
     steps:
     - name: setup WSL
       run: |
-        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/40.1.0/Fedora-Remix-for-WSL-SL_40.1.0.0_x64_arm64.msixbundle -o fedora.msixbundle
-        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix
-        unzip Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix install.tar.gz
+        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/41.0.0/Fedora-Remix-for-WSL-SL_41.0.0.0_x64_arm64.msixbundle -o fedora.msixbundle
+        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix
+        unzip Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix install.tar.gz
         wsl --update
-        wsl --set-default-version 2
+        wsl --set-default-version 1
         wsl --import fedora fedora install.tar.gz
         wsl --set-default fedora
         wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm'
-        wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
+        wsl sh -c 'dnf -y install gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
 
     - name: fix line endings
       run: |

.github/workflows/release.yml

@@ -16,15 +16,15 @@ jobs:
     steps:
     - name: setup WSL
       run: |
-        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/40.1.0/Fedora-Remix-for-WSL-SL_40.1.0.0_x64_arm64.msixbundle -o fedora.msixbundle
-        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix
-        unzip Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix install.tar.gz
+        curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/41.0.0/Fedora-Remix-for-WSL-SL_41.0.0.0_x64_arm64.msixbundle -o fedora.msixbundle
+        unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix
+        unzip Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix install.tar.gz
         wsl --update
-        wsl --set-default-version 2
+        wsl --set-default-version 1
         wsl --import fedora fedora install.tar.gz
         wsl --set-default fedora
         wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm'
-        wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
+        wsl sh -c 'dnf -y install gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
 
     - name: fix line endings
       run: |

Makefile

@@ -11,7 +11,7 @@ export BUILDTYPE
 ifeq ($(BUILDTYPE),windows)
 	MINGW = i686-w64-mingw32-
 	CC = $(MINGW)gcc
-	CXX = $(MINGW)g++ -std=c++17
+	CXX = $(MINGW)g++ -std=c++20
 	CFLAGS += -g -O3
 	CXXFLAGS += \
 		-fext-numeric-literals \

arch/aeslanier/decoder.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/decoders/decoders.h"
-#include "aeslanier.h"
+#include "arch/aeslanier/aeslanier.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/fluxmapreader.h"

arch/agat/agat.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/decoders/decoders.h"
-#include "agat.h"
+#include "arch/agat/agat.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"
 

arch/agat/decoder.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/decoders/decoders.h"
-#include "agat.h"
+#include "arch/agat/agat.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/fluxmapreader.h"

arch/agat/encoder.cc

@@ -2,7 +2,7 @@
 #include "lib/core/utils.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "agat.h"
+#include "arch/agat/agat.h"
 #include "lib/core/crc.h"
 #include "lib/data/image.h"
 #include "lib/data/layout.h"

arch/amiga/amiga.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/decoders/decoders.h"
-#include "amiga.h"
+#include "arch/amiga/amiga.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"
 

arch/amiga/decoder.cc

@@ -5,7 +5,7 @@
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
-#include "amiga.h"
+#include "arch/amiga/amiga.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"
 #include "lib/decoders/decoders.pb.h"

arch/amiga/encoder.cc

@@ -2,7 +2,7 @@
 #include "lib/core/utils.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "amiga.h"
+#include "arch/amiga/amiga.h"
 #include "lib/core/crc.h"
 #include "lib/data/image.h"
 #include "arch/amiga/amiga.pb.h"

arch/apple2/decoder.cc

@@ -5,7 +5,7 @@
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
-#include "apple2.h"
+#include "arch/apple2/apple2.h"
 #include "arch/apple2/apple2.pb.h"
 #include "lib/decoders/decoders.pb.h"
 #include "lib/core/bytes.h"

arch/brother/decoder.cc

@@ -4,7 +4,7 @@
 #include "lib/data/fluxpattern.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "brother.h"
+#include "arch/brother/brother.h"
 #include "lib/data/sector.h"
 #include "lib/core/bytes.h"
 #include "lib/core/crc.h"

arch/brother/encoder.cc

@@ -2,7 +2,7 @@
 #include "lib/core/utils.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "brother.h"
+#include "arch/brother/brother.h"
 #include "lib/core/crc.h"
 #include "lib/data/image.h"
 #include "arch/brother/brother.pb.h"

arch/build.py

@@ -1,104 +1,61 @@
 from build.c import cxxlibrary
-from build.protobuf import proto, protocc
+from build.protobuf import proto, protocc, protolib
+from os.path import *
+from glob import glob
+import sys
 
-proto(
+archs = [f for f in glob("*", root_dir="arch") if isfile(f"arch/{f}/{f}.proto")]
+
+ps = []
+pls = []
+cls = []
+for a in archs:
+    ps += [
+        proto(
+            name=f"proto_{a}",
+            srcs=[f"arch/{a}/{a}.proto"],
+            deps=["lib/config+common_proto"],
+        )
+    ]
+
+    pls += [
+        protocc(
+            name=f"proto_lib_{a}",
+            srcs=[f".+proto_{a}"],
+            deps=["lib/config+common_proto_lib"],
+        )
+    ]
+
+    cls += [
+        cxxlibrary(
+            name=f"arch_{a}",
+            srcs=glob(f"arch/{a}/*.cc") + glob(f"arch/{a}/*.h"),
+            hdrs={f"arch/{a}/{a}.h": f"arch/{a}/{a}.h"},
+            deps=[
+                "lib/core",
+                "lib/data",
+                "lib/config",
+                "lib/encoders",
+                "lib/decoders",
+            ],
+        )
+    ]
+
+protolib(
     name="proto",
-    srcs=[
-        "./aeslanier/aeslanier.proto",
-        "./agat/agat.proto",
-        "./amiga/amiga.proto",
-        "./apple2/apple2.proto",
-        "./brother/brother.proto",
-        "./c64/c64.proto",
-        "./f85/f85.proto",
-        "./fb100/fb100.proto",
-        "./ibm/ibm.proto",
-        "./macintosh/macintosh.proto",
-        "./micropolis/micropolis.proto",
-        "./mx/mx.proto",
-        "./northstar/northstar.proto",
-        "./rolandd20/rolandd20.proto",
-        "./smaky6/smaky6.proto",
-        "./tartu/tartu.proto",
-        "./tids990/tids990.proto",
-        "./victor9k/victor9k.proto",
-        "./zilogmcz/zilogmcz.proto",
-    ],
-    deps=["lib/config+common_proto"],
+    srcs=ps + ["lib/config+common_proto"],
 )
 
-protocc(
-    name="proto_lib", srcs=[".+proto"], deps=["lib/config+common_proto_lib"]
-)
+cxxlibrary(name="proto_lib", deps=pls)
 
 cxxlibrary(
     name="arch",
     srcs=[
         "./arch.cc",
-        "./aeslanier/decoder.cc",
-        "./agat/agat.cc",
-        "./agat/decoder.cc",
-        "./agat/encoder.cc",
-        "./amiga/amiga.cc",
-        "./amiga/decoder.cc",
-        "./amiga/encoder.cc",
-        "./apple2/decoder.cc",
-        "./apple2/encoder.cc",
-        "./brother/decoder.cc",
-        "./brother/encoder.cc",
-        "./c64/c64.cc",
-        "./c64/decoder.cc",
-        "./c64/encoder.cc",
-        "./f85/decoder.cc",
-        "./fb100/decoder.cc",
-        "./ibm/decoder.cc",
-        "./ibm/encoder.cc",
-        "./macintosh/decoder.cc",
-        "./macintosh/encoder.cc",
-        "./micropolis/decoder.cc",
-        "./micropolis/encoder.cc",
-        "./mx/decoder.cc",
-        "./northstar/decoder.cc",
-        "./northstar/encoder.cc",
-        "./rolandd20/decoder.cc",
-        "./smaky6/decoder.cc",
-        "./tartu/decoder.cc",
-        "./tartu/encoder.cc",
-        "./tids990/decoder.cc",
-        "./tids990/encoder.cc",
-        "./victor9k/decoder.cc",
-        "./victor9k/encoder.cc",
-        "./zilogmcz/decoder.cc",
     ],
     hdrs={
-        "arch/ibm/ibm.h": "./ibm/ibm.h",
-        "arch/apple2/data_gcr.h": "./apple2/data_gcr.h",
-        "arch/apple2/apple2.h": "./apple2/apple2.h",
-        "arch/amiga/amiga.h": "./amiga/amiga.h",
-        "arch/smaky6/smaky6.h": "./smaky6/smaky6.h",
-        "arch/tids990/tids990.h": "./tids990/tids990.h",
-        "arch/zilogmcz/zilogmcz.h": "./zilogmcz/zilogmcz.h",
-        "arch/amiga/amiga.h": "./amiga/amiga.h",
-        "arch/f85/data_gcr.h": "./f85/data_gcr.h",
-        "arch/f85/f85.h": "./f85/f85.h",
-        "arch/mx/mx.h": "./mx/mx.h",
-        "arch/aeslanier/aeslanier.h": "./aeslanier/aeslanier.h",
-        "arch/northstar/northstar.h": "./northstar/northstar.h",
-        "arch/brother/data_gcr.h": "./brother/data_gcr.h",
-        "arch/brother/brother.h": "./brother/brother.h",
-        "arch/brother/header_gcr.h": "./brother/header_gcr.h",
-        "arch/macintosh/data_gcr.h": "./macintosh/data_gcr.h",
-        "arch/macintosh/macintosh.h": "./macintosh/macintosh.h",
-        "arch/agat/agat.h": "./agat/agat.h",
-        "arch/fb100/fb100.h": "./fb100/fb100.h",
-        "arch/victor9k/data_gcr.h": "./victor9k/data_gcr.h",
-        "arch/victor9k/victor9k.h": "./victor9k/victor9k.h",
-        "arch/rolandd20/rolandd20.h": "./rolandd20/rolandd20.h",
-        "arch/micropolis/micropolis.h": "./micropolis/micropolis.h",
-        "arch/c64/data_gcr.h": "./c64/data_gcr.h",
-        "arch/c64/c64.h": "./c64/c64.h",
-        "arch/tartu/tartu.h": "./tartu/tartu.h",
         "arch/arch.h": "./arch.h",
     },
-    deps=["lib/core", "lib/data", "lib/config", "lib/encoders", "lib/decoders"],
+    deps=cls
+    + ["lib/core", "lib/data", "lib/config", "lib/encoders", "lib/decoders"],
 )

arch/c64/c64.cc

@@ -1,5 +1,5 @@
 #include "lib/core/globals.h"
-#include "c64.h"
+#include "arch/c64/c64.h"
 
 /*
  *   Track   Sectors/track   # Sectors   Storage in Bytes   Clock rate

arch/c64/decoder.cc

@@ -5,7 +5,7 @@
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
-#include "c64.h"
+#include "arch/c64/c64.h"
 #include "lib/core/crc.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"

arch/c64/encoder.cc

@@ -2,7 +2,7 @@
 #include "lib/core/utils.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "c64.h"
+#include "arch/c64/c64.h"
 #include "lib/core/crc.h"
 #include "lib/data/sector.h"
 #include "lib/data/image.h"

arch/f85/decoder.cc

@@ -5,7 +5,7 @@
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
-#include "f85.h"
+#include "arch/f85/f85.h"
 #include "lib/core/crc.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"

arch/fb100/decoder.cc

@@ -5,7 +5,7 @@
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
-#include "fb100.h"
+#include "arch/fb100/fb100.h"
 #include "lib/core/crc.h"
 #include "lib/core/bytes.h"
 #include "lib/decoders/rawbits.h"

arch/ibm/decoder.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/decoders/decoders.h"
-#include "ibm.h"
+#include "arch/ibm/ibm.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
 #include "lib/data/fluxmapreader.h"

arch/ibm/encoder.cc

@@ -2,7 +2,7 @@
 #include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
-#include "ibm.h"
+#include "arch/ibm/ibm.h"
 #include "lib/core/crc.h"
 #include "lib/data/image.h"
 #include "arch/ibm/ibm.pb.h"