diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c97b5f13b5c1..03c352ca694e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,12 +238,6 @@ if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC)
 endif()
 
 # Default option knobs
-if(APPLE OR ARCH_64 OR MSVC_CLANG)
-  if(NOT "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm")
-    set(OPT_DEF_SSEMATH ON)
-  endif()
-endif()
-
 if(UNIX OR MINGW OR MSYS OR (USE_CLANG AND NOT WINDOWS) OR VITA OR PSP OR PS2 OR N3DS OR NINTENDO_SWITCH)
   set(OPT_DEF_LIBC ON)
 endif()
@@ -363,6 +357,7 @@ endif()
 
 if(NINTENDO_SWITCH)
   set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
+  set(SDL_PTHREADS_ENABLED_BY_DEFAULT ON)
   set(SDL_LOADSO_ENABLED_BY_DEFAULT OFF)
   set(SDL_CPUINFO_ENABLED_BY_DEFAULT OFF)
   set(SDL_DLOPEN_ENABLED_BY_DEFAULT OFF)
@@ -2933,20 +2928,22 @@ elseif(NINTENDO_SWITCH)
     file(GLOB SWITCH_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/switch/*.c)
     set(SOURCE_FILES ${SOURCE_FILES} ${SWITCH_VIDEO_SOURCES})
     set(HAVE_SDL_VIDEO TRUE)
-    set(SDL_VIDEO_OPENGL_EGL 1)
-    set(HAVE_VIDEO_OPENGLES TRUE)
-    set(SDL_VIDEO_OPENGL_ES2 1)
-    set(SDL_VIDEO_RENDER_OGL_ES2 1)
-    set(SDL_VIDEO_OPENGL 1)
-    set(HAVE_VIDEO_OPENGL TRUE)
+    if(SDL_OPENGLES)
+      set(SDL_VIDEO_OPENGL_EGL 1)
+      set(SDL_VIDEO_OPENGL_ES2 1)
+      if(SDL_RENDER_GLES2)
+        set(HAVE_RENDER_GLES2 TRUE)
+        set(SDL_VIDEO_RENDER_OGL_ES2 1)
+      endif()
+      set(HAVE_OPENGLES TRUE)
+    endif()
   endif()
-  set(SDL_STATIC_PIC ON)
   list(APPEND EXTRA_LIBS EGL glapi drm_nouveau nx m)
   add_definitions(-DSDL_VIDEO_STATIC_ANGLE)
-  set(HAVE_CLOCK_GETTIME 1)
-  set(PTHREADS ON)
-  set(PTHREADS_SEM ON)
   CheckPTHREAD()
+  if(SDL_CLOCK_GETTIME)
+    set(HAVE_CLOCK_GETTIME 1)
+  endif()
 endif()
 
 if(HAVE_VULKAN AND NOT SDL_LOADSO)