Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Force-vendor libraries on Win32 like on Apple and update ANGLE, fixing some Windows build envs #561

Merged
merged 2 commits into from
Mar 15, 2020
Merged

Force-vendor libraries on Win32 like on Apple and update ANGLE, fixing some Windows build envs #561

merged 2 commits into from
Mar 15, 2020

Conversation

nabijaczleweli
Copy link
Contributor

As discussed in #559

@nabijaczleweli
Update ANGLE to 8776e911bf71f68518ddd1995ce09d80db8c1216
0c0ef08
@nabijaczleweli
Force vendor zlib, png, and FreeType on Win32, too
b22d92d 
This has lead to linker problems if the environment does have standard
versions of zlib/png (like from MSYS2), see discussion in referenced
issue

Closes #559
@nabijaczleweli nabijaczleweli changed the title Force-vendor libraries on Win32 like on Apple and update ANGLE, fixing some build envs Force-vendor libraries on Win32 like on Apple and update ANGLE, fixing some Windows build envs Mar 14, 2020
@whitequark whitequark merged commit e355a09 into solvespace:master Mar 15, 2020
@whitequark
Copy link
Contributor

Thanks!

@nabijaczleweli nabijaczleweli deleted the force-vendor branch March 15, 2020 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nabijaczleweli @whitequark