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
+          BUILD_DIR="build_${{ matrix.arch }}"
-          conan build .
+          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:]')
+          OS="macos"
-          ARCH=$(uname -m)
+          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,24 +140,33 @@ jobs:
             base-devel
             mingw-w64-x86_64-gcc
             mingw-w64-x86_64-make
-            mingw-w64-x86_64-gmp
+            mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-gc
+            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/', ''
+          TAG=${GITHUB_REF##refs/tags/}
-          $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
+          OS="windows"
-          $FOLDER = "chloride-$TAG-windows-$ARCH"
+          ARCH=$(uname -m)
-          $ZIP = "$FOLDER.zip"
+          FOLDER="chloride-$TAG-$OS-$ARCH"
-          Rename-Item bin $FOLDER
+          TAR="$FOLDER.tar.gz"
-          Copy-Item LICENSE.txt $FOLDER
+          mv build/bin "$FOLDER"
-          Compress-Archive -Path $FOLDER -DestinationPath $ZIP
+          cp LICENSE.txt "$FOLDER"
-          echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV
+          tar -czf "$TAR" "$FOLDER"
-        shell: pwsh
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -150,6 +182,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,14 +52,12 @@ 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
     gmp::gmp
     m
+    $<$<PLATFORM_ID:Windows>:bcrypt>
 )
 
 target_include_directories(argon PRIVATE

Makefile

@@ -12,6 +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 = -lgc -lgmp -lm
+
+ifeq ($(MAKECMDGOALS),windows)
+	LDFLAGS = -Wl,-Bstatic -lgc -lgmp -Wl,-Bdynamic -lm
+endif
 
 all: $(BINARY)
 
@@ -21,7 +26,7 @@ $(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)
 	(echo -n "external/xxhash/xxhash.c " ; \
@@ -29,11 +34,11 @@ windows: $(CFILES) $(LEXER_C) $(LEXER_H)
 	 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
@@ -41,13 +46,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:

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

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