Fix for Windows

2010-11-14 13:01:22 +00:00 · 2010-11-14 13:01:22 +00:00 · 688fdbbf1a
parent 11d98d2903
commit 688fdbbf1a
1 changed files with 6 additions and 1 deletions
--- 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"