CMake: Adjust for upstream Panda3D changes.

dtool/Config.cmake

@@ -327,6 +327,11 @@ overhead to have this option available even if it is unused, it is
 by default enabled only in a development build.  This has no effect
 on DirectX rendering." ${IS_DEBUG_BUILD})
 
+option(SUPPORT_FIXED_FUNCTION
+  "This option compiles in support for the fixed-function OpenGL
+pipeline.  It is only really useful to turn this off if you are targeting
+an OpenGL ES 2 system." ON)
+
 option(USE_MEMORY_DLMALLOC
   "This is an optional alternative memory-allocation scheme
 available within Panda.  You can experiment with it to see

dtool/dtool_config.h.in

@@ -239,6 +239,9 @@
 /* Define if we want to allow immediate mode OpenGL rendering.  */
 #cmakedefine SUPPORT_IMMEDIATE_MODE
 
+/* Define if we want to support fixed-function OpenGL rendering. */
+#cmakedefine SUPPORT_FIXED_FUNCTION
+
 /* Define for either of the alternative malloc schemes. */
 #cmakedefine USE_MEMORY_DLMALLOC
 #cmakedefine USE_MEMORY_PTMALLOC2

dtool/src/interrogatedb/CMakeLists.txt

@@ -10,8 +10,7 @@ set(P3INTERROGATEDB_HEADERS
 	interrogateType.I interrogateType.h
 	interrogate_datafile.I interrogate_datafile.h
 	interrogate_interface.h interrogate_request.h
-	extension.h py_panda.h
-	vector_int.h )
+	extension.h py_panda.h)
 
 set(P3INTERROGATEDB_SOURCES
 	config_interrogatedb.cxx
@@ -24,8 +23,7 @@ set(P3INTERROGATEDB_SOURCES
 	interrogateManifest.cxx
 	interrogateType.cxx interrogate_datafile.cxx
 	interrogate_interface.cxx interrogate_request.cxx
-	py_panda.cxx
-	vector_int.cxx)
+	py_panda.cxx)
 
 composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES)