From 6816c37fa6194ad35dbe73249b8f4789258a2daf Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sat, 2 Feb 2002 00:43:17 +0000
Subject: [PATCH] un-revert composite fix, now that it builds correctly

---
 panda/src/distort/Sources.pp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/panda/src/distort/Sources.pp b/panda/src/distort/Sources.pp
index 7858716e19..7af9977e1d 100644
--- a/panda/src/distort/Sources.pp
+++ b/panda/src/distort/Sources.pp
@@ -5,14 +5,19 @@
   #define TARGET distort
   #define LOCAL_LIBS \
     sgraphutil sgraph sgattrib gobj linmath
+    
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx
 
-  #define SOURCES \
-    config_distort.cxx config_distort.h \
-    cylindricalLens.cxx cylindricalLens.h cylindricalLens.I \
-    fisheyeLens.cxx fisheyeLens.h fisheyeLens.I \
-    nonlinearImager.cxx nonlinearImager.h nonlinearImager.I \
-    pSphereLens.cxx pSphereLens.h pSphereLens.I \
-    projectionScreen.cxx projectionScreen.h projectionScreen.I
+  #define SOURCES config_distort.h \
+    projectionScreen.h projectionScreen.I \
+    cylindricalLens.h cylindricalLens.I \
+    fisheyeLens.h fisheyeLens.I \
+    nonlinearImager.h nonlinearImager.I \
+    pSphereLens.h pSphereLens.I
+
+  #define INCLUDED_SOURCES \
+    config_distort.cxx cylindricalLens.cxx fisheyeLens.cxx nonlinearImager.cxx \
+    projectionScreen.cxx pSphereLens.cxx 
 
   #define INSTALL_HEADERS