use combined srcs

pandatool/src/flt/Sources.pp

@@ -3,37 +3,42 @@
   #define LOCAL_LIBS converter pandatoolbase
   #define OTHER_LIBS \
     mathutil:c linmath:c putil:c express:c panda:m dtoolconfig dtool
-  #define UNIX_SYS_LIBS \
-    m
+  #define UNIX_SYS_LIBS m
+  
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx   
 
   #define SOURCES \
-    config_flt.cxx config_flt.h fltBead.cxx fltBead.h fltBeadID.cxx \
-    fltBeadID.h fltCurve.I fltCurve.cxx fltCurve.h \
-    fltError.cxx fltError.h fltExternalReference.cxx \
-    fltExternalReference.h fltEyepoint.cxx fltEyepoint.h fltFace.I \
-    fltFace.cxx fltFace.h fltGeometry.I fltGeometry.cxx fltGeometry.h \
-    fltGroup.cxx fltGroup.h fltHeader.cxx \
-    fltHeader.h fltInstanceDefinition.cxx fltInstanceDefinition.h \
-    fltInstanceRef.cxx fltInstanceRef.h fltLOD.cxx fltLOD.h \
-    fltLightSourceDefinition.cxx fltLightSourceDefinition.h \
-    fltLocalVertexPool.I fltLocalVertexPool.cxx fltLocalVertexPool.h \
-    fltMaterial.cxx fltMaterial.h fltMesh.I fltMesh.cxx fltMesh.h \
-    fltMeshPrimitive.I fltMeshPrimitive.cxx fltMeshPrimitive.h \
-    fltObject.cxx fltObject.h \
-    fltOpcode.cxx fltOpcode.h fltPackedColor.I fltPackedColor.cxx \
-    fltPackedColor.h fltRecord.I fltRecord.cxx fltRecord.h \
-    fltRecordReader.cxx fltRecordReader.h fltRecordWriter.cxx \
-    fltRecordWriter.h fltTexture.cxx fltTexture.h fltTrackplane.cxx \
-    fltTrackplane.h fltTransformGeneralMatrix.cxx \
-    fltTransformGeneralMatrix.h fltTransformPut.cxx fltTransformPut.h \
-    fltTransformRecord.cxx fltTransformRecord.h \
-    fltTransformRotateAboutEdge.cxx fltTransformRotateAboutEdge.h \
-    fltTransformRotateAboutPoint.cxx fltTransformRotateAboutPoint.h \
-    fltTransformRotateScale.cxx fltTransformRotateScale.h \
-    fltTransformScale.cxx fltTransformScale.h fltTransformTranslate.cxx \
-    fltTransformTranslate.h fltUnsupportedRecord.cxx \
-    fltUnsupportedRecord.h fltVertex.I fltVertex.cxx fltVertex.h \
-    fltVertexList.cxx fltVertexList.h
+     config_flt.h fltBead.h fltBeadID.h fltCurve.I fltCurve.h  \
+     fltError.h fltExternalReference.h fltEyepoint.h fltFace.I  \
+     fltFace.h fltGeometry.I fltGeometry.h fltGroup.h fltHeader.h  \
+     fltInstanceDefinition.h fltInstanceRef.h fltLOD.h  \
+     fltLightSourceDefinition.h fltLocalVertexPool.I  \
+     fltLocalVertexPool.h fltMaterial.h fltMesh.I fltMesh.h  \
+     fltMeshPrimitive.I fltMeshPrimitive.h fltObject.h  \
+     fltOpcode.h fltPackedColor.I fltPackedColor.h fltRecord.I  \
+     fltRecord.h fltRecordReader.h fltRecordWriter.h fltTexture.h  \
+     fltTrackplane.h fltTransformGeneralMatrix.h  \
+     fltTransformPut.h fltTransformRecord.h  \
+     fltTransformRotateAboutEdge.h fltTransformRotateAboutPoint.h  \
+     fltTransformRotateScale.h fltTransformScale.h  \
+     fltTransformTranslate.h fltUnsupportedRecord.h fltVertex.I  \
+     fltVertex.h fltVertexList.h 
+    
+ #define INCLUDED_SOURCES \
+     config_flt.cxx fltBead.cxx fltBeadID.cxx fltCurve.cxx  \
+     fltError.cxx fltExternalReference.cxx fltEyepoint.cxx  \
+     fltFace.cxx fltGeometry.cxx fltGroup.cxx fltHeader.cxx  \
+     fltInstanceDefinition.cxx fltInstanceRef.cxx fltLOD.cxx  \
+     fltLightSourceDefinition.cxx fltLocalVertexPool.cxx  \
+     fltMaterial.cxx fltMesh.cxx fltMeshPrimitive.cxx  \
+     fltObject.cxx fltOpcode.cxx fltPackedColor.cxx fltRecord.cxx  \
+     fltRecordReader.cxx fltRecordWriter.cxx fltTexture.cxx  \
+     fltTrackplane.cxx fltTransformGeneralMatrix.cxx  \
+     fltTransformPut.cxx fltTransformRecord.cxx  \
+     fltTransformRotateAboutEdge.cxx  \
+     fltTransformRotateAboutPoint.cxx fltTransformRotateScale.cxx  \
+     fltTransformScale.cxx fltTransformTranslate.cxx  \
+     fltUnsupportedRecord.cxx fltVertex.cxx fltVertexList.cxx 
 
   #define INSTALL_HEADERS \
     fltBead.h fltBeadID.h fltCurve.I fltCurve.h \

pandatool/src/flt/config_flt.h

@@ -29,4 +29,6 @@ extern const bool flt_error_abort;
 
 extern void init_libflt();
 
+static const int header_size = 4;
+
 #endif

pandatool/src/flt/fltRecordReader.cxx

@@ -23,8 +23,6 @@
 
 #include <assert.h>
 
-static const int header_size = 4;
-
 ////////////////////////////////////////////////////////////////////
 //     Function: FltRecordReader::Constructor
 //       Access: Public

pandatool/src/flt/fltRecordWriter.cxx

@@ -25,8 +25,6 @@
 
 #include <assert.h>
 
-static const int header_size = 4;
-
 // Don't attempt to write more than this number of bytes in one
 // record.  If the record requires more than this, use continuation
 // records.

pandatool/src/flt/flt_composite1.cxx

@@ -0,0 +1,40 @@
+
+#include "config_flt.cxx"
+#include "fltBead.cxx"
+#include "fltBeadID.cxx"
+#include "fltCurve.cxx"
+#include "fltError.cxx"
+#include "fltExternalReference.cxx"
+#include "fltEyepoint.cxx"
+#include "fltFace.cxx"
+#include "fltGeometry.cxx"
+#include "fltGroup.cxx"
+#include "fltHeader.cxx"
+#include "fltInstanceDefinition.cxx"
+#include "fltInstanceRef.cxx"
+#include "fltLOD.cxx"
+#include "fltLightSourceDefinition.cxx"
+#include "fltLocalVertexPool.cxx"
+#include "fltMaterial.cxx"
+#include "fltMesh.cxx"
+#include "fltMeshPrimitive.cxx"
+#include "fltObject.cxx"
+#include "fltOpcode.cxx"
+#include "fltPackedColor.cxx"
+#include "fltRecord.cxx"
+#include "fltRecordReader.cxx"
+#include "fltRecordWriter.cxx"
+#include "fltTexture.cxx"
+#include "fltTrackplane.cxx"
+#include "fltTransformGeneralMatrix.cxx"
+#include "fltTransformPut.cxx"
+#include "fltTransformRecord.cxx"
+#include "fltTransformRotateAboutEdge.cxx"
+#include "fltTransformRotateAboutPoint.cxx"
+#include "fltTransformRotateScale.cxx"
+#include "fltTransformScale.cxx"
+#include "fltTransformTranslate.cxx"
+#include "fltUnsupportedRecord.cxx"
+#include "fltVertex.cxx"
+#include "fltVertexList.cxx"
+