diff --git a/CMakeLists.txt b/CMakeLists.txt index 5817c1b9f..8b72faf17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2091,9 +2091,7 @@ elseif(APPLE) endif() if(SDL_OPENGLES) - if(IOS OR TVOS) - set(SDL_FRAMEWORK_OPENGLES 1) - else() + if(NOT (IOS OR TVOS)) set(SDL_VIDEO_OPENGL_EGL 1) endif() set(SDL_VIDEO_OPENGL_ES2 1) @@ -2182,9 +2180,6 @@ elseif(APPLE) list(APPEND EXTRA_LDFLAGS "-Wl,-weak_framework,Metal") endif() endif() - if(SDL_FRAMEWORK_OPENGLES) - list(APPEND EXTRA_LDFLAGS "-Wl,-framework,OpenGLES") - endif() if(SDL_FRAMEWORK_QUARTZCORE) if(IOS OR TVOS) list(APPEND EXTRA_LDFLAGS "-Wl,-framework,QuartzCore") diff --git a/configure b/configure index b1cc12256..0bf207ced 100755 --- a/configure +++ b/configure @@ -27947,7 +27947,6 @@ printf "%s\n" "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreMotion" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Foundation" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,GameController" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit" diff --git a/configure.ac b/configure.ac index df2993099..208ec49c2 100644 --- a/configure.ac +++ b/configure.ac @@ -3982,7 +3982,6 @@ dnl BeOS support removed after SDL 2.0.1. Haiku still works. --ryan. EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreMotion" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Foundation" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,GameController" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"