stupid ai

.github/workflows/release.yml

@@ -56,6 +56,9 @@ jobs:
 
   build-macos:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        arch: [x86_64, arm64]   # build both architectures
     steps:
       - uses: actions/checkout@v3
         with:
@@ -77,14 +80,24 @@ jobs:
 
       - name: Build
         run: |
-          conan install . --build=missing
-          conan build .
+          BUILD_DIR="build_${{ matrix.arch }}"
+          mkdir -p "$BUILD_DIR"
+          cd "$BUILD_DIR"
+
+          # Pass architecture explicitly to CMake via environment
+          export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
+
+          # Run Conan install/build
+          conan install .. --build=missing
+          conan build ..
+
+          cd ..
 
       - name: Package
         run: |
           TAG=${GITHUB_REF##refs/tags/}
-          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-          ARCH=$(uname -m)
+          OS="macos"
+          ARCH="${{ matrix.arch }}"
           FOLDER="chloride-$TAG-$OS-$ARCH"
           TAR="$FOLDER.tar.gz"
           mv build/bin "$FOLDER"
@@ -95,7 +108,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: macos-artifact
+          name: macos-${{ matrix.arch }}-artifact
           path: ${{ env.TAR_NAME }}
 
   build-windows:
@@ -117,24 +130,33 @@ jobs:
             base-devel
             mingw-w64-x86_64-gcc
             mingw-w64-x86_64-make
-            mingw-w64-x86_64-gmp
-            mingw-w64-x86_64-gc
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-python
+            mingw-w64-x86_64-python-pip
+            msys/flex
+
+      - name: Install Conan
+        run: |
+          python -m pip install --upgrade pip
+          pip install conan
+          conan profile detect
 
       - name: Build Project
         run: |
-          make windows
+          conan install . --profile mingw-profile.txt --build=missing
+          conan build . --profile mingw-profile.txt
 
       - name: Package
         run: |
-          $TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
-          $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
-          $FOLDER = "chloride-$TAG-windows-$ARCH"
-          $ZIP = "$FOLDER.zip"
-          Rename-Item bin $FOLDER
-          Copy-Item LICENSE.txt $FOLDER
-          Compress-Archive -Path $FOLDER -DestinationPath $ZIP
-          echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV
-        shell: pwsh
+          TAG=${GITHUB_REF##refs/tags/}
+          OS="windows"
+          ARCH=$(uname -m)
+          FOLDER="chloride-$TAG-$OS-$ARCH"
+          TAR="$FOLDER.tar.gz"
+          mv build/bin "$FOLDER"
+          cp LICENSE.txt "$FOLDER"
+          tar -czf "$TAR" "$FOLDER"
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -54,9 +54,10 @@ find_package(gmp REQUIRED)
 target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
 
 target_link_libraries(argon PRIVATE
-    "${CMAKE_CURRENT_SOURCE_DIR}/external/lib/libgc.a"
-    "${CMAKE_CURRENT_SOURCE_DIR}/external/lib/libgmp.a"
+    BDWgc::BDWgc
+    gmp::gmp
     m
+    $<$<PLATFORM_ID:Windows>:bcrypt>
 )
 
 target_include_directories(argon PRIVATE

Makefile

@@ -12,7 +12,11 @@ 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
+LDFLAGS = -lgc -lgmp -lm
+
+ifeq ($(MAKECMDGOALS),windows)
+	LDFLAGS = -Wl,-Bstatic -lgc -lgmp -Wl,-Bdynamic -lm
+endif
 
 all: $(BINARY)
 

conanfile.py

@@ -33,11 +33,6 @@ class ArgonConan(ConanFile):
         os.environ["CONAN_NON_INTERACTIVE"] = "1"
         tc = CMakeToolchain(self)
 
-        if os.name == "nt":  # Windows
-            flex_path = which("win_flex") or which("win_flex.exe")
-            if not flex_path:
-                raise Exception("win_flex not found in PATH. Install winflexbison via choco.")
-        else:
         flex_path = which("flex")
         if not flex_path:
             raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")

mingw-profile.txt

@@ -0,0 +1,12 @@
+[settings]
+os=Windows
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
+arch=x86_64
+build_type=Release
+
+[tool_requires]
+mingw-builds/12.2.0