Some work towards making things build on Windows.

Author: davidgiven

.github/workflows/ccpp.yml

@@ -78,38 +78,35 @@ jobs:
 
   build-windows:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
 
     steps:
-    - name: setup WSL
-      run: |
-        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 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 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 ninja-build mingw32-freetype mingw32-curl-static mingw32-boost-static'
-
-    - name: fix line endings
-      run: |
-        git config --global core.autocrlf false
-        git config --global core.eol lf
-        
     - uses: actions/checkout@v4
       with:
         repository: 'davidgiven/fluxengine'
         path: 'fluxengine'
+        submodules: 'true'
 
     - uses: actions/checkout@v4
       with:
         repository: 'davidgiven/fluxengine-testdata'
         path: 'fluxengine-testdata'
 
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: mingw64
+
+    - name: dependencies
+      run: |
+        set -x
+        pacman -S --needed --noconfirm pactoys
+        pacboy -S --needed --noconfirm protobuf:p pkg-config:p curl-winssl:p file:p glfw:p gcc:p mbedtls:p
+
     - name: run
       run: |
-        wsl sh -c 'make -C fluxengine BUILDTYPE=windows -j$(nproc)'
+        wsl sh -c 'make -C fluxengine BUILDTYPE=windows'
 
     - name: nsis
       run: |

Makefile

@@ -9,7 +9,7 @@ endif
 export BUILDTYPE
 
 ifeq ($(BUILDTYPE),windows)
-	MINGW = i686-w64-mingw32-
+	MINGW = x86_64-w64-mingw32-
 	CC = $(MINGW)gcc
 	CXX = $(MINGW)g++
 	CFLAGS += -g -O3 \
@@ -23,12 +23,15 @@ ifeq ($(BUILDTYPE),windows)
 		-Wno-deprecated-enum-enum-conversion \
 		-U__GXX_TYPEINFO_EQUALITY_INLINE \
 		-D__GXX_TYPEINFO_EQUALITY_INLINE 
-	LDFLAGS += -static -Wl,--gc-sections
-	AR = $(MINGW)ar
-	PKG_CONFIG = $(MINGW)pkg-config -static
+	#LDFLAGS += -Wl,--gc-sections
+	AR = $(MINGW)gcc-ar
+	PKG_CONFIG = $(MINGW)pkg-config --static
 	WINDRES = $(MINGW)windres
 	WX_CONFIG = /usr/i686-w64-mingw32/sys-root/mingw/bin/wx-config-3.0 --static=yes
+	PROTOC_SEPARATOR = ;
 	EXT = .exe
+
+	AB_NO_SANDBOX = yes
 else
 	CC = clang
 	CXX = clang++
@@ -64,24 +67,24 @@ BINDIR ?= $(PREFIX)/bin
 
 # Special Windows settings.
 
-ifeq ($(OS), Windows_NT)
-	EXT ?= .exe
-	MINGWBIN = /mingw32/bin
-	CCPREFIX = $(MINGWBIN)/
-	PKG_CONFIG = $(MINGWBIN)/pkg-config
-	WX_CONFIG = /usr/bin/sh $(MINGWBIN)/wx-config --static=yes
-	PROTOC = $(MINGWBIN)/protoc
-	WINDRES = windres
-	LDFLAGS += \
-		-static
-	CXXFLAGS += \
-		-fext-numeric-literals \
-		-Wno-deprecated-enum-float-conversion \
-		-Wno-deprecated-enum-enum-conversion
-
-	# Required to get the gcc run - time libraries on the path.
-	export PATH := $(PATH):$(MINGWBIN)
-endif
+#ifeq ($(OS), Windows_NT)
+#	EXT ?= .exe
+#	MINGWBIN = /mingw32/bin
+#	CCPREFIX = $(MINGWBIN)/
+#	PKG_CONFIG = $(MINGWBIN)/pkg-config
+#	WX_CONFIG = /usr/bin/sh $(MINGWBIN)/wx-config --static=yes
+#	PROTOC = $(MINGWBIN)/protoc
+#	WINDRES = windres
+#	LDFLAGS += \
+#		-static
+#	CXXFLAGS += \
+#		-fext-numeric-literals \
+#		-Wno-deprecated-enum-float-conversion \
+#		-Wno-deprecated-enum-enum-conversion
+#
+#	# Required to get the gcc run - time libraries on the path.
+#	export PATH := $(PATH):$(MINGWBIN)
+#endif
 
 # Special OSX settings.
 

build.py

@@ -104,7 +104,7 @@
     name="all",
     items={
         "fluxengine$(EXT)": "src+fluxengine",
-        "fluxengine-gui$(EXT)": "src/gui",
+#        "fluxengine-gui$(EXT)": "src/gui",
         "gui2$(EXT)": "src/gui2",
         "brother120tool$(EXT)": "tools+brother120tool",
         "brother240tool$(EXT)": "tools+brother240tool",

src/gui2/build.py

@@ -12,6 +12,8 @@
     "-DIMHEX_STATIC_LINK_PLUGINS",
     '-DIMHEX_VERSION=\\"0.0.0\\"',
     "-DLUNASVG_BUILD_STATIC",
+    "-DPLUTOVG_BUILD_STATIC",
+    "-DUNICODE",
     # "-DDEBUG",
 ]
 if config.osx:
@@ -21,57 +23,35 @@
 else:
     cflags = cflags + ["-DOS_LINUX"]
 
-r = simplerule(
-    name="glfw-windows-fallback",
-    ins=[],
-    outs=[
-        "=glfw-3.4.bin.WIN32/include/GLFW/glfw3.h",
-        "=glfw-3.4.bin.WIN32/include/GLFW/glfw3native.h",
-        "=glfw-3.4.bin.WIN32/lib-mingw-w64/libglfw3.a",
-    ],
-    commands=[
-        "curl -Ls https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.bin.WIN32.zip -o $[dir]/glfw.zip",
-        "cd $[dir] && unzip -DD -o -q glfw.zip",
-    ],
-    label="CURLLIBRARY",
-    traits={"clibrary", "cheaders"},
-)
-r.args["caller_cflags"] = [f"-I{r.dir}/glfw-3.4.bin.WIN32/include"]
-r.args["cheader_files"] = [r]
-r.args["cheader_deps"] = [r]
-
 
 def headers_from(path):
-    hdrs = {k: f"{path}/{k}" for k in glob("**/*.h*", root_dir=path, recursive=True)}
+    hdrs = {
+        k: f"{path}/{k}" for k in glob("**/*.h*", root_dir=path, recursive=True)
+    }
     assert hdrs, f"path {path} contained no headers"
     return hdrs
 
 
 def sources_from(path, except_for=[]):
-    srcs = [join(path, f) for f in glob("**/*.[ch]*", root_dir=path, recursive=True)]
+    srcs = [
+        join(path, f) for f in glob("**/*.[ch]*", root_dir=path, recursive=True)
+    ]
     srcs = [f for f in srcs if f not in except_for]
     assert srcs, f"path {path} contained no sources"
     return srcs
 
 
 package(name="freetype2_lib", package="freetype2")
 package(name="libcurl_lib", package="libcurl")
-package(name="glfw3_lib", package="glfw3", fallback=".+glfw-windows-fallback")
+package(name="glfw3_lib", package="glfw3")
+package(name="magic_lib", package="libmagic")
 
 cxxlibrary(
     name="nlohmannjson_lib",
     srcs=[],
     hdrs=headers_from("dep/nlohmann_json/single_include"),
 )
 
-clibrary(
-    name="magic_lib",
-    srcs=sources_from(
-        "dep/file/src", except_for=["dep/file/src/file.c", "dep/file/src/seccomp.c"]
-    ),
-    hdrs={"magic.h": "dep/file/src/magic.h.in"},
-)
-
 clibrary(
     name="md4c_lib",
     srcs=sources_from("dep/md4c/src"),
@@ -114,13 +94,15 @@ def sources_from(path, except_for=[]):
     name="plutovg",
     srcs=sources_from("dep/lunasvg/plutovg/source"),
     hdrs=headers_from("dep/lunasvg/plutovg/include"),
+    cflags=cflags,
 )
 
 cxxlibrary(
     name="lunasvg",
     srcs=sources_from("dep/lunasvg/source"),
     hdrs=headers_from("dep/lunasvg/include"),
     deps=[".+plutovg", "+fmt_lib"],
+    cflags=cflags,
 )
 
 cxxlibrary(
@@ -189,7 +171,15 @@ def sources_from(path, except_for=[]):
         cflags=cflags,
     )
 
-wolv_modules = ["types", "io", "utils", "containers", "hash", "math_eval", "net"]
+wolv_modules = [
+    "types",
+    "io",
+    "utils",
+    "containers",
+    "hash",
+    "math_eval",
+    "net",
+]
 cxxlibrary(
     name="libwolv",
     srcs=(
@@ -211,13 +201,17 @@ def sources_from(path, except_for=[]):
         operator.ior,
         [headers_from(f"dep/libwolv/libs/{d}/include") for d in wolv_modules],
     )
-    | {"types/uintwide_t.h": "dep/libwolv/libs/types/include/wolv/types/uintwide_t.h"},
+    | {
+        "types/uintwide_t.h": "dep/libwolv/libs/types/include/wolv/types/uintwide_t.h"
+    },
     deps=[".+libwolv-io-fs"],
     cflags=cflags,
 )
 
 cxxlibrary(
-    name="libthrowingptr", srcs=[], hdrs=headers_from("dep/throwing_ptr/include")
+    name="libthrowingptr",
+    srcs=[],
+    hdrs=headers_from("dep/throwing_ptr/include"),
 )
 
 cxxlibrary(
@@ -238,7 +232,9 @@ def sources_from(path, except_for=[]):
     ],
 )
 
-cxxlibrary(name="hacks", srcs=[], hdrs={"jthread.hpp": "./imhex_overrides/jthread.hpp"})
+cxxlibrary(
+    name="hacks", srcs=[], hdrs={"jthread.hpp": "./imhex_overrides/jthread.hpp"}
+)
 
 clibrary(
     name="libmicrotar",
@@ -273,7 +269,9 @@ def sources_from(path, except_for=[]):
         sources_from("dep/imhex/lib/libimhex/source/ui")
         + sources_from(
             "dep/imhex/lib/libimhex/source/api",
-            except_for=["dep/imhex/lib/libimhex/source/api/achievement_manager.cpp"],
+            except_for=[
+                "dep/imhex/lib/libimhex/source/api/achievement_manager.cpp"
+            ],
         )
         + sources_from("dep/imhex/lib/libimhex/source/data_processor")
         + sources_from("dep/imhex/lib/libimhex/source/providers")
@@ -426,7 +424,9 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
             "dep/imhex/plugins/builtin/source/content/views/view_tutorials.cpp",
             "dep/imhex/plugins/builtin/source/content/data_processor_nodes.cpp",
         ]
-        + glob("dep/imhex/plugins/builtin/source/content/data_processor_nodes/*")
+        + glob(
+            "dep/imhex/plugins/builtin/source/content/data_processor_nodes/*"
+        )
         + glob("dep/imhex/plugins/builtin/source/content/tutorials/*"),
     )
     + [
@@ -471,7 +471,10 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
         ]
         if config.osx
         else (
-            ["dep/imhex/main/gui/source/window/platform/windows.cpp"]
+            [
+                "dep/imhex/main/gui/source/window/platform/windows.cpp",
+                "dep/imhex/main/gui/source/messaging/windows.cpp",
+            ]
             if config.windows
             else [
                 "dep/imhex/main/gui/source/window/platform/linux.cpp",
@@ -541,7 +544,9 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
         "./main.cc",
     ],
     cflags=cflags,
-    ldflags=["-ldl", "-lmbedcrypto"],
+    ldflags=["-lmbedcrypto"]
+    + (["-ldl"] if config.unix else [])
+    + (["-ldwmapi", "-lnetapi32"] if config.windows else []),
     deps=[
         ".+libpl",
         "+fmt_lib",

src/gui2/datastore.cc

@@ -565,7 +565,7 @@ void Datastore::writeImage(const std::fs::path& path)
     Datastore::runOnWorkerThread(
         [=]
         {
-            globalConfig().setImageWriter(path);
+            globalConfig().setImageWriter(path.string());
             ImageWriter::create(globalConfig())
                 ->writeImage(*Datastore::getDiskFlux()->image);
         });
@@ -581,7 +581,7 @@ void Datastore::writeFluxFile(const std::fs::path& path)
             {
                 rebuildConfiguration();
             };
-            globalConfig().setFluxSink(path);
+            globalConfig().setFluxSink(path.string());
             auto fluxSource = FluxSource::createMemoryFluxSource(*diskFlux);
             auto fluxSink = FluxSink::create(globalConfig());
             writeRawDiskCommand(*fluxSource, *fluxSink);