diff --git a/dtool/src/dtoolbase/dtoolbase.h b/dtool/src/dtoolbase/dtoolbase.h index 50efeab52d..4c8b9b28cb 100644 --- a/dtool/src/dtoolbase/dtoolbase.h +++ b/dtool/src/dtoolbase/dtoolbase.h @@ -436,7 +436,7 @@ #define IMPORT_CLASS #endif /* "extern template" is now part of the C++11 standard. */ -#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) +#if defined(WIN32_VC) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) #define EXPORT_TEMPL #define IMPORT_TEMPL extern #else diff --git a/dtool/src/dtoolbase/dtoolbase_cc.h b/dtool/src/dtoolbase/dtoolbase_cc.h index efefd36e9e..cb6f1db130 100644 --- a/dtool/src/dtoolbase/dtoolbase_cc.h +++ b/dtool/src/dtoolbase/dtoolbase_cc.h @@ -174,7 +174,7 @@ typedef ios::seekdir ios_seekdir; # define MOVE(x) x #endif -#if !defined(LINK_ALL_STATIC) && defined(EXPORT_TEMPLATES) +#if defined(WIN32_VC) && !defined(LINK_ALL_STATIC) && defined(EXPORT_TEMPLATES) // This macro must be used to export an instantiated template class // from a DLL. If the template class name itself contains commas, it // may be necessary to first define a macro for the class name, to diff --git a/panda/src/display/displayRegion.h b/panda/src/display/displayRegion.h index 3741dd395d..811b913e5c 100644 --- a/panda/src/display/displayRegion.h +++ b/panda/src/display/displayRegion.h @@ -360,8 +360,6 @@ private: static TypeHandle _type_handle; }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_DISPLAY, EXPTP_PANDA_DISPLAY, epvector); - #include "displayRegion.I" #endif /* DISPLAYREGION_H */ diff --git a/panda/src/egg/eggMorphList.h b/panda/src/egg/eggMorphList.h index 6461a9278f..fb6013190e 100644 --- a/panda/src/egg/eggMorphList.h +++ b/panda/src/egg/eggMorphList.h @@ -65,9 +65,6 @@ private: Morphs _morphs; }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList >); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorphList >); - typedef EggMorphList EggMorphVertexList; typedef EggMorphList EggMorphNormalList; typedef EggMorphList EggMorphTexCoordList; diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h index debc5039ca..45bcab70f9 100644 --- a/panda/src/gobj/shader.h +++ b/panda/src/gobj/shader.h @@ -607,8 +607,6 @@ private: static TypeHandle _type_handle; }; -EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ, epvector); - #include "shader.I" #endif