From f41f401961a65ffe41e7ef75e4c8324e61c50529 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 13 Apr 2016 11:38:31 +0200
Subject: [PATCH] Update cmake port to build ShaderMeshTerrain and
 LogicOpAttrib

---
 panda/src/grutil/CMakeLists.txt |  2 ++
 panda/src/ode/CMakeLists.txt    |  2 +-
 panda/src/pgraph/CMakeLists.txt | 10 ++++++----
 panda/src/putil/CMakeLists.txt  |  2 ++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/panda/src/grutil/CMakeLists.txt b/panda/src/grutil/CMakeLists.txt
index d65d9cc349..e4090fa2a4 100644
--- a/panda/src/grutil/CMakeLists.txt
+++ b/panda/src/grutil/CMakeLists.txt
@@ -10,6 +10,7 @@ set(P3GRUTIL_HEADERS
   geoMipTerrain.I geoMipTerrain.h
   sceneGraphAnalyzerMeter.I sceneGraphAnalyzerMeter.h
   heightfieldTesselator.I heightfieldTesselator.h
+  shaderTerrainMesh.I shaderTerrainMesh.h
   lineSegs.I lineSegs.h
   multitexReducer.I multitexReducer.h
   nodeVertexTransform.I nodeVertexTransform.h
@@ -27,6 +28,7 @@ set(P3GRUTIL_SOURCES
   geoMipTerrain.cxx
   sceneGraphAnalyzerMeter.cxx
   heightfieldTesselator.cxx
+  shaderTerrainMesh.cxx
   multitexReducer.cxx
   nodeVertexTransform.cxx
   pfmVizzer.cxx
diff --git a/panda/src/ode/CMakeLists.txt b/panda/src/ode/CMakeLists.txt
index 25795f4fc0..95791acc5c 100755
--- a/panda/src/ode/CMakeLists.txt
+++ b/panda/src/ode/CMakeLists.txt
@@ -82,7 +82,7 @@ if(HAVE_ODE)
 
   composite_sources(p3ode P3ODE_SOURCES)
   add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS})
-  set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
+  #set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
   target_link_libraries(p3ode p3pgraph p3physics ${ODE_LIBRARY})
   target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} EXTENSIONS ${P3ODE_IGATEEXT})
 
diff --git a/panda/src/pgraph/CMakeLists.txt b/panda/src/pgraph/CMakeLists.txt
index 4c5f7fed5f..fdff3841d9 100644
--- a/panda/src/pgraph/CMakeLists.txt
+++ b/panda/src/pgraph/CMakeLists.txt
@@ -44,10 +44,11 @@ set(P3PGRAPH_HEADERS
   light.I light.h
   lightAttrib.I lightAttrib.h
   lightRampAttrib.I lightRampAttrib.h
-  loader.I loader.h 
+  loader.I loader.h
   loaderFileType.h
-  loaderFileTypeBam.h 
+  loaderFileTypeBam.h
   loaderFileTypeRegistry.h
+  logicOpAttrib.I logicOpAttrib.h
   materialAttrib.I materialAttrib.h
   materialCollection.I materialCollection.h
   modelFlattenRequest.I modelFlattenRequest.h
@@ -144,9 +145,10 @@ set(P3PGRAPH_SOURCES
   lightAttrib.cxx
   lightRampAttrib.cxx
   loader.cxx
-  loaderFileType.cxx 
+  loaderFileType.cxx
   loaderFileTypeBam.cxx
-  loaderFileTypeRegistry.cxx 
+  loaderFileTypeRegistry.cxx
+  logicOpAttrib.cxx
   materialAttrib.cxx
   materialCollection.cxx
   modelFlattenRequest.cxx
diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt
index 5dfa232549..c0a213add5 100644
--- a/panda/src/putil/CMakeLists.txt
+++ b/panda/src/putil/CMakeLists.txt
@@ -112,6 +112,8 @@ set(P3PUTIL_SOURCES
 )
 
 set(P3PUTIL_IGATEEXT
+  bamReader_ext.cxx
+  bamReader_ext.h
   callbackObject_ext.h
   pythonCallbackObject.cxx
   pythonCallbackObject.h