diff --git a/pandatool/src/lwo/Sources.pp b/pandatool/src/lwo/Sources.pp index 2aecb168bc..0cb0656efa 100644 --- a/pandatool/src/lwo/Sources.pp +++ b/pandatool/src/lwo/Sources.pp @@ -1,50 +1,49 @@ #define LOCAL_LIBS pandatoolbase #define OTHER_LIBS \ mathutil:c linmath:c putil:c express:c panda:m pandaexpress:m dtoolconfig dtool -#define UNIX_SYS_LIBS \ - m +#define UNIX_SYS_LIBS m #begin ss_lib_target #define TARGET lwo + + #define COMBINED_SOURCES $[TARGET]_composite1.cxx #define SOURCES \ - config_lwo.cxx config_lwo.h iffChunk.I iffChunk.cxx iffChunk.h \ - iffGenericChunk.I iffGenericChunk.cxx iffGenericChunk.h iffId.I \ - iffId.cxx iffId.h iffInputFile.I iffInputFile.cxx iffInputFile.h \ - lwoBoundingBox.cxx lwoBoundingBox.h \ - lwoChunk.cxx lwoChunk.h \ - lwoClip.cxx lwoClip.h \ - lwoDiscontinuousVertexMap.cxx lwoDiscontinuousVertexMap.h \ - lwoGroupChunk.cxx lwoGroupChunk.h \ - lwoHeader.I lwoHeader.cxx lwoHeader.h \ - lwoInputFile.I lwoInputFile.cxx lwoInputFile.h \ - lwoLayer.h lwoLayer.cxx \ - lwoPoints.h lwoPoints.cxx \ - lwoPolygons.h lwoPolygons.cxx \ - lwoPolygonTags.h lwoPolygonTags.cxx \ - lwoTags.h lwoTags.cxx \ - lwoStillImage.h lwoStillImage.cxx \ - lwoSurface.h lwoSurface.cxx \ - lwoSurfaceBlock.h lwoSurfaceBlock.cxx \ - lwoSurfaceBlockAxis.h lwoSurfaceBlockAxis.cxx \ - lwoSurfaceBlockChannel.h lwoSurfaceBlockChannel.cxx \ - lwoSurfaceBlockCoordSys.h lwoSurfaceBlockCoordSys.cxx \ - lwoSurfaceBlockEnabled.h lwoSurfaceBlockEnabled.cxx \ - lwoSurfaceBlockImage.h lwoSurfaceBlockImage.cxx \ - lwoSurfaceBlockOpacity.h lwoSurfaceBlockOpacity.cxx \ - lwoSurfaceBlockProjection.h lwoSurfaceBlockProjection.cxx \ - lwoSurfaceBlockHeader.h lwoSurfaceBlockHeader.cxx \ - lwoSurfaceBlockRefObj.h lwoSurfaceBlockRefObj.cxx \ - lwoSurfaceBlockRepeat.h lwoSurfaceBlockRepeat.cxx \ - lwoSurfaceBlockTMap.h lwoSurfaceBlockTMap.cxx \ - lwoSurfaceBlockTransform.h lwoSurfaceBlockTransform.cxx \ - lwoSurfaceBlockVMapName.h lwoSurfaceBlockVMapName.cxx \ - lwoSurfaceBlockWrap.h lwoSurfaceBlockWrap.cxx \ - lwoSurfaceColor.h lwoSurfaceColor.cxx \ - lwoSurfaceParameter.h lwoSurfaceParameter.cxx \ - lwoSurfaceSidedness.h lwoSurfaceSidedness.cxx \ - lwoSurfaceSmoothingAngle.h lwoSurfaceSmoothingAngle.cxx \ - lwoVertexMap.h lwoVertexMap.cxx + config_lwo.h iffChunk.I iffChunk.h iffGenericChunk.I \ + iffGenericChunk.h iffId.I iffId.h iffInputFile.I \ + iffInputFile.h lwoBoundingBox.h lwoChunk.h lwoClip.h \ + lwoDiscontinuousVertexMap.h lwoGroupChunk.h lwoHeader.I \ + lwoHeader.h lwoInputFile.I lwoInputFile.h lwoLayer.h \ + lwoPoints.h lwoPolygons.h lwoPolygonTags.h lwoTags.h \ + lwoStillImage.h lwoSurface.h lwoSurfaceBlock.h \ + lwoSurfaceBlockAxis.h lwoSurfaceBlockChannel.h \ + lwoSurfaceBlockCoordSys.h lwoSurfaceBlockEnabled.h \ + lwoSurfaceBlockImage.h lwoSurfaceBlockOpacity.h \ + lwoSurfaceBlockProjection.h lwoSurfaceBlockHeader.h \ + lwoSurfaceBlockRefObj.h lwoSurfaceBlockRepeat.h \ + lwoSurfaceBlockTMap.h lwoSurfaceBlockTransform.h \ + lwoSurfaceBlockVMapName.h lwoSurfaceBlockWrap.h \ + lwoSurfaceColor.h lwoSurfaceParameter.h \ + lwoSurfaceSidedness.h lwoSurfaceSmoothingAngle.h \ + lwoVertexMap.h + + #define INCLUDED_SOURCES \ + config_lwo.cxx iffChunk.cxx iffGenericChunk.cxx iffId.cxx \ + iffInputFile.cxx lwoBoundingBox.cxx lwoChunk.cxx lwoClip.cxx \ + lwoDiscontinuousVertexMap.cxx lwoGroupChunk.cxx \ + lwoHeader.cxx lwoInputFile.cxx lwoLayer.cxx lwoPoints.cxx \ + lwoPolygons.cxx lwoPolygonTags.cxx lwoTags.cxx \ + lwoStillImage.cxx lwoSurface.cxx lwoSurfaceBlock.cxx \ + lwoSurfaceBlockAxis.cxx lwoSurfaceBlockChannel.cxx \ + lwoSurfaceBlockCoordSys.cxx lwoSurfaceBlockEnabled.cxx \ + lwoSurfaceBlockImage.cxx lwoSurfaceBlockOpacity.cxx \ + lwoSurfaceBlockProjection.cxx lwoSurfaceBlockHeader.cxx \ + lwoSurfaceBlockRefObj.cxx lwoSurfaceBlockRepeat.cxx \ + lwoSurfaceBlockTMap.cxx lwoSurfaceBlockTransform.cxx \ + lwoSurfaceBlockVMapName.cxx lwoSurfaceBlockWrap.cxx \ + lwoSurfaceColor.cxx lwoSurfaceParameter.cxx \ + lwoSurfaceSidedness.cxx lwoSurfaceSmoothingAngle.cxx \ + lwoVertexMap.cxx #define INSTALL_HEADERS \ iffChunk.I iffChunk.h iffGenericChunk.I iffGenericChunk.h iffId.I \ diff --git a/pandatool/src/lwo/lwo_composite1.cxx b/pandatool/src/lwo/lwo_composite1.cxx new file mode 100644 index 0000000000..e3589ed7f4 --- /dev/null +++ b/pandatool/src/lwo/lwo_composite1.cxx @@ -0,0 +1,41 @@ + +#include "config_lwo.cxx" +#include "iffChunk.cxx" +#include "iffGenericChunk.cxx" +#include "iffId.cxx" +#include "iffInputFile.cxx" +#include "lwoBoundingBox.cxx" +#include "lwoChunk.cxx" +#include "lwoClip.cxx" +#include "lwoDiscontinuousVertexMap.cxx" +#include "lwoGroupChunk.cxx" +#include "lwoHeader.cxx" +#include "lwoInputFile.cxx" +#include "lwoLayer.cxx" +#include "lwoPoints.cxx" +#include "lwoPolygons.cxx" +#include "lwoPolygonTags.cxx" +#include "lwoTags.cxx" +#include "lwoStillImage.cxx" +#include "lwoSurface.cxx" +#include "lwoSurfaceBlock.cxx" +#include "lwoSurfaceBlockAxis.cxx" +#include "lwoSurfaceBlockChannel.cxx" +#include "lwoSurfaceBlockCoordSys.cxx" +#include "lwoSurfaceBlockEnabled.cxx" +#include "lwoSurfaceBlockImage.cxx" +#include "lwoSurfaceBlockOpacity.cxx" +#include "lwoSurfaceBlockProjection.cxx" +#include "lwoSurfaceBlockHeader.cxx" +#include "lwoSurfaceBlockRefObj.cxx" +#include "lwoSurfaceBlockRepeat.cxx" +#include "lwoSurfaceBlockTMap.cxx" +#include "lwoSurfaceBlockTransform.cxx" +#include "lwoSurfaceBlockVMapName.cxx" +#include "lwoSurfaceBlockWrap.cxx" +#include "lwoSurfaceColor.cxx" +#include "lwoSurfaceParameter.cxx" +#include "lwoSurfaceSidedness.cxx" +#include "lwoSurfaceSmoothingAngle.cxx" +#include "lwoVertexMap.cxx" + diff --git a/pandatool/src/lwoegg/Sources.pp b/pandatool/src/lwoegg/Sources.pp index 38a4bcf8ef..848b0e59bb 100644 --- a/pandatool/src/lwoegg/Sources.pp +++ b/pandatool/src/lwoegg/Sources.pp @@ -4,18 +4,22 @@ #define OTHER_LIBS \ egg:c pandaegg:m \ 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 \ - cLwoClip.I cLwoClip.cxx cLwoClip.h \ - cLwoLayer.I cLwoLayer.cxx cLwoLayer.h \ - cLwoPoints.I cLwoPoints.cxx cLwoPoints.h \ - cLwoPolygons.I cLwoPolygons.cxx cLwoPolygons.h \ - cLwoSurface.I cLwoSurface.cxx cLwoSurface.h \ - cLwoSurfaceBlock.I cLwoSurfaceBlock.cxx cLwoSurfaceBlock.h \ - cLwoSurfaceBlockTMap.I cLwoSurfaceBlockTMap.cxx cLwoSurfaceBlockTMap.h \ - lwoToEggConverter.I lwoToEggConverter.cxx lwoToEggConverter.h + cLwoClip.I cLwoClip.h cLwoLayer.I cLwoLayer.h cLwoPoints.I \ + cLwoPoints.h cLwoPolygons.I cLwoPolygons.h cLwoSurface.I \ + cLwoSurface.h cLwoSurfaceBlock.I cLwoSurfaceBlock.h \ + cLwoSurfaceBlockTMap.I cLwoSurfaceBlockTMap.h \ + lwoToEggConverter.I lwoToEggConverter.h + + #define INCLUDED_SOURCES \ + cLwoClip.cxx cLwoLayer.cxx cLwoPoints.cxx cLwoPolygons.cxx \ + cLwoSurface.cxx cLwoSurfaceBlock.cxx \ + cLwoSurfaceBlockTMap.cxx lwoToEggConverter.cxx \ + lwoToEggConverter.h #define INSTALL_HEADERS \ lwoToEggConverter.I lwoToEggConverter.h diff --git a/pandatool/src/lwoegg/lwoegg_composite1.cxx b/pandatool/src/lwoegg/lwoegg_composite1.cxx new file mode 100644 index 0000000000..b5106cfd53 --- /dev/null +++ b/pandatool/src/lwoegg/lwoegg_composite1.cxx @@ -0,0 +1,11 @@ + +#include "cLwoClip.cxx" +#include "cLwoLayer.cxx" +#include "cLwoPoints.cxx" +#include "cLwoPolygons.cxx" +#include "cLwoSurface.cxx" +#include "cLwoSurfaceBlock.cxx" +#include "cLwoSurfaceBlockTMap.cxx" +#include "lwoToEggConverter.cxx" +#include "lwoToEggConverter.h" +