Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8262c96

Browse filesBrowse files
committed
Fix libpng paths.
1 parent 6c5a008 commit 8262c96
Copy full SHA for 8262c96

File tree

Expand file treeCollapse file tree

2 files changed

+3
-4
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+3
-4
lines changed

‎ci/azure-pipelines-steps.yml

Copy file name to clipboardExpand all lines: ci/azure-pipelines-steps.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ steps:
2222

2323
- script: |
2424
nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)"
25-
echo ##vso[task.setvariable variable=MPLBASEDIRLIST]win32_static;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native
26-
echo ##vso[task.setvariable variable=LIBDIR]%LIBDIR%;$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release
25+
echo ##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include
26+
echo ##vso[task.setvariable variable=LINK]/LIBPATH:$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release
2727
echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release
2828
displayName: 'Install dependencies with nuget'
2929

‎setupext.py

Copy file name to clipboardExpand all lines: setupext.py
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,7 @@ def get_extension(self):
646646
default_libraries=(
647647
['png', 'z'] if os.name == 'posix' else
648648
# libpng upstream names their lib libpng16.lib, not png.lib.
649-
# zlib upstream names their lib zlib.lib, not z.lib.
650-
['libpng16', 'zlib'] if os.name == 'nt' else
649+
['libpng16'] if os.name == 'nt' else
651650
[]
652651
),
653652
)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.