fix rosetta not used

.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:
@@ -73,18 +76,38 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install conan
-          conan profile detect
+          if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
+            arch -x86_64 conan profile detect
+          else
+            conan profile detect
+          fi
 
       - name: Build
         run: |
-          conan install . --build=missing
-          conan build .
+          BUILD_DIR="build_${{ matrix.arch }}"
+          mkdir -p "$BUILD_DIR"
+          cd "$BUILD_DIR"
+
+          # Use Rosetta for x86_64 builds on Apple Silicon
+          if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
+            arch -x86_64 bash -c "
+              export CMAKE_OSX_ARCHITECTURES=x86_64
+              conan install .. --build=missing
+              conan build ..
+            "
+          else
+            export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
+            conan install .. --build=missing
+            conan build ..
+          fi
+
+          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 +118,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,8 +140,10 @@ jobs:
             base-devel
             mingw-w64-x86_64-gcc
             mingw-w64-x86_64-make
+            mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python
             mingw-w64-x86_64-python-pip
+            msys/flex
 
       - name: Install Conan
         run: |
@@ -129,19 +154,19 @@ jobs:
       - name: Build Project
         run: |
           conan install . --profile mingw-profile.txt --build=missing
-          conan build .
+          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

@@ -57,6 +57,7 @@ target_link_libraries(argon PRIVATE
     BDWgc::BDWgc
     gmp::gmp
     m
+    $<$<PLATFORM_ID:Windows>:bcrypt>
 )
 
 target_include_directories(argon PRIVATE

conanfile.py

@@ -33,14 +33,9 @@ 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.")
+        flex_path = which("flex")
+        if not flex_path:
+            raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
 
         tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
         tc.generate()