TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: Fix more DLL linkage and EXPCL_PANDA_ macros

Browse Source
This commit is contained in:
Sam Edwards 2018-06-10 17:41:51 -06:00
parent eab8b1c7a3
commit 7e61891c09
13 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/gobj/shader.h
View File

@ -436,7 +436,7 @@ public:
ShaderPtrType _type; ShaderPtrType _type;
}; };
class ShaderCaps { class EXPCL_PANDA_GOBJ ShaderCaps {
public: public:
void clear(); void clear();
INLINE bool operator == (const ShaderCaps &other) const; INLINE bool operator == (const ShaderCaps &other) const;

2
panda/src/pgraph/cullBin.h
View File

@ -74,7 +74,7 @@ protected:
GraphicsStateGuardianBase *_gsg; GraphicsStateGuardianBase *_gsg;
// Used in make_result_graph() and fill_result_graph(). // Used in make_result_graph() and fill_result_graph().
class ResultGraphBuilder { class EXPCL_PANDA_PGRAPH ResultGraphBuilder {
public: public:
ResultGraphBuilder(PandaNode *root_node); ResultGraphBuilder(PandaNode *root_node);
void add_object(CullableObject *object); void add_object(CullableObject *object);

2
panda/src/pgraphnodes/lodNode.h
View File

@ -161,7 +161,7 @@ protected:
typedef pvector<Switch> SwitchVector; typedef pvector<Switch> SwitchVector;
private: private:
class EXPCL_PANDA_PGRAPH CData : public CycleData { class EXPCL_PANDA_PGRAPHNODES CData : public CycleData {
public: public:
INLINE CData(); INLINE CData();
INLINE CData(const CData &copy); INLINE CData(const CData &copy);

4
panda/src/pgraphnodes/lodNodeType.h
View File

@ -25,7 +25,7 @@ enum LODNodeType {
END_PUBLISH END_PUBLISH
EXPCL_PANDA_PGRAPH std::ostream &operator << (std::ostream &out, LODNodeType lnt); EXPCL_PANDA_PGRAPHNODES std::ostream &operator << (std::ostream &out, LODNodeType lnt);
EXPCL_PANDA_PGRAPH std::istream &operator >> (std::istream &in, LODNodeType &cs); EXPCL_PANDA_PGRAPHNODES std::istream &operator >> (std::istream &in, LODNodeType &cs);
#endif #endif

2
panda/src/pgraphnodes/uvScrollNode.h
View File

@ -23,7 +23,7 @@
/** /**
* This node is placed at key points within the scene graph to animate uvs. * This node is placed at key points within the scene graph to animate uvs.
*/ */
class EXPCL_PANDA_PGRAPH UvScrollNode : public PandaNode { class EXPCL_PANDA_PGRAPHNODES UvScrollNode : public PandaNode {
PUBLISHED: PUBLISHED:
INLINE explicit UvScrollNode(const std::string &name, PN_stdfloat u_speed, PN_stdfloat v_speed, PN_stdfloat w_speed, PN_stdfloat r_speed); INLINE explicit UvScrollNode(const std::string &name, PN_stdfloat u_speed, PN_stdfloat v_speed, PN_stdfloat w_speed, PN_stdfloat r_speed);
INLINE explicit UvScrollNode(const std::string &name); INLINE explicit UvScrollNode(const std::string &name);

10
panda/src/pnmimage/config_pnmimage.h
View File

@ -21,11 +21,11 @@
NotifyCategoryDecl(pnmimage, EXPCL_PANDA_PNMIMAGE, EXPTP_PANDA_PNMIMAGE); NotifyCategoryDecl(pnmimage, EXPCL_PANDA_PNMIMAGE, EXPTP_PANDA_PNMIMAGE);
extern ConfigVariableBool pfm_force_littleendian; extern EXPCL_PANDA_PNMIMAGE ConfigVariableBool pfm_force_littleendian;
extern ConfigVariableBool pfm_reverse_dimensions; extern EXPCL_PANDA_PNMIMAGE ConfigVariableBool pfm_reverse_dimensions;
extern ConfigVariableBool pfm_resize_gaussian; extern EXPCL_PANDA_PNMIMAGE ConfigVariableBool pfm_resize_gaussian;
extern ConfigVariableBool pfm_resize_quick; extern EXPCL_PANDA_PNMIMAGE ConfigVariableBool pfm_resize_quick;
extern ConfigVariableDouble pfm_resize_radius; extern EXPCL_PANDA_PNMIMAGE ConfigVariableDouble pfm_resize_radius;
extern EXPCL_PANDA_PNMIMAGE void init_libpnmimage(); extern EXPCL_PANDA_PNMIMAGE void init_libpnmimage();

12
panda/src/pnmimage/ppmcmap.h
View File

@ -26,7 +26,7 @@ struct colorhist_list_item
EXPCL_PANDA_PNMIMAGE colorhist_vector ppm_computecolorhist( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP ); EXPCL_PANDA_PNMIMAGE colorhist_vector ppm_computecolorhist( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP );
/* Returns a colorhist *colorsP long (with space allocated for maxcolors. */ /* Returns a colorhist *colorsP long (with space allocated for maxcolors. */
void ppm_addtocolorhist ( colorhist_vector chv, int* colorsP, int maxcolors, pixel* colorP, int value, int position ); EXPCL_PANDA_PNMIMAGE void ppm_addtocolorhist ( colorhist_vector chv, int* colorsP, int maxcolors, pixel* colorP, int value, int position );
EXPCL_PANDA_PNMIMAGE void ppm_freecolorhist( colorhist_vector chv ); EXPCL_PANDA_PNMIMAGE void ppm_freecolorhist( colorhist_vector chv );
@ -35,19 +35,19 @@ EXPCL_PANDA_PNMIMAGE void ppm_freecolorhist( colorhist_vector chv );
typedef colorhist_list* colorhash_table; typedef colorhist_list* colorhash_table;
colorhash_table ppm_computecolorhash ( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP ); EXPCL_PANDA_PNMIMAGE colorhash_table ppm_computecolorhash ( pixel** pixels, int cols, int rows, int maxcolors, int* colorsP );
EXPCL_PANDA_PNMIMAGE int EXPCL_PANDA_PNMIMAGE int
ppm_lookupcolor( colorhash_table cht, pixel* colorP ); ppm_lookupcolor( colorhash_table cht, pixel* colorP );
colorhist_vector ppm_colorhashtocolorhist ( colorhash_table cht, int maxcolors ); EXPCL_PANDA_PNMIMAGE colorhist_vector ppm_colorhashtocolorhist ( colorhash_table cht, int maxcolors );
EXPCL_PANDA_PNMIMAGE colorhash_table ppm_colorhisttocolorhash( colorhist_vector chv, int colors ); EXPCL_PANDA_PNMIMAGE colorhash_table ppm_colorhisttocolorhash( colorhist_vector chv, int colors );
int ppm_addtocolorhash ( colorhash_table cht, pixel* colorP, int value ); EXPCL_PANDA_PNMIMAGE int ppm_addtocolorhash ( colorhash_table cht, pixel* colorP, int value );
/* Returns -1 on failure. */ /* Returns -1 on failure. */
colorhash_table ppm_alloccolorhash ( void ); EXPCL_PANDA_PNMIMAGE colorhash_table ppm_alloccolorhash ( void );
void ppm_freecolorhash( colorhash_table cht ); EXPCL_PANDA_PNMIMAGE void ppm_freecolorhash( colorhash_table cht );
#endif #endif

2
panda/src/pnmimagetypes/pnmFileTypePfm.h
View File

@ -25,7 +25,7 @@
* For reading and writing PFM files using the basic PNMImage interface, as if * For reading and writing PFM files using the basic PNMImage interface, as if
* they were basic RGB files. * they were basic RGB files.
*/ */
class EXPCL_PANDA_PNMIMAGE PNMFileTypePfm : public PNMFileType { class EXPCL_PANDA_PNMIMAGETYPES PNMFileTypePfm : public PNMFileType {
public: public:
PNMFileTypePfm(); PNMFileTypePfm();

2
panda/src/pstatclient/pStatClient.h
View File

@ -169,7 +169,7 @@ private:
// This is where the meat of the Collector data is stored. (All the stuff // This is where the meat of the Collector data is stored. (All the stuff
// in PStatCollector and PStatCollectorDef is just fluff.) // in PStatCollector and PStatCollectorDef is just fluff.)
class Collector { class EXPCL_PANDA_PSTATCLIENT Collector {
public: public:
INLINE Collector(int parent_index, const std::string &name); INLINE Collector(int parent_index, const std::string &name);
INLINE int get_parent_index() const; INLINE int get_parent_index() const;

2
panda/src/pstatclient/pStatTimer.h
View File

@ -27,7 +27,7 @@ class Thread;
* and when the PStatTimer variable goes out of scope (for instance, at the * and when the PStatTimer variable goes out of scope (for instance, at the
* end of the function), it will automatically stop the Collector. * end of the function), it will automatically stop the Collector.
*/ */
class EXPCL_PANDA_PSTATCLIENT PStatTimer { class PStatTimer {
public: public:
#ifdef DO_PSTATS #ifdef DO_PSTATS
INLINE PStatTimer(PStatCollector &collector); INLINE PStatTimer(PStatCollector &collector);

7
panda/src/putil/bamReader.cxx
View File

@ -1544,10 +1544,3 @@ finalize() {
} }
} }
} }
/**
*
*/
BamReader::AuxData::
~AuxData() {
}

2
panda/src/putil/bamReader.h
View File

@ -228,7 +228,7 @@ public:
class AuxData : public ReferenceCount { class AuxData : public ReferenceCount {
public: public:
INLINE AuxData(); INLINE AuxData();
virtual ~AuxData(); virtual ~AuxData() = default;
}; };
private: private:

4
panda/src/text/config_text.h
View File

@ -40,8 +40,8 @@ extern ConfigVariableBool text_small_caps;
extern EXPCL_PANDA_TEXT ConfigVariableDouble text_small_caps_scale; extern EXPCL_PANDA_TEXT ConfigVariableDouble text_small_caps_scale;
extern ConfigVariableFilename text_default_font; extern ConfigVariableFilename text_default_font;
extern EXPCL_PANDA_TEXT ConfigVariableDouble text_tab_width; extern EXPCL_PANDA_TEXT ConfigVariableDouble text_tab_width;
extern ConfigVariableInt text_push_properties_key; extern EXPCL_PANDA_TEXT ConfigVariableInt text_push_properties_key;
extern ConfigVariableInt text_pop_properties_key; extern EXPCL_PANDA_TEXT ConfigVariableInt text_pop_properties_key;
extern ConfigVariableInt text_soft_hyphen_key; extern ConfigVariableInt text_soft_hyphen_key;
extern ConfigVariableInt text_soft_break_key; extern ConfigVariableInt text_soft_break_key;
extern ConfigVariableInt text_embed_graphic_key; extern ConfigVariableInt text_embed_graphic_key;