1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

We couldn't use nmake before configure.bat

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2024-06-26 10:02:32 +09:00
parent 797e1dfb83
commit d70057d4b5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/windows.yml vendored
View File

@ -142,7 +142,9 @@ jobs:
run: cl run: cl
- name: Install libraries with vcpkg - name: Install libraries with vcpkg
run: nmake install-vcpkg run: |
vcpkg install --triplet x64-windows
working-directory: src
env: env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
@ -161,6 +163,8 @@ jobs:
../src/win32/configure.bat --disable-install-doc ../src/win32/configure.bat --disable-install-doc
--with-opt-dir=D:/a/ruby/ruby/src/vcpkg_installed/x64-windows --with-opt-dir=D:/a/ruby/ruby/src/vcpkg_installed/x64-windows
- run: nmake prepare-vcpkg
- run: nmake incs - run: nmake incs
- run: nmake extract-extlibs - run: nmake extract-extlibs

6
win32/Makefile.sub
View File

@ -597,8 +597,10 @@ update-vcpkg::
install-vcpkg:: install-vcpkg::
@cd "$(srcdir:/=\)" && set LC_TIME=C && vcpkg install @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 prepare-vcpkg::
for %%I in ($(srcdir:/=\)\vcpkg_installed\x64-windows\bin\*.dll) do ( \
if not %%~nI == readline mklink %%~nxI %%I \
) )
.PHONY: reconfig .PHONY: reconfig