From efcc02248f630482f25f721d1dbb2282a2572bf8 Mon Sep 17 00:00:00 2001 From: Quinn Date: Sun, 15 Jun 2025 14:12:49 +0200 Subject: [PATCH] fix: github actions having too much trouble executing wine --- .github/workflows/ci.yaml | 1 + makefile | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6f3e679..ec1f36b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,6 +10,7 @@ env: VCPKG_DISABLE_METRICS: 1 VCPKG_ROOT: ${{github.workspace}}/.vcpkg DEPS_VCPKG: glfw3:x64-linux-dynamic glfw3:x64-mingw-static + WINEPREFIX: /tmp/wineprefix jobs: # # the mega job containing all things we need to do, since setting up a single system is more efficient than installing the same stuff on multiple ones diff --git a/makefile b/makefile index 2d4c9d8..cb97afd 100644 --- a/makefile +++ b/makefile @@ -88,7 +88,12 @@ DEP := $(OBJ:.o=.d) COMPILE_COMMANDS := $(DIR_OBJ)/compile_commands.json .PHONY: run compile echo -run: echo compile_commands $(BIN); $(BIN) +run: echo compile_commands $(BIN) +ifeq ($(ISWIN),0) + $(BIN) +else + wine $(BIN) +endif compile: echo compile_commands $(BIN) echo: $(info $(shell printf "\033[36m")compiling for: $(MARCH), $(KERNEL)$(shell printf "\033[0m"))