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 adbc758

Browse filesBrowse files
committed
Fix libpng paths.
1 parent 07a2115 commit adbc758
Copy full SHA for adbc758

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
@@ -1024,8 +1024,7 @@ def get_extension(self):
10241024
default_libraries=(
10251025
['png', 'z'] if os.name == 'posix' else
10261026
# libpng upstream names their lib libpng16.lib, not png.lib.
1027-
# zlib upstream names their lib zlib.lib, not z.lib.
1028-
['libpng16', 'zlib'] if os.name == 'nt' else
1027+
['libpng16'] if os.name == 'nt' else
10291028
[]
10301029
),
10311030
alt_exec='libpng-config --ldflags')

0 commit comments

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