Package: cal3d
Version: svn
Author: Guillem Jover <guillem@hadrons.org>
Status: sent
Decription: Build fixes


Index: src/cal3d/xmlformat.cpp
===================================================================
--- src/cal3d/xmlformat.cpp	(revision 536)
+++ src/cal3d/xmlformat.cpp	(working copy)
@@ -20,15 +20,8 @@
 #include "cal3d/streamsource.h"
 #include "cal3d/buffersource.h"
 #include "cal3d/xmlformat.h"
-
-
-#ifdef WIN32
 #include "cal3d/calxmlbindings.h"
-#else
-#include "cal3d/calxmlbindings.cpp"
-#endif
 
-
 static inline void ReadPair( char const * buffer, float * f1, float * f2 )
 {
 #if CAL3D_USE_STL_INSTEAD_OF_SSCANF
Index: src/cal3d/loader.cpp
===================================================================
--- src/cal3d/loader.cpp	(revision 536)
+++ src/cal3d/loader.cpp	(working copy)
@@ -39,11 +39,7 @@
 #include <memory>
 using namespace cal3d;
 
-#ifdef WIN32
 #include "cal3d/calxmlbindings.h"
-#else
-#include "cal3d/calxmlbindings.cpp"
-#endif
 
 int CalLoader::loadingMode;
 double CalLoader::translationTolerance = 0.25;
Index: src/cal3d/Makefile.am
===================================================================
--- src/cal3d/Makefile.am	(revision 536)
+++ src/cal3d/Makefile.am	(working copy)
@@ -56,12 +56,15 @@
 	bone.cpp \
 	buffersource.cpp \
 	cal3d_wrapper.cpp \
+	coreanimatedmorph.cpp \
 	coreanimation.cpp \
 	corebone.cpp \
 	corekeyframe.cpp \
 	corematerial.cpp \
 	coremesh.cpp \
 	coremodel.cpp \
+	coremorphkeyframe.cpp \
+	coremorphtrack.cpp \
 	coreskeleton.cpp \
 	coresubmesh.cpp \
 	coresubmorphtarget.cpp \
@@ -90,7 +93,7 @@
 	tinyxml.cpp \
 	tinyxmlerror.cpp \
 	tinyxmlparser.cpp \
-	coremorphanimation.cpp 
+	xmlformat.cpp
 
 libcal3d_la_LDFLAGS = -no-undefined -version-info $(VERSION_INFO) 
 
@@ -103,12 +106,15 @@
 	buffersource.h \
 	cal3d.h \
 	cal3d_wrapper.h \
+	coreanimatedmorph.h \
 	coreanimation.h \
 	corebone.h \
 	corekeyframe.h \
 	corematerial.h \
 	coremesh.h \
 	coremodel.h \
+	coremorphkeyframe.h \
+	coremorphtrack.h \
 	coreskeleton.h \
 	coresubmesh.h \
 	coresubmorphtarget.h \
@@ -140,7 +146,7 @@
 	vector.h \
 	tinyxml.h \
 	transform.h \
-	coremorphanimation.h
+	xmlformat.h
 
 # *************************************************************************