diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7c6978..5ff14ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ env: jobs: windows: - runs-on: windows-2019 + runs-on: windows-2025 strategy: matrix: @@ -55,7 +55,7 @@ jobs: run: | mkdir build cd build - cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}" + cmake .. -G "Visual Studio 17 2022" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}" cmake --build . --config ${{ env.MSVC_CONFIG }} - name: Run tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 900b920..048e99e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,10 +27,10 @@ jobs: tag_name: ${{ steps.get-git-tag.outputs.name }} release_name: libloot-python v${{ steps.get-git-tag.outputs.name }} body: | - Requires Windows 7 or later and the [MSVC 2019 x86 redistributable](https://aka.ms/vs/16/release/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive. + Requires Windows 7 or later and the [MSVC 2022 x86 redistributable](https://aka.ms/vs/17/release/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive. windows: - runs-on: windows-2019 + runs-on: windows-2025 needs: create_release strategy: @@ -61,7 +61,7 @@ jobs: run: | mkdir build cd build - cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}" + cmake .. -G "Visual Studio 17 2022" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}" cmake --build . --config ${{ env.MSVC_CONFIG }} - name: Build archive diff --git a/docs/README.md b/docs/README.md index 6590eab..9b01f62 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,7 +3,7 @@ libloot-python This archive contains a build of the libloot-python wrapper module and its corresponding 32-bit Windows build of libloot. -The DLL requires the [MSVC 2019 x86 redistributable](https://aka.ms/vs/16/release/vc_redist.x86.exe) +The DLL requires the [MSVC 2022 x86 redistributable](https://aka.ms/vs/17/release/vc_redist.x86.exe) to be installed. See the [online documentation](http://loot-api-python.readthedocs.org/) for more information. diff --git a/docs/usage.rst b/docs/usage.rst index 21ac492..06cdd90 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -10,13 +10,13 @@ Build archives contain two binaries: * ``loot.*.pyd`` is the Python wrapper * ``loot.dll`` is the C++ library DLL that the Python wrapper was built against. -The C++ DLL requires the `Visual C++ 2019 Redistributable (x86)`_ +The C++ DLL requires the `Visual C++ 2022 Redistributable (x86)`_ to be installed. To use the wrapper, copy both files to wherever you want to import them from (they must be in the same folder), and you're done! -.. _Visual C++ 2019 Redistributable (x86): https://aka.ms/vs/16/release/vc_redist.x86.exe +.. _Visual C++ 2022 Redistributable (x86): https://aka.ms/vs/17/release/vc_redist.x86.exe Using the wrapper =================