From 6c34e0fb6c9df33a4bdc59f3fca911208660ac60 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 15 Jan 2012 15:43:06 +0000
Subject: [PATCH] fix makepanda built; ppremake build should use composites too

---
 panda/src/glxdisplay/Sources.pp               | 23 +++++++++++++------
 .../glxdisplay/p3glxdisplay_composite1.cxx    |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/panda/src/glxdisplay/Sources.pp b/panda/src/glxdisplay/Sources.pp
index 3f1fa32329..45c48c73a5 100644
--- a/panda/src/glxdisplay/Sources.pp
+++ b/panda/src/glxdisplay/Sources.pp
@@ -12,17 +12,26 @@
   #define LOCAL_LIBS \
     p3glgsg p3x11display
 
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx
+ 
   #define SOURCES \
-    config_glxdisplay.cxx config_glxdisplay.h \
-    glxGraphicsBuffer.h glxGraphicsBuffer.I glxGraphicsBuffer.cxx \
-    glxGraphicsPipe.cxx glxGraphicsPipe.h glxGraphicsPipe.I \
-    glxGraphicsPixmap.h glxGraphicsPixmap.I glxGraphicsPixmap.cxx \
-    glxGraphicsWindow.h glxGraphicsWindow.cxx \
+    config_glxdisplay.h \
+    glxGraphicsBuffer.h glxGraphicsBuffer.I \
+    glxGraphicsPipe.h glxGraphicsPipe.I \
+    glxGraphicsPixmap.h glxGraphicsPixmap.I \
+    glxGraphicsWindow.h \
     glxGraphicsStateGuardian.h glxGraphicsStateGuardian.I \
-    glxGraphicsStateGuardian.cxx \
     posixGraphicsStateGuardian.h posixGraphicsStateGuardian.I \
-    posixGraphicsStateGuardian.cxx \
     panda_glxext.h
+ 
+  #define INCLUDED_SOURCES \
+    config_glxdisplay.cxx \
+    glxGraphicsBuffer.cxx \
+    glxGraphicsPipe.cxx \
+    glxGraphicsPixmap.cxx \
+    glxGraphicsWindow.cxx \
+    glxGraphicsStateGuardian.cxx \
+    posixGraphicsStateGuardian.cxx
 
   #define INSTALL_HEADERS \
     glxGraphicsBuffer.I glxGraphicsBuffer.h \
diff --git a/panda/src/glxdisplay/p3glxdisplay_composite1.cxx b/panda/src/glxdisplay/p3glxdisplay_composite1.cxx
index ecfe5224ac..ed7b7e0804 100644
--- a/panda/src/glxdisplay/p3glxdisplay_composite1.cxx
+++ b/panda/src/glxdisplay/p3glxdisplay_composite1.cxx
@@ -4,3 +4,4 @@
 #include "glxGraphicsPixmap.cxx"
 #include "glxGraphicsStateGuardian.cxx"
 #include "glxGraphicsWindow.cxx"
+#include "posixGraphicsStateGuardian.cxx"