diff --git a/CMakeLists.txt b/CMakeLists.txt
index 437e1d83b..3a83006a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -939,7 +939,7 @@ if(SDL_LIBC)
         check_symbol_exists("${_FN}" "math.h" ${_HAVEVAR})
       endforeach()
       set(CMAKE_REQUIRED_LIBRARIES)
-      if(NOT VITA)
+      if(NOT VITA AND NOT NINTENDO_SWITCH)
         list(APPEND EXTRA_LIBS m)
       endif()
     endif()
@@ -2597,18 +2597,18 @@ elseif(NINTENDO_SWITCH)
     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(HAVE_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)
+    set(HAVE_OPENGL TRUE)
   endif()
   set(SDL_STATIC_PIC ON)
-  list(APPEND EXTRA_LIBS EGL glapi drm_nouveau nx m)
+  list(APPEND EXTRA_LIBS EGL glapi drm_nouveau)
   add_definitions(-DSDL_VIDEO_STATIC_ANGLE)
   set(HAVE_CLOCK_GETTIME 1)
-  set(PTHREADS ON)
-  set(PTHREADS_SEM ON)
+  set(SDL_PTHREADS ON)
+  set(SDL_PTHREADS_SEM ON)
   CheckPTHREAD()
 endif()
 
diff --git a/src/timer/switch/SDL_systimer.c b/src/timer/switch/SDL_systimer.c
index f0a13a2bd..c123c0465 100644
--- a/src/timer/switch/SDL_systimer.c
+++ b/src/timer/switch/SDL_systimer.c
@@ -45,13 +45,14 @@ SDL_TicksQuit(void)
     started = false;
 }
 
-Uint32 SDL_GetTicks(void)
+Uint64
+SDL_GetTicks64(void)
 {
     if (!started) {
         SDL_TicksInit();
     }
 
-    return (Uint32) ((SDL_GetPerformanceCounter() - start) * 1000 / SDL_GetPerformanceFrequency());
+    return (SDL_GetPerformanceCounter() - start) * 1000 / SDL_GetPerformanceFrequency();
 }
 
 Uint64