Browse Source

use combined srcs

cxgeorge 24 years ago
parent
commit
c67997926d

+ 39 - 30
panda/src/particlesystem/Sources.pp

@@ -5,38 +5,47 @@
   #define TARGET particlesystem
   #define LOCAL_LIBS \
     physics sgraph sgattrib graph sgraphutil
+    
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx    
 
   #define SOURCES \
-    baseParticle.I baseParticle.cxx baseParticle.h \
-    baseParticleEmitter.I baseParticleEmitter.cxx baseParticleEmitter.h \
-    baseParticleFactory.I baseParticleFactory.cxx baseParticleFactory.h \
-    baseParticleRenderer.I baseParticleRenderer.cxx \
-    baseParticleRenderer.h boxEmitter.I boxEmitter.cxx boxEmitter.h \
-    config_particlesystem.cxx config_particlesystem.h discEmitter.I \
-    discEmitter.cxx discEmitter.h geomParticleRenderer.I \
-    geomParticleRenderer.cxx geomParticleRenderer.h lineEmitter.I \
-    lineEmitter.cxx lineEmitter.h lineParticleRenderer.I \
-    lineParticleRenderer.cxx lineParticleRenderer.h orientedParticle.I \
-    orientedParticle.cxx orientedParticle.h orientedParticleFactory.I \
-    orientedParticleFactory.cxx orientedParticleFactory.h \
-    particleSystem.I particleSystem.cxx particleSystem.h \
-    particleSystemManager.I particleSystemManager.cxx \
-    particleSystemManager.h pointEmitter.I pointEmitter.cxx \
-    pointEmitter.h pointParticle.cxx pointParticle.h \
-    pointParticleFactory.cxx pointParticleFactory.h \
-    pointParticleRenderer.I pointParticleRenderer.cxx \
-    pointParticleRenderer.h rectangleEmitter.I rectangleEmitter.cxx \
-    rectangleEmitter.h ringEmitter.I ringEmitter.cxx ringEmitter.h \
-    sparkleParticleRenderer.I sparkleParticleRenderer.cxx \
-    sparkleParticleRenderer.h sphereSurfaceEmitter.I \
-    sphereSurfaceEmitter.cxx sphereSurfaceEmitter.h \
-    sphereVolumeEmitter.I sphereVolumeEmitter.cxx sphereVolumeEmitter.h \
-    spriteParticleRenderer.I spriteParticleRenderer.cxx \
-    spriteParticleRenderer.h tangentRingEmitter.I \
-    tangentRingEmitter.cxx tangentRingEmitter.h zSpinParticle.I \
-    zSpinParticle.cxx zSpinParticle.h zSpinParticleFactory.I \
-    zSpinParticleFactory.cxx zSpinParticleFactory.h \
-    particleCommonFuncs.h
+     baseParticle.I baseParticle.h baseParticleEmitter.I  \
+     baseParticleEmitter.h baseParticleFactory.I  \
+     baseParticleFactory.h baseParticleRenderer.I  \
+     baseParticleRenderer.h boxEmitter.I boxEmitter.h  \
+     config_particlesystem.h discEmitter.I discEmitter.h  \
+     geomParticleRenderer.I geomParticleRenderer.h lineEmitter.I  \
+     lineEmitter.h lineParticleRenderer.I lineParticleRenderer.h  \
+     orientedParticle.I orientedParticle.h  \
+     orientedParticleFactory.I orientedParticleFactory.h  \
+     particleSystem.I particleSystem.h particleSystemManager.I  \
+     particleSystemManager.h pointEmitter.I pointEmitter.h  \
+     pointParticle.h pointParticleFactory.h  \
+     pointParticleRenderer.I pointParticleRenderer.h  \
+     rectangleEmitter.I rectangleEmitter.h ringEmitter.I  \
+     ringEmitter.h sparkleParticleRenderer.I  \
+     sparkleParticleRenderer.h sphereSurfaceEmitter.I  \
+     sphereSurfaceEmitter.h sphereVolumeEmitter.I  \
+     sphereVolumeEmitter.h spriteParticleRenderer.I  \
+     spriteParticleRenderer.h tangentRingEmitter.I  \
+     tangentRingEmitter.h zSpinParticle.I zSpinParticle.h  \
+     zSpinParticleFactory.I zSpinParticleFactory.h  \
+     particleCommonFuncs.h  \
+    
+ #define INCLUDED_SOURCES \
+     baseParticle.cxx baseParticleEmitter.cxx baseParticleFactory.cxx \
+     baseParticleRenderer.cxx boxEmitter.cxx \
+     config_particlesystem.cxx discEmitter.cxx \
+     geomParticleRenderer.cxx lineEmitter.cxx \
+     lineParticleRenderer.cxx orientedParticle.cxx \
+     orientedParticleFactory.cxx particleSystem.cxx \
+     particleSystemManager.cxx pointEmitter.cxx pointParticle.cxx \
+     pointParticleFactory.cxx pointParticleRenderer.cxx \
+     rectangleEmitter.cxx ringEmitter.cxx \
+     sparkleParticleRenderer.cxx sphereSurfaceEmitter.cxx \
+     sphereVolumeEmitter.cxx spriteParticleRenderer.cxx \
+     tangentRingEmitter.cxx zSpinParticle.cxx \
+     zSpinParticleFactory.cxx 
 
   #define INSTALL_HEADERS \
     baseParticle.I baseParticle.h baseParticleEmitter.I \

+ 17 - 0
panda/src/particlesystem/particlesystem_composite1.cxx

@@ -0,0 +1,17 @@
+
+#include "config_particlesystem.cxx"
+#include "geomParticleRenderer.cxx"
+#include "pointEmitter.cxx"
+#include "pointParticle.cxx"
+#include "pointParticleFactory.cxx"
+#include "pointParticleRenderer.cxx"
+#include "rectangleEmitter.cxx"
+#include "ringEmitter.cxx"
+#include "sparkleParticleRenderer.cxx"
+#include "sphereSurfaceEmitter.cxx"
+#include "sphereVolumeEmitter.cxx"
+#include "spriteParticleRenderer.cxx"
+#include "tangentRingEmitter.cxx"
+#include "zSpinParticle.cxx"
+#include "zSpinParticleFactory.cxx "
+

+ 14 - 0
panda/src/particlesystem/particlesystem_composite2.cxx

@@ -0,0 +1,14 @@
+
+#include "baseParticle.cxx"
+#include "baseParticleEmitter.cxx"
+#include "baseParticleFactory.cxx"
+#include "baseParticleRenderer.cxx"
+#include "boxEmitter.cxx"
+#include "discEmitter.cxx"
+#include "lineEmitter.cxx"
+#include "lineParticleRenderer.cxx"
+#include "orientedParticle.cxx"
+#include "orientedParticleFactory.cxx"
+#include "particleSystem.cxx"
+#include "particleSystemManager.cxx"
+