Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a6c34bb44d89
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e355a095c4c3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 15, 2020

  1. Update ANGLE to 8776e911bf71f68518ddd1995ce09d80db8c1216

    @nabijaczleweli @whitequark
    nabijaczleweli authored and whitequark committed Mar 15, 2020
    Copy the full SHA
    7e33d2d View commit details

  2. Force vendor zlib, png, and FreeType on Win32, too 

    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 @whitequark
    nabijaczleweli authored and whitequark committed Mar 15, 2020
    Copy the full SHA
    e355a09 View commit details
Showing with 4 additions and 6 deletions.
  1. +3 −5 CMakeLists.txt
  2. +1 −1 extlib/angle
8 changes: 3 additions & 5 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -144,11 +144,9 @@ if(WIN32 OR APPLE)
include(FindVendoredPackage)
include(AddVendoredSubdirectory)

if(APPLE)
set(FORCE_VENDORED_ZLIB ON)
set(FORCE_VENDORED_PNG ON)
set(FORCE_VENDORED_Freetype ON)
endif()
set(FORCE_VENDORED_ZLIB ON)
set(FORCE_VENDORED_PNG ON)
set(FORCE_VENDORED_Freetype ON)

find_vendored_package(ZLIB zlib
ZLIB_LIBRARY zlibstatic
2 changes: 1 addition & 1 deletion extlib/angle
Submodule angle updated 1 files
+1 −1 CMakeLists.txt