diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index 26f0ad576c..9cd71ea20e 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -29,6 +29,8 @@ add_subdirectory(src/linmath)
 add_subdirectory(src/event)
 add_subdirectory(src/mathutil)
 add_subdirectory(src/gsgbase)
+add_subdirectory(src/glstuff)
+add_subdirectory(src/glgsg)
 add_subdirectory(src/pnmimage)
 add_subdirectory(src/pnmimagetypes)
 add_subdirectory(src/gobj)
@@ -53,3 +55,5 @@ add_subdirectory(src/framework)
 
 # Include panda metalibs
 add_subdirectory(metalibs/panda)
+#add_subdirectory(metalibs/pandagl)
+#add_subdirectory(metalibs/pandaegg)
diff --git a/panda/src/glgsg/CMakeLists.txt b/panda/src/glgsg/CMakeLists.txt
new file mode 100644
index 0000000000..1863697573
--- /dev/null
+++ b/panda/src/glgsg/CMakeLists.txt
@@ -0,0 +1,15 @@
+if(HAVE_GL)
+  set(P3GLGSG_HEADERS
+    config_glgsg.h glgsg.h
+  )
+
+  set(P3GLGSG_SOURCES
+    config_glgsg.cxx
+    glgsg.cxx
+  )
+
+  composite_sources(p3glgsg P3GLGSG_SOURCES)
+  add_library(p3glgsg ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES})
+  target_link_libraries(p3glgsg p3glstuff p3display)
+  target_interrogate(p3glgsg ALL)
+endif()
\ No newline at end of file
diff --git a/panda/src/glstuff/CMakeLists.txt b/panda/src/glstuff/CMakeLists.txt
new file mode 100644
index 0000000000..23327d6c1f
--- /dev/null
+++ b/panda/src/glstuff/CMakeLists.txt
@@ -0,0 +1,37 @@
+if(HAVE_GL)
+  set(P3GLSTUFF_HEADERS
+     glGeomContext_src.I
+     glGeomContext_src.h
+     glGeomMunger_src.I
+     glGeomMunger_src.h
+     glGraphicsStateGuardian_src.I
+     glGraphicsStateGuardian_src.h
+     glGraphicsBuffer_src.I
+     glGraphicsBuffer_src.h
+     glImmediateModeSender_src.I
+     glImmediateModeSender_src.h
+     glIndexBufferContext_src.I
+     glIndexBufferContext_src.h
+     glOcclusionQueryContext_src.I
+     glOcclusionQueryContext_src.h
+     glShaderContext_src.I
+     glShaderContext_src.h
+     glTextureContext_src.I
+     glTextureContext_src.h
+     glVertexBufferContext_src.I
+     glVertexBufferContext_src.h
+     glmisc_src.h
+     glstuff_src.h
+     glstuff_undef_src.h
+     panda_glext.h
+  )
+
+  set(P3GLSTUFF_SOURCES
+    glpure.cxx
+  )
+
+  composite_sources(p3glstuff P3GLSTUFF_SOURCES)
+  add_library(p3glstuff ${P3GLSTUFF_HEADERS} ${P3GLSTUFF_SOURCES})
+  target_link_libraries(p3glstuff p3pandabase)
+  target_interrogate(p3glstuff ALL)
+endif()
\ No newline at end of file