From d8950adef437f684f7d80499c9d26300e686797c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Tue, 2 Feb 2021 13:18:19 +0100 Subject: [PATCH 1/2] Enable libtiff Win32 I/O correctly --- setup.py | 2 +- winbuild/tiff.opt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 10992779e00..2b457cf053e 100755 --- a/setup.py +++ b/setup.py @@ -729,7 +729,7 @@ def build_extensions(self): defs.append(("HAVE_LIBTIFF", None)) # FIXME the following define should be detected automatically # based on system libtiff, see #4237 - if PLATFORM_MINGW: + if sys.platform == "win32": defs.append(("USE_WIN32_FILEIO", None)) if feature.xcb: libs.append(feature.xcb) diff --git a/winbuild/tiff.opt b/winbuild/tiff.opt index d82c51678d6..d6e7a8ed43d 100644 --- a/winbuild/tiff.opt +++ b/winbuild/tiff.opt @@ -124,7 +124,7 @@ OPTFLAGS = /Ox /MD /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE # instead of Windows specific system calls. See notes on top of tif_unix.c # module for details. # -USE_WIN_CRT_LIB = 1 +#USE_WIN_CRT_LIB = 1 # Compiler specific options. You may probably want to adjust compilation # parameters in CFLAGS variable. Refer to your compiler documentation From 6e31662a49cea6d4fac78534a9935354d75af229 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 25 Mar 2021 00:40:12 +1100 Subject: [PATCH 2/2] Updated nasm to 2.15.05 --- .github/workflows/test-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index d53daec1365..2b15d6aea3c 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -68,8 +68,8 @@ jobs: - name: Install dependencies id: install run: | - 7z x winbuild\depends\nasm-2.14.02-win64.zip "-o$env:RUNNER_WORKSPACE\" - echo "$env:RUNNER_WORKSPACE\nasm-2.14.02" >> $env:GITHUB_PATH + 7z x winbuild\depends\nasm-2.15.05-win64.zip "-o$env:RUNNER_WORKSPACE\" + echo "$env:RUNNER_WORKSPACE\nasm-2.15.05" >> $env:GITHUB_PATH winbuild\depends\gs9533w32.exe /S echo "C:\Program Files (x86)\gs\gs9.53.3\bin" >> $env:GITHUB_PATH