Don't link with unnecessary and now removed AGL framework This framework has apparently been deprecated since quite some time and was removed from macOS 26, so linking with it resulted in an error. Don't do this any longer. Closes #25798.
Fix shared CMake build using external WebP library Link with libwebpdemux too, not just libwebp. Closes #25794.
... | ... | @@ -3,7 +3,7 @@ find_package(WebP CONFIG) |
3 | 3 | if(NOT WebP_FOUND)
|
4 | 4 | find_package(PkgConfig QUIET)
|
5 | 5 | if(PKG_CONFIG_FOUND)
|
6 | - pkg_check_modules(WebP libwebp)
|
|
6 | + pkg_check_modules(WebP libwebp libwebpdemux)
|
|
7 | 7 | endif()
|
8 | 8 | endif()
|
9 | 9 |
... | ... | @@ -30865,7 +30865,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then |
30865 | 30865 | |
30866 | 30866 | |
30867 | 30867 | if test "$wxUSE_OSX_COCOA" = 1; then
|
30868 | - OPENGL_LIBS="-framework OpenGL -framework AGL"
|
|
30868 | + OPENGL_LIBS="-framework OpenGL"
|
|
30869 | 30869 | elif test "$wxUSE_MSW" = 1; then
|
30870 | 30870 | OPENGL_LIBS="-lopengl32"
|
30871 | 30871 | elif test "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
|
... | ... | @@ -3419,7 +3419,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then |
3419 | 3419 | dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
|
3420 | 3420 | |
3421 | 3421 | if test "$wxUSE_OSX_COCOA" = 1; then
|
3422 | - OPENGL_LIBS="-framework OpenGL -framework AGL"
|
|
3422 | + OPENGL_LIBS="-framework OpenGL"
|
|
3423 | 3423 | elif test "$wxUSE_MSW" = 1; then
|
3424 | 3424 | OPENGL_LIBS="-lopengl32"
|
3425 | 3425 | elif test "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
|
—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help