Merge pull request #196 from sithlord48/vcpkgUpdate

Update zlib and vcpkg config

.github/workflows/build.yml

@@ -67,6 +67,7 @@ jobs:
  zlib_path: ${{ github.workspace }}/../zlib-git
  zlib_build_path: ${{ github.workspace }}/../build-zlib-git
  zlib_installation_path: C:/zlib
+ zlib_version: "1.3"
  ff7tk_installation_path: ${{ github.workspace }}/ff7tk
  makoureactor_build_path: ${{ github.workspace }}/../build-makoureactor
  makoureactor_installation_path: ${{ github.workspace }}/../installation-makoureactor
@@ -117,12 +118,12 @@ jobs:
  uses: actions/cache@v3
  with:
  path: ${{ env.zlib_installation_path }}
- key: ${{ runner.os }}${{ matrix.win_arch }}-zlib
+ key: ${{ runner.os }}${{ matrix.win_arch }}-zlib-${{ env.zlib_version}}
 
  - name: Install Zlib
  if: (runner.os == 'Windows') && (steps.cache-zlib.outputs.cache-hit != 'true')
  run: |
- git clone -q --depth 1 --single-branch --branch=v1.2.11 https://github.com/madler/zlib ${{ env.zlib_path }}
+ git clone -q --depth 1 --single-branch --branch=v${{ env.zlib_version }} https://github.com/madler/zlib ${{ env.zlib_path }}
  cmake -S${{ env.zlib_path }} -B${{ env.zlib_build_path }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_INSTALL_PREFIX=${{ env.zlib_installation_path }}
  cmake --build ${{ env.zlib_build_path }} --target install -j3
 

.vcpkg/ports/ff7tk/portfile.cmake

@@ -6,8 +6,8 @@ endif()
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO sithlord48/ff7tk
- REF v0.83.3
- SHA512 4c1f01670a5c34619d172f1abb47e1f7d4a597fe7e05eeedc2ecb3829825498f1e51f2dfd1ac03a858c2a828dbd4a80cc6c95c7ef8b64d3a7d686062de5ecf0c
+ REF v1.0.0
+ SHA512 04be8a01d72a3986f1b0d1b2af0ab5d4848231a7888f90bc9672653273600d904c1dcad5b5a7ee29df15d87de8cadd27b8a263f29d2d399123833bcc3ee703eb
  HEAD_REF master
 )
 

.vcpkg/ports/ff7tk/vcpkg.json

@@ -1,6 +1,6 @@
 {
  "name": "ff7tk",
- "version": "0.83.3",
+ "version": "1.0.0",
  "description": "Toolkit for making tools to edit Final Fantasy VII",
  "homepage": "https://github.com/sithlord48/ff7tk",
  "license": " LGPL-3.0",

.vcpkg/versions/baseline.json

@@ -1,7 +1,7 @@
 {
  "default": {
  "ff7tk": {
- "baseline": "0.83.3",
+ "baseline": "1.0.0",
  "port-version": 0
  }
  }

.vcpkg/versions/f-/ff7tk.json

@@ -1,7 +1,7 @@
 {
  "versions": [
  {
- "version": "0.83.3",
+ "version": "1.0.0",
  "path": "$/ports/ff7tk"
  }
  ]

vcpkg.json

@@ -9,12 +9,12 @@
  "overrides": [
  {
  "name": "ff7tk",
- "version": "0.83.3",
+ "version": "1.0.0",
  "port-version": 0
  },
  {
  "name": "zlib",
- "version": "1.2.13",
+ "version": "1.3",
  "port-version": 0
  }
  ]