fix release.yml

.github/workflows/release.yml

@@ -114,17 +114,9 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Install Conan
-        run: |
-          python -m pip install --upgrade pip
-          pip install conan
-          conan profile detect
-        shell: pwsh
-
       - name: Build with MinGW
         run: |
-          conan install .
+          make windows
-          conan build .
         shell: pwsh
 
       - name: Package
@@ -133,7 +125,7 @@ jobs:
           $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
           $FOLDER = "chloride-$TAG-windows-$ARCH"
           $ZIP = "$FOLDER.zip"
-          Rename-Item build\bin $FOLDER
+          Rename-Item bin $FOLDER
           Copy-Item LICENSE.txt $FOLDER
           Compress-Archive -Path $FOLDER -DestinationPath $ZIP
           echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV

CMakeLists.txt

@@ -51,17 +51,7 @@ set_target_properties(argon PROPERTIES
 find_package(BDWgc REQUIRED)
 find_package(gmp REQUIRED)
 
-target_compile_options(argon PRIVATE -O3 -Wall -s)
+target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
-if(MSVC)
-    # Disable warning C4061 (enum in switch not handled)
-    target_compile_options(argon PRIVATE /wd4061)
-
-    # Disable Spectre mitigation warning C5045
-    target_compile_options(argon PRIVATE /wd5045)
-
-    # Optionally, remove "treat warnings as errors" if enabled
-    # target_compile_options(argon PRIVATE /WX-)  # uncomment if you previously used /WX
-endif()
 if(NOT APPLE)
     target_link_options(argon PRIVATE -static)
 endif()

Makefile

@@ -2,18 +2,29 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# Default FLEX tool
+BINARY = bin/argon
+FLEX_TOOL = flex
+
+# If target is "windows", override FLEX_TOOL
+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
-BINARY = bin/argon
 
 all: $(BINARY)
 
+windows: $(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