diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-06-26 09:46:47 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-06-26 12:31:02 +0900 |
| commit | 797e1dfb83f949006b8b2007c4d65444394c2136 (patch) | |
| tree | 9bcc94a6fe6e3bced9aac202206e418330310a5f | |
| parent | 4fb7e1b6d0160322b3cbcdd67c544f2e9ff56bed (diff) | |
Link dll files on install-vcpkg tasks
| -rw-r--r-- | .github/workflows/windows.yml | 9 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d9a8c23090..a155a5223e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -142,17 +142,10 @@ jobs: run: cl - name: Install libraries with vcpkg - run: | - vcpkg install --triplet x64-windows - working-directory: src + run: nmake install-vcpkg env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - - name: link libraries - run: | - for %%I in (..\src\vcpkg_installed\x64-windows\bin\*.dll) do ( - if not %%~nI == readline mklink %%~nxI %%I - ) # We use OpenSSL instealled by vcpkg instead - name: disable system OpenSSL run: | diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 8c2b9c89db..aff5fc6e2b 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -597,6 +597,9 @@ update-vcpkg:: install-vcpkg:: @cd "$(srcdir:/=\)" && set LC_TIME=C && vcpkg install + for %%I in ($(srcdir:/=\)\vcpkg_installed\x64-windows\bin\*.dll) do ( + if not %%~nI == readline mklink %%~nxI %%I + ) .PHONY: reconfig reconfig $(MKFILES): $(srcdir)/common.mk $(srcdir)/version.h \ |