edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4191

Browse source 
4191: Add zlib1.dll for curl, add pnglibconf.h r=heinrich5991 a=def-

As reported by Jupeyy in https://github.com/ddnet/ddnet-libs/pull/17#issuecomment-933034244

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2021-10-03 22:35:15 +00:00 committed by GitHub
parent 4ee5aa585b b733f365dc
commit deaec2792a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/FindCurl.cmake
View file

@ -30,6 +30,7 @@ if(CURL_FOUND)
if(CURL_BUNDLED AND TARGET_OS STREQUAL "windows")
set(CURL_COPY_FILES
"${EXTRA_CURL_LIBDIR}/libcurl.dll"
"${EXTRA_CURL_LIBDIR}/zlib1.dll"
)
else()
set(CURL_COPY_FILES)

2
ddnet-libs

@ -1 +1 @@
Subproject commit 66baca4e558300fd27dadcfbd51a35772dfbf9c4
Subproject commit 5287ccda3fb72356c9a88accc3ec32761c4359a7