fix for winblows

.github/workflows/release.yml

@@ -100,24 +100,29 @@ jobs:
 
   build-windows:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Install build tools
+      - uses: msys2/setup-msys2@v2
-        run: choco install winflexbison -y
-        shell: pwsh
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          msystem: MINGW64
+          update: true
+          install: >
+            base-devel
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-make
+            mingw-w64-x86_64-gmp
+            mingw-w64-x86_64-gc
 
-      - name: Build with MinGW
+      - name: Build Project
         run: |
           make windows
-        shell: pwsh
 
       - name: Package
         run: |

Makefile

@@ -6,22 +6,15 @@
 BINARY = bin/argon
 FLEX_TOOL = flex
 
-# If target is "windows", override FLEX_TOOL
+CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
-ifeq ($(MAKECMDGOALS),windows)
-	BINARY = bin/argon.exe
-    FLEX_TOOL = win_flex
-endif
 
 LEXER_SRC = src/lexer/lex.l
 LEXER_C = src/lexer/lex.yy.c
 LEXER_H = src/lexer/lex.yy.h
-
-CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
 CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
 
 all: $(BINARY)
 
-windows: $(BINARY)
 
 $(LEXER_C) $(LEXER_H): $(LEXER_SRC)
 	$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
@@ -30,6 +23,16 @@ $(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
 	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
 
+windows: $(CFILES) $(LEXER_C) $(LEXER_H)
+	(
+		echo -n "external/xxhash/xxhash.c "
+		echo -n "external/cwalk/src/cwalk.c "
+		echo -n "external/libdye/src/dye.c "
+		find src -name '*.c' -print0 | xargs -0 echo -n
+	) > sources.txt
+	mkdir -p bin
+	gcc -O3 -march=native -o $(BINARY) @sources.txt $(CFLAGS)
+
 native: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
 	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)

src/runtime/call/call.c

@@ -16,8 +16,11 @@
 #include <string.h>
 
 #if defined(_WIN32)
-#include <psapi.h>
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602
+#endif
 #include <windows.h>
+#include <psapi.h>
 
 double get_memory_usage_mb() {
   PROCESS_MEMORY_COUNTERS pmc;