Fix libpng paths.

anntzer · tacaswell · commit 14f3b95d2f97 · 2019-08-24T21:28:01.000-04:00
diff --git a/ci/azure-pipelines-steps.yml b/ci/azure-pipelines-steps.yml
@@ -22,8 +22,8 @@ steps:
 
   - script: |
       nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
-      echo ##vso[task.setvariable variable=MPLBASEDIRLIST]win32_static;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native
-      echo ##vso[task.setvariable variable=LIBDIR]%LIBDIR%;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release
+      echo ##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include
+      echo ##vso[task.setvariable variable=LINK]/LIBPATH:$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release
       echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release
     displayName: 'Install dependencies with nuget'
 
diff --git a/setupext.py b/setupext.py
@@ -631,8 +631,7 @@ def get_extension(self):
             default_libraries=(
                 ['png', 'z'] if os.name == 'posix' else
                 # libpng upstream names their lib libpng16.lib, not png.lib.
-                # zlib upstream names their lib zlib.lib, not z.lib.
-                ['libpng16', 'zlib'] if os.name == 'nt' else
+                ['libpng16'] if os.name == 'nt' else
                 []
             ))
         add_numpy_flags(ext)
