fix cmake

.github/workflows/release.yml

@@ -122,7 +122,7 @@ jobs:
 
       - name: Build Project
         run: |
-          make
+          make windows
 
       - name: Package
         run: |
@@ -150,6 +150,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ./artifacts
+          merge-multiple: true
 
       - name: Create GitHub Release
         uses: ncipollo/release-action@v1

CMakeLists.txt

@@ -52,18 +52,19 @@ find_package(BDWgc REQUIRED)
 find_package(gmp REQUIRED)
 
 target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
-if(NOT APPLE)
-    target_link_options(argon PRIVATE -static)
-endif()
 
 target_link_libraries(argon PRIVATE
-    BDWgc::BDWgc
+    "${CMAKE_CURRENT_SOURCE_DIR}/external/lib/libgc.a"
-    gmp::gmp
+    "${CMAKE_CURRENT_SOURCE_DIR}/external/lib/libgmp.a"
     m
 )
 
 target_include_directories(argon PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/src/lexer
+    ${BDWgc_INCLUDE_DIRS}   # BDWgc headers
+    ${GMP_INCLUDE_DIR}      # GMP headers
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/cwalk/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/libdye/include
 )
 
 add_custom_command(TARGET argon POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE:argon>)

Makefile

@@ -8,18 +8,11 @@ FLEX_TOOL = flex
 
 CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
 
-# If target is "windows", override FLEX_TOOL
-ifeq ($(MAKECMDGOALS),windows)
-	BINARY = bin/argon.exe
-    FLEX_TOOL = win_flex
-
-	CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell dir /b /s src\*.c)
-endif
-
 LEXER_SRC = src/lexer/lex.l
 LEXER_C = src/lexer/lex.yy.c
 LEXER_H = src/lexer/lex.yy.h
 CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
+LDFLAGS = -Wl,-Bstatic -lgc -lgmp -Wl,-Bdynamic -lm
 
 all: $(BINARY)
 
@@ -29,16 +22,19 @@ $(LEXER_C) $(LEXER_H): $(LEXER_SRC)
 
 $(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
+	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS} -s
 
 windows: $(CFILES) $(LEXER_C) $(LEXER_H)
-  	dir /b /s external\xxhash\xxhash.c external\cwalk\src\cwalk.c external\libdye\src\dye.c src\*.c > sources.txt
+	(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)
+	gcc -O3 -march=native -o $(BINARY) @sources.txt $(CFLAGS) -lbcrypt
 
 native: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 
 debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
@@ -46,13 +42,13 @@ debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 
 full-debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 
 optimised: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 	${BINARY} rand_test.ar
-	gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 	
 
 clean:

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;