From 2cac5d9b1c517a2f5644fbd0f87138fbbb4234d9 Mon Sep 17 00:00:00 2001
From: kestred <kestred@riotcave.com>
Date: Tue, 21 Jan 2014 23:26:11 -0700
Subject: [PATCH] Add CMakeLists for panda/grutil.

---
 panda/CMakeLists.txt                   |  6 ++--
 panda/src/grutil/CMakeLists.txt        | 40 ++++++++++++++++++++++++++
 panda/src/grutil/lineSegs.cxx          |  1 +
 panda/src/grutil/pfmVizzer.cxx         |  1 +
 panda/src/grutil/rigidBodyCombiner.cxx |  1 +
 5 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 panda/src/grutil/CMakeLists.txt

diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index ac7e456c26..1b97c30dad 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -40,10 +40,10 @@ add_subdirectory(src/char)
 add_subdirectory(src/dgraph)
 add_subdirectory(src/device)
 add_subdirectory(src/pnmtext)
-
 add_subdirectory(src/parametrics)
-#add_subdirectory(src/text)
-#add_subdirectory(src/grutil)
+add_subdirectory(src/text)
+add_subdirectory(src/grutil)
+
 #add_subdirectory(src/tform)
 #add_subdirectory(src/framework)
 #add_subdirectory(src/testbed)
diff --git a/panda/src/grutil/CMakeLists.txt b/panda/src/grutil/CMakeLists.txt
new file mode 100644
index 0000000000..1324beea89
--- /dev/null
+++ b/panda/src/grutil/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(P3GRUTIL_HEADERS
+  pipeOcclusionCullTraverser.I pipeOcclusionCullTraverser.h
+  cardMaker.I cardMaker.h
+  config_grutil.h
+  movieTexture.I movieTexture.h
+  fisheyeMaker.I fisheyeMaker.h
+  frameRateMeter.I frameRateMeter.h
+  meshDrawer.I meshDrawer.h
+  meshDrawer2D.I meshDrawer2D.h
+  geoMipTerrain.I geoMipTerrain.h
+  sceneGraphAnalyzerMeter.I sceneGraphAnalyzerMeter.h
+  heightfieldTesselator.I heightfieldTesselator.h
+  lineSegs.I lineSegs.h
+  multitexReducer.I multitexReducer.h
+  nodeVertexTransform.I nodeVertexTransform.h
+  pfmVizzer.I pfmVizzer.h
+  rigidBodyCombiner.I rigidBodyCombiner.h
+)
+set(P3GRUTIL_SOURCES
+  cardMaker.cxx
+  movieTexture.cxx
+  fisheyeMaker.cxx
+  config_grutil.cxx
+  frameRateMeter.cxx
+  meshDrawer.cxx
+  meshDrawer2D.cxx
+  geoMipTerrain.cxx
+  sceneGraphAnalyzerMeter.cxx
+  heightfieldTesselator.cxx
+  nodeVertexTransform.cxx
+  pfmVizzer.cxx
+  pipeOcclusionCullTraverser.cxx
+  lineSegs.cxx
+  rigidBodyCombiner.cxx
+)
+
+composite_sources(p3grutil P3GRUTIL_SOURCES)
+add_library(p3grutil ${P3GRUTIL_SOURCES} ${P3GRUTIL_HEADERS})
+target_link_libraries(p3grutil p3display p3text)
+target_interrogate(p3grutil ALL)
diff --git a/panda/src/grutil/lineSegs.cxx b/panda/src/grutil/lineSegs.cxx
index dfd6bd3d89..5c09d8e79f 100644
--- a/panda/src/grutil/lineSegs.cxx
+++ b/panda/src/grutil/lineSegs.cxx
@@ -20,6 +20,7 @@
 #include "geomPoints.h"
 #include "geomVertexReader.h"
 #include "geomVertexWriter.h"
+#include "colorAttrib.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: LineSegs::Constructor
diff --git a/panda/src/grutil/pfmVizzer.cxx b/panda/src/grutil/pfmVizzer.cxx
index 3033af5845..91f3af1a6c 100644
--- a/panda/src/grutil/pfmVizzer.cxx
+++ b/panda/src/grutil/pfmVizzer.cxx
@@ -21,6 +21,7 @@
 #include "geomTriangles.h"
 #include "geomVertexWriter.h"
 #include "lens.h"
+#include "pnmImage.h"
 #include "config_grutil.h"
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/grutil/rigidBodyCombiner.cxx b/panda/src/grutil/rigidBodyCombiner.cxx
index ef9584f5a1..198da02e20 100644
--- a/panda/src/grutil/rigidBodyCombiner.cxx
+++ b/panda/src/grutil/rigidBodyCombiner.cxx
@@ -22,6 +22,7 @@
 #include "geomVertexAnimationSpec.h"
 #include "sceneGraphReducer.h"
 #include "omniBoundingVolume.h"
+#include "cullTraverserData.h"
 
 TypeHandle RigidBodyCombiner::_type_handle;