diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-10 08:02:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-10 08:02:54 (GMT) |
| commit | dc33abca8231bd449f311a04a089847274169f0b (patch) | |
| tree | 3735c019b9a15af9f76f643f8d33826e4755202a | |
| parent | 4e39a8e0b828039a94b8014caea48a24a4938349 (diff) | |
| parent | f608eb10d475301aedbbf0d6a0addbd50dea0e34 (diff) | |
| download | tcl-dc33abca8231bd449f311a04a089847274169f0b.zip tcl-dc33abca8231bd449f311a04a089847274169f0b.tar.gz tcl-dc33abca8231bd449f311a04a089847274169f0b.tar.bz2 | |
Merge 8.7. Try to build on windows-2022
| -rw-r--r-- | .github/workflows/win-build.yml | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 370f2de..a470f50 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -4,7 +4,7 @@ env: ERROR_ON_FAILURES: 1 jobs: msvc: - runs-on: windows-latest + runs-on: windows-2022 defaults: run: shell: powershell @@ -41,7 +41,7 @@ jobs: throw "nmake exit code: $lastexitcode" } gcc: - runs-on: windows-latest + runs-on: windows-2022 defaults: run: shell: msys2 {0} diff --git a/win/Makefile.in b/win/Makefile.in index 0c83fd6..ed2ee68 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -522,9 +522,9 @@ ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE} elif test "@ZLIB_LIBS@set" = "${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.aset" ; then \ $(COPY) $(ZLIB_DIR)/win64-arm/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ elif test "@ZLIB_LIBS@set" = "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \ - $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ - else \ $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ + else \ + $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ fi; # Add the object extension to the implicit rules. By default .obj is not |