diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 69a5354..b049856 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["windows-latest"] #, "windows-11-arm"] + os: ["windows-latest", "windows-11-arm"] steps: - name: Checkout repo uses: actions/checkout@v6 @@ -148,7 +148,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-latest", "windows-latest", "macos-latest", "ubuntu-24.04-arm"] # , "windows-11-arm"] + os: ["ubuntu-latest", "windows-latest", "macos-latest", "ubuntu-24.04-arm", "windows-11-arm"] python_version: ["cp311", "cp312", "cp313", "cp314"] steps: @@ -164,7 +164,7 @@ jobs: run: echo "filename=$(ls dist/*.tar.gz)" >> $GITHUB_OUTPUT - name: Build wheels - uses: pypa/cibuildwheel@v3.3 + uses: pypa/cibuildwheel@v3.4.1 env: CIBW_ARCHS_MACOS: universal2 CIBW_ARCHS_WINDOWS: native diff --git a/CHANGELOG.md b/CHANGELOG.md index f5ca39c..ed7ed13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ This file contains the list of changes made to the JLS project. +## 0.17.0 + +2026 Apr 27 + +* Added windows-11-arm64 support. + + ## 0.16.0 2025 Dec 2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6852da2..6fbe7e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required (VERSION 3.10) set(PARENT_PROJECT_DIR ${PROJECT_SOURCE_DIR}) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) # universal2 project(JLS - VERSION 0.16.0 + VERSION 0.17.0 LANGUAGES C) SET(PROJECT_PREFIX JLS) SET(VERSION_STRING "${PROJECT_VERSION}") diff --git a/include/jls/version.h b/include/jls/version.h index b3b18d2..aa3f79d 100644 --- a/include/jls/version.h +++ b/include/jls/version.h @@ -39,7 +39,7 @@ JLS_CPP_GUARD_START // Use version_update.py to update. #define JLS_VERSION_MAJOR 0 -#define JLS_VERSION_MINOR 16 +#define JLS_VERSION_MINOR 17 #define JLS_VERSION_PATCH 0 /** diff --git a/pyjls/version.py b/pyjls/version.py index 0c8a33d..66aae07 100644 --- a/pyjls/version.py +++ b/pyjls/version.py @@ -13,7 +13,7 @@ # limitations under the License. -__version__ = "0.16.0" +__version__ = "0.17.0" __title__ = "pyjls" __description__ = 'Joulescopeā„¢ file format' diff --git a/src/crc32c_arm_neon.c b/src/crc32c_arm_neon.c index 94c8aa9..4b7f53e 100644 --- a/src/crc32c_arm_neon.c +++ b/src/crc32c_arm_neon.c @@ -15,8 +15,14 @@ */ #include "jls/crc32c.h" +#if defined(_MSC_VER) +// MSVC on ARM64: __crc32cb/cw/cd are exposed through , not ACLE. +// See https://learn.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics +#include +#else #include #include +#endif #include // Used by Raspberry Pi 4 and new M1 Macs.