Additional windows fixes.

.github/workflows/ccpp.yml

@@ -68,7 +68,7 @@ jobs:
           mingw-w64-i686-wxWidgets
           mingw-w64-i686-zlib
           mingw-w64-i686-nsis
-          mingw-w64-python
+          mingw-w64-i686-python
           zip
           vim
     - name: update-protobuf

build.py

@@ -219,14 +219,14 @@ cxxlibrary(
 export(
     name="all",
     items={
-        "fluxengine": "src+fluxengine",
-        "fluxengine-gui": "src/gui",
-        "brother120tool": "tools+brother120tool",
-        "brother240tool": "tools+brother240tool",
-        "upgrade-flux-file": "tools+upgrade-flux-file",
+        "fluxengine$(EXT)": "src+fluxengine",
+        "fluxengine-gui$(EXT)": "src/gui",
+        "brother120tool$(EXT)": "tools+brother120tool",
+        "brother240tool$(EXT)": "tools+brother240tool",
+        "upgrade-flux-file$(EXT)": "tools+upgrade-flux-file",
     }
-    | {"FluxEngine.pkg": "src/gui+fluxengine_pkg"}
+    | ({"FluxEngine.pkg": "src/gui+fluxengine_pkg"}
     if config.osx
-    else {},
+    else {}),
     deps=["tests", "src/formats+docs", "scripts+mkdocindex"],
 )

src/formats/build.py

@@ -74,7 +74,7 @@ export(
             name=f"{f}_doc",
             ins=["scripts+mkdoc"],
             outs=[f"disk-{f}.md"],
-            commands=["{ins[0]} " + f + " > {outs[0]}"],
+            commands=["{ins[0]} " + f + " | tr -d '\\r' > {outs[0]}"],
             label="MKDOC",
         )
         for f in formats

tests/build.py

@@ -61,6 +61,7 @@ export(
                 deps=[
                     "+fl2_proto_lib",
                     "+protocol",
+                    "+z_lib",
                     ".+test_proto_lib",
                     "dep/adflib",
                     "dep/agg",

tools/build.py

@@ -1,15 +1,20 @@
 from build.c import cxxprogram
+import config
+
+emu = []
+if config.windows:
+    emu = ["dep/emu"]
 
 cxxprogram(
     name="brother120tool",
     srcs=["./brother120tool.cc"],
-    deps=["+lib", "lib+config_proto_lib"],
+    deps=["+lib", "lib+config_proto_lib"] + emu,
 )
 
 cxxprogram(
     name="brother240tool",
     srcs=["./brother240tool.cc"],
-    deps=["+lib", "lib+config_proto_lib"],
+    deps=["+lib", "lib+config_proto_lib"] + emu,
 )
 
 cxxprogram(