diff --git a/dtool/Config.pp b/dtool/Config.pp
index 159aa4677f..f07027172a 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -616,12 +616,13 @@
 // Similar to MIN_GL_VERSION, above.
 #define MIN_MESA_VERSION 1 1
 
-// Experimental: TinySDGL, a variant on TinyGL ported to SDL.  Used
-// for fast but cheesy software rendering.
-#define TINYSDGL_IPATH
-#define TINYSDGL_LPATH
-#define TINYSDGL_LIBS TinySDGL TinyGLU SDL
-#defer HAVE_TINYSDGL $[libtest $[TINYSDGL_LPATH],$[TINYSDGL_LIBS]]
+// We are experimenting with integrating TinyGL for fast but cheesy
+// software rendering.  Presently, this requires SDL for window
+// management.
+#define SDL_IPATH
+#define SDL_LPATH
+#define SDL_LIBS SDL
+#defer HAVE_SDL $[libtest $[SDL_LPATH],$[SDL_LIBS]]
 
 // Is the Chromium remote-rendering library installed, and where?
 // This should include libcr_opengl32.
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 32a21e3b71..86a7ec8af3 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -127,11 +127,11 @@
   #define gl_framework $[GL_FRAMEWORK]
 #endif
 
-#if $[HAVE_TINYSDGL]
-  #define tinysdgl_ipath $[wildcard $[TINYSDGL_IPATH]]
-  #define tinysdgl_lpath $[wildcard $[TINYSDGL_LPATH]]
-  #define tinysdgl_cflags $[TINYSDGL_CFLAGS]
-  #define tinysdgl_libs $[TINYSDGL_LIBS]
+#if $[HAVE_SDL]
+  #define sdl_ipath $[wildcard $[SDL_IPATH]]
+  #define sdl_lpath $[wildcard $[SDL_LPATH]]
+  #define sdl_cflags $[SDL_CFLAGS]
+  #define sdl_libs $[SDL_LIBS]
 #endif
 
 #if $[HAVE_MESA]