From 0598fc84c375757aadbfb4d1c3c7a24115115b40 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 30 Mar 2009 11:45:29 +0000 Subject: [PATCH] Disable fcollada in ptloader on windows until we resolved static-init issues --- pandatool/src/ptloader/config_ptloader.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandatool/src/ptloader/config_ptloader.cxx b/pandatool/src/ptloader/config_ptloader.cxx index 5b73594852..b26e211547 100644 --- a/pandatool/src/ptloader/config_ptloader.cxx +++ b/pandatool/src/ptloader/config_ptloader.cxx @@ -25,8 +25,10 @@ #include "xFileToEggConverter.h" #ifdef HAVE_FCOLLADA +#ifndef WIN32 #include "daeToEggConverter.h" #endif +#endif #include "dconfig.h" #include "loaderFileTypeRegistry.h" @@ -84,9 +86,11 @@ init_libptloader() { reg->register_type(new LoaderFileTypePandatool(xfile)); #ifdef HAVE_FCOLLADA +#ifndef WIN32 DAEToEggConverter *dae = new DAEToEggConverter; reg->register_type(new LoaderFileTypePandatool(dae)); #endif +#endif #ifdef HAVE_MAYA // Register the Maya converter as a deferred type. We don't compile