fix for winblows

.github/workflows/release.yml

@@ -100,39 +100,29 @@ jobs:
 
   build-windows:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Install MSYS2 and build tools
+      - uses: msys2/setup-msys2@v2
-        uses: msys2/setup-msys2@v3
         with:
+          msystem: MINGW64
           update: true
           install: >
-            mingw-w64-x86_64-toolchain
+            base-devel
-            mingw-w64-x86_64-gmp
+            mingw-w64-x86_64-gcc
             mingw-w64-x86_64-make
-            mingw-w64-x86_64-flex
+            mingw-w64-x86_64-gmp
-            mingw-w64-x86_64-bison
+            mingw-w64-x86_64-gc
-          shell: msys2 {0}
 
-      - name: Setup Python
+      - name: Build Project
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install Conan
         run: |
-          python -m pip install --upgrade pip
+          make windows
-          pip install conan
-          conan profile detect
-        shell: pwsh
-
-      - name: Build with MinGW
-        run: |
-          make
-        shell: msys2 {0}
 
       - name: Package
         run: |

Makefile

@@ -2,23 +2,35 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# Default FLEX tool
+BINARY = bin/argon
+FLEX_TOOL = flex
+
+CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
+
 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
-BINARY = bin/argon
 
 all: $(BINARY)
 
+
 $(LEXER_C) $(LEXER_H): $(LEXER_SRC)
-	flex --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
+	$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
 
 $(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)

conan/profiles/windows-mingw

@@ -1,8 +0,0 @@
-[settings]
-os=Windows
-arch=x86_64
-compiler=gcc
-compiler.version=13
-compiler.cppstd=gnu17
-compiler.libcxx=libstdc++11
-build_type=Release

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;