From 688fdbbf1a06f7ab6efc3eef963845081754ccce Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 14 Nov 2010 13:01:22 +0000 Subject: [PATCH] Fix for Windows --- pandatool/src/ptloader/config_ptloader.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandatool/src/ptloader/config_ptloader.cxx b/pandatool/src/ptloader/config_ptloader.cxx index 0c168f7371..9f8bbf2336 100644 --- a/pandatool/src/ptloader/config_ptloader.cxx +++ b/pandatool/src/ptloader/config_ptloader.cxx @@ -15,7 +15,7 @@ #include "config_ptloader.h" // This needs to be included first to work around a bug in OSX 10.4. -#ifdef HAVE_FCOLLADA +#if defined(HAVE_FCOLLADA) && defined(IS_OSX) #include "daeToEggConverter.h" #endif @@ -30,6 +30,11 @@ #include "config_xfile.h" #include "xFileToEggConverter.h" +// Windows freaks out if this input is placed earlier. +#if defined(HAVE_FCOLLADA) && !defined(IS_OSX) +#include "daeToEggConverter.h" +#endif + #include "dconfig.h" #include "loaderFileTypeRegistry.h" #include "eggData.h"