diff --git a/pandatool/src/ptloader/Sources.pp b/pandatool/src/ptloader/Sources.pp index e2cfa9e8d6..ad94a79d1a 100644 --- a/pandatool/src/ptloader/Sources.pp +++ b/pandatool/src/ptloader/Sources.pp @@ -5,7 +5,7 @@ #define BUILDING_DLL BUILDING_PTLOADER #define LOCAL_LIBS \ fltegg flt lwoegg lwo dxfegg dxf vrmlegg pvrml xfileegg xfile \ - converter pandatoolbase + converter pandatoolbase $[if $[HAVE_FCOLLADA],daeegg] #define OTHER_LIBS \ egg2pg:c egg:c pandaegg:m \ pstatclient:c mathutil:c linmath:c putil:c \ diff --git a/pandatool/src/ptloader/config_ptloader.cxx b/pandatool/src/ptloader/config_ptloader.cxx index 2819ab4d6d..ac349c76fe 100644 --- a/pandatool/src/ptloader/config_ptloader.cxx +++ b/pandatool/src/ptloader/config_ptloader.cxx @@ -23,6 +23,7 @@ #include "vrmlToEggConverter.h" #include "config_xfile.h" #include "xFileToEggConverter.h" +#include "daeToEggConverter.h" #include "dconfig.h" #include "loaderFileTypeRegistry.h" @@ -79,6 +80,11 @@ init_libptloader() { XFileToEggConverter *xfile = new XFileToEggConverter; reg->register_type(new LoaderFileTypePandatool(xfile)); +#ifdef HAVE_FCOLLADA + DAEToEggConverter *dae = new DAEToEggConverter; + reg->register_type(new LoaderFileTypePandatool(dae)); +#endif + #ifdef HAVE_MAYA // Register the Maya converter as a deferred type. We don't compile // it in directly, because it's big and bulky; we don't need to