From 00d4463adac3b59aab732a3c85c69a855671e12c Mon Sep 17 00:00:00 2001 From: Cary Sandvig Date: Thu, 11 Jan 2001 01:47:34 +0000 Subject: [PATCH] *** empty log message *** --- direct/metalibs/direct/Sources.pp | 2 +- direct/src/dcparse/Sources.pp | 3 +- direct/src/showbase/Sources.pp | 2 +- dtool/metalibs/dtool/Sources.pp | 3 +- dtool/metalibs/dtoolconfig/Sources.pp | 18 ++ dtool/metalibs/dtoolconfig/dtoolconfig.cxx | 11 + .../{dtool => dtoolconfig}/pydtool.cxx | 0 dtool/src/dconfig/configTable.h | 2 +- dtool/src/dconfig/config_dconfig.h | 4 +- dtool/src/dconfig/config_notify.h | 2 +- dtool/src/dconfig/dconfig.h | 12 +- dtool/src/dconfig/notify.h | 2 +- dtool/src/dconfig/notifyCategory.h | 2 +- dtool/src/dconfig/notifySeverity.h | 2 +- dtool/src/dconfig/symbolEnt.h | 4 +- dtool/src/dtoolbase/dtoolsymbols.h | 11 + dtool/src/dtoolutil/Sources.pp | 3 +- .../src/interrogatedb/config_interrogatedb.h | 2 +- dtool/src/interrogatedb/indexRemapper.h | 5 +- .../src/interrogatedb/interrogateComponent.h | 2 +- dtool/src/interrogatedb/interrogateDatabase.h | 2 +- dtool/src/interrogatedb/interrogateElement.h | 2 +- dtool/src/interrogatedb/interrogateFunction.h | 2 +- .../interrogateFunctionWrapper.h | 2 +- dtool/src/interrogatedb/interrogateManifest.h | 2 +- dtool/src/interrogatedb/interrogateType.h | 2 +- .../src/interrogatedb/interrogate_interface.h | 224 +++++++++--------- dtool/src/interrogatedb/interrogate_request.h | 4 +- dtool/src/interrogatedb/vector_int.h | 4 +- dtool/src/pystub/Sources.pp | 2 +- dtool/src/pystub/pystub.cxx | 12 +- dtool/src/pystub/pystub.h | 2 +- panda/metalibs/panda/Sources.pp | 2 +- panda/metalibs/pandadx/Sources.pp | 2 +- panda/metalibs/pandaegg/Sources.pp | 2 +- panda/metalibs/pandaexpress/Sources.pp | 2 +- panda/metalibs/pandagl/Sources.pp | 2 +- panda/metalibs/pandaphysics/Sources.pp | 2 +- panda/metalibs/pandarib/Sources.pp | 2 +- panda/src/audio/Sources.pp | 2 +- panda/src/audiotraits/Sources.pp | 2 +- panda/src/builder/Sources.pp | 3 +- panda/src/chan/Sources.pp | 3 +- panda/src/chancfg/Sources.pp | 3 +- panda/src/char/Sources.pp | 3 +- panda/src/chat/Sources.pp | 4 +- panda/src/collide/Sources.pp | 3 +- panda/src/cull/Sources.pp | 3 +- panda/src/device/Sources.pp | 3 +- panda/src/dgraph/Sources.pp | 3 +- panda/src/display/Sources.pp | 3 +- panda/src/doc/Sources.pp | 3 +- panda/src/downloader/Sources.pp | 3 +- panda/src/downloadertools/Sources.pp | 3 +- panda/src/dxgsg/Sources.pp | 3 +- panda/src/effects/Sources.pp | 3 +- panda/src/egg/Sources.pp | 3 +- panda/src/egg2sg/Sources.pp | 3 +- panda/src/event/Sources.pp | 3 +- panda/src/express/Sources.pp | 3 +- panda/src/framework/Sources.pp | 3 +- panda/src/glgsg/Sources.pp | 3 +- panda/src/glutdisplay/Sources.pp | 3 +- panda/src/glxdisplay/Sources.pp | 3 +- panda/src/gobj/Sources.pp | 3 +- panda/src/graph/Sources.pp | 3 +- panda/src/grutil/Sources.pp | 3 +- panda/src/gsgbase/Sources.pp | 3 +- panda/src/gsgmisc/Sources.pp | 3 +- panda/src/gui/Sources.pp | 3 +- panda/src/ipc/Sources.pp | 3 +- panda/src/lerp/Sources.pp | 3 +- panda/src/light/Sources.pp | 3 +- panda/src/linmath/Sources.pp | 3 +- panda/src/loader/Sources.pp | 3 +- panda/src/mathutil/Sources.pp | 3 +- panda/src/net/Sources.pp | 3 +- panda/src/pandabase/Sources.pp | 3 +- panda/src/parametrics/Sources.pp | 3 +- panda/src/particlesystem/Sources.pp | 3 +- panda/src/physics/Sources.pp | 3 +- panda/src/pnm/Sources.pp | 3 +- panda/src/pnmimage/Sources.pp | 3 +- panda/src/pnmimagetypes/Sources.pp | 3 +- panda/src/ps2display/Sources.pp | 3 +- panda/src/ps2gsg/Sources.pp | 3 +- panda/src/pstatclient/Sources.pp | 3 +- panda/src/putil/Sources.pp | 3 +- panda/src/ribdisplay/Sources.pp | 3 +- panda/src/ribgsg/Sources.pp | 3 +- panda/src/sgidisplay/Sources.pp | 3 +- panda/src/sgiglutdisplay/Sources.pp | 3 +- panda/src/sgiglxdisplay/Sources.pp | 3 +- panda/src/sgmanip/Sources.pp | 3 +- panda/src/sgraph/Sources.pp | 3 +- panda/src/sgraphutil/Sources.pp | 3 +- panda/src/shader/Sources.pp | 2 +- panda/src/switchnode/Sources.pp | 3 +- panda/src/testbed/Sources.pp | 3 +- panda/src/text/Sources.pp | 3 +- panda/src/tform/Sources.pp | 3 +- panda/src/tiff/Sources.pp | 2 +- panda/src/vrpn/Sources.pp | 3 +- panda/src/wdxdisplay/Sources.pp | 3 +- panda/src/wgldisplay/Sources.pp | 3 +- 105 files changed, 330 insertions(+), 231 deletions(-) create mode 100644 dtool/metalibs/dtoolconfig/Sources.pp create mode 100644 dtool/metalibs/dtoolconfig/dtoolconfig.cxx rename dtool/metalibs/{dtool => dtoolconfig}/pydtool.cxx (100%) diff --git a/direct/metalibs/direct/Sources.pp b/direct/metalibs/direct/Sources.pp index fcc43fac4a..aa005eec57 100644 --- a/direct/metalibs/direct/Sources.pp +++ b/direct/metalibs/direct/Sources.pp @@ -10,7 +10,7 @@ #define COMPONENT_LIBS \ directbase dcparse showbase deadrec -#define OTHER_LIBS panda pandaexpress dtool +#define OTHER_LIBS panda pandaexpress dtoolconfig dtool #begin metalib_target #define TARGET direct diff --git a/direct/src/dcparse/Sources.pp b/direct/src/dcparse/Sources.pp index e340f6fa90..bb0848bf82 100644 --- a/direct/src/dcparse/Sources.pp +++ b/direct/src/dcparse/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define YACC_PREFIX dcyy #begin lib_target diff --git a/direct/src/showbase/Sources.pp b/direct/src/showbase/Sources.pp index 94af35259a..d4afe58c9d 100644 --- a/direct/src/showbase/Sources.pp +++ b/direct/src/showbase/Sources.pp @@ -3,7 +3,7 @@ #define LOCAL_LIBS \ directbase #define OTHER_LIBS \ - linmath:c putil:c express:c panda:m pandaexpress:m dtool + linmath:c putil:c express:c panda:m pandaexpress:m dtoolconfig dtool #define SOURCES \ showBase.cxx showBase.h diff --git a/dtool/metalibs/dtool/Sources.pp b/dtool/metalibs/dtool/Sources.pp index 6af6b3a6fe..a34ca1680f 100644 --- a/dtool/metalibs/dtool/Sources.pp +++ b/dtool/metalibs/dtool/Sources.pp @@ -7,11 +7,10 @@ #define DIR_TYPE metalib #define BUILDING_DLL BUILDING_DTOOL -#define COMPONENT_LIBS interrogatedb dconfig dtoolutil dtoolbase +#define COMPONENT_LIBS dtoolutil dtoolbase #begin metalib_target #define TARGET dtool #define SOURCES dtool.cxx - #define IF_PYTHON_SOURCES pydtool.cxx #end metalib_target diff --git a/dtool/metalibs/dtoolconfig/Sources.pp b/dtool/metalibs/dtoolconfig/Sources.pp new file mode 100644 index 0000000000..5b3dbdc202 --- /dev/null +++ b/dtool/metalibs/dtoolconfig/Sources.pp @@ -0,0 +1,18 @@ +// DIR_TYPE "metalib" indicates we are building a shared library that +// consists mostly of references to other shared libraries. Under +// Windows, this directly produces a DLL (as opposed to the regular +// src libraries, which don't produce anything but a pile of OBJ files +// under Windows). + +#define DIR_TYPE metalib +#define BUILDING_DLL BUILDING_DTOOLCONFIG + +#define COMPONENT_LIBS interrogatedb dconfig +#define OTHER_LIBS dtool:m + +#begin metalib_target + #define TARGET dtoolconfig + + #define SOURCES dtoolconfig.cxx + #define IF_PYTHON_SOURCES pydtool.cxx +#end metalib_target diff --git a/dtool/metalibs/dtoolconfig/dtoolconfig.cxx b/dtool/metalibs/dtoolconfig/dtoolconfig.cxx new file mode 100644 index 0000000000..cf71893a69 --- /dev/null +++ b/dtool/metalibs/dtoolconfig/dtoolconfig.cxx @@ -0,0 +1,11 @@ +// Filename: dtoolconfig.cxx +// Created by: frang (09Jan01) +// +//////////////////////////////////////////////////////////////////// + +// This is a dummy file whose sole purpose is to give the compiler +// something to compile when making libdtoolconfig.so in NO_DEFER mode, +// which generates an empty library that itself links with all the +// other shared libraries that make up libdtoolconfig. + + diff --git a/dtool/metalibs/dtool/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx similarity index 100% rename from dtool/metalibs/dtool/pydtool.cxx rename to dtool/metalibs/dtoolconfig/pydtool.cxx diff --git a/dtool/src/dconfig/configTable.h b/dtool/src/dconfig/configTable.h index 155e3c2f22..8c6a988596 100644 --- a/dtool/src/dconfig/configTable.h +++ b/dtool/src/dconfig/configTable.h @@ -17,7 +17,7 @@ namespace Config { -class EXPCL_DTOOL ConfigTable { +class EXPCL_DTOOLCONFIG ConfigTable { private: static ConfigTable* _instance; public: diff --git a/dtool/src/dconfig/config_dconfig.h b/dtool/src/dconfig/config_dconfig.h index 45dbb04121..c331ee2285 100644 --- a/dtool/src/dconfig/config_dconfig.h +++ b/dtool/src/dconfig/config_dconfig.h @@ -16,7 +16,7 @@ #include "notifyCategoryProxy.h" -NotifyCategoryDecl(dconfig, EXPCL_DTOOL, EXPTP_DTOOL); -NotifyCategoryDecl(microconfig, EXPCL_DTOOL, EXPTP_DTOOL); +NotifyCategoryDecl(dconfig, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG); +NotifyCategoryDecl(microconfig, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG); #endif diff --git a/dtool/src/dconfig/config_notify.h b/dtool/src/dconfig/config_notify.h index 00e7f9e3ae..d325c7834a 100644 --- a/dtool/src/dconfig/config_notify.h +++ b/dtool/src/dconfig/config_notify.h @@ -9,7 +9,7 @@ #include #include "dconfig.h" -ConfigureDecl(config_notify, EXPCL_DTOOL, EXPTP_DTOOL); +ConfigureDecl(config_notify, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG); bool get_assert_abort(); diff --git a/dtool/src/dconfig/dconfig.h b/dtool/src/dconfig/dconfig.h index a7ca74d6ea..abe264ee3f 100644 --- a/dtool/src/dconfig/dconfig.h +++ b/dtool/src/dconfig/dconfig.h @@ -38,15 +38,15 @@ namespace Config { // Call these functions to get stats on how Config is spending its // time. -EXPCL_DTOOL INLINE double get_total_time_config_init(); -EXPCL_DTOOL INLINE double get_total_time_external_init(); -EXPCL_DTOOL INLINE double get_total_num_get(); +EXPCL_DTOOLCONFIG INLINE double get_total_time_config_init(); +EXPCL_DTOOLCONFIG INLINE double get_total_time_external_init(); +EXPCL_DTOOLCONFIG INLINE double get_total_num_get(); // These globals are intended for internal bookkeeping by Config to // compute the above functions' return values. -EXPCL_DTOOL extern clock_t total_time_config_init; -EXPCL_DTOOL extern clock_t total_time_external_init; -EXPCL_DTOOL extern int total_num_get; +EXPCL_DTOOLCONFIG extern clock_t total_time_config_init; +EXPCL_DTOOLCONFIG extern clock_t total_time_external_init; +EXPCL_DTOOLCONFIG extern int total_num_get; template class Config { diff --git a/dtool/src/dconfig/notify.h b/dtool/src/dconfig/notify.h index bb5f4cb6f3..9142f92047 100644 --- a/dtool/src/dconfig/notify.h +++ b/dtool/src/dconfig/notify.h @@ -29,7 +29,7 @@ // disabled, so that error messages may be squelched or // respected according to the wishes of the user. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL Notify { +class EXPCL_DTOOLCONFIG Notify { PUBLISHED: Notify(); ~Notify(); diff --git a/dtool/src/dconfig/notifyCategory.h b/dtool/src/dconfig/notifyCategory.h index 72bd1faa3b..b341e11084 100644 --- a/dtool/src/dconfig/notifyCategory.h +++ b/dtool/src/dconfig/notifyCategory.h @@ -22,7 +22,7 @@ // created within a package if a finer grain of control // is required. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL NotifyCategory { +class EXPCL_DTOOLCONFIG NotifyCategory { private: NotifyCategory(const string &fullname, const string &basename, NotifyCategory *parent); diff --git a/dtool/src/dconfig/notifySeverity.h b/dtool/src/dconfig/notifySeverity.h index 00f08f6a08..01e6035fdb 100644 --- a/dtool/src/dconfig/notifySeverity.h +++ b/dtool/src/dconfig/notifySeverity.h @@ -20,6 +20,6 @@ enum NotifySeverity { }; END_PUBLISH -EXPCL_DTOOL ostream &operator << (ostream &out, NotifySeverity severity); +EXPCL_DTOOLCONFIG ostream &operator << (ostream &out, NotifySeverity severity); #endif diff --git a/dtool/src/dconfig/symbolEnt.h b/dtool/src/dconfig/symbolEnt.h index 24bf9520a7..d971ab3008 100644 --- a/dtool/src/dconfig/symbolEnt.h +++ b/dtool/src/dconfig/symbolEnt.h @@ -14,7 +14,7 @@ namespace Config { -class EXPCL_DTOOL SymbolEnt { +class EXPCL_DTOOLCONFIG SymbolEnt { public: enum SymbolEntSrc { ConfigFile, Environment, CommandEnv, Commandline, Other, Invalid }; @@ -44,7 +44,7 @@ class EXPCL_DTOOL SymbolEnt { INLINE bool State(void) const; }; -EXPORT_TEMPLATE_CLASS(EXPCL_DTOOL, EXPTP_DTOOL, std::vector); +EXPORT_TEMPLATE_CLASS(EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG, std::vector); typedef std::vector vector_SymbolEnt; #include "symbolEnt.I" diff --git a/dtool/src/dtoolbase/dtoolsymbols.h b/dtool/src/dtoolbase/dtoolsymbols.h index 0075bda6b1..857267be88 100644 --- a/dtool/src/dtoolbase/dtoolsymbols.h +++ b/dtool/src/dtoolbase/dtoolsymbols.h @@ -46,6 +46,14 @@ #define EXPTP_DTOOL extern #endif +#ifdef BUILDING_DTOOLCONFIG + #define EXPCL_DTOOLCONFIG __declspec(dllexport) + #define EXPTP_DTOOLCONFIG +#else + #define EXPCL_DTOOLCONFIG __declspec(dllimport) + #define EXPTP_DTOOLCONFIG extern +#endif + #ifdef BUILDING_MISC #define EXPCL_MISC __declspec(dllexport) #define EXPTP_MISC @@ -59,6 +67,9 @@ #define EXPCL_DTOOL #define EXPTP_DTOOL +#define EXPCL_DTOOLCONFIG +#define EXPTP_DTOOLCONFIG + #define EXPCL_MISC #define EXPTP_MISC diff --git a/dtool/src/dtoolutil/Sources.pp b/dtool/src/dtoolutil/Sources.pp index 7be0aa6933..c108cbe37f 100644 --- a/dtool/src/dtoolutil/Sources.pp +++ b/dtool/src/dtoolutil/Sources.pp @@ -8,7 +8,8 @@ executionEnvironment.h filename.I filename.cxx filename.h \ load_dso.cxx load_dso.h dSearchPath.I dSearchPath.cxx \ dSearchPath.h pfstream.h vector_string.cxx vector_string.h \ - gnu_getopt.c gnu_getopt.h gnu_getopt1.c pfstreamBuf.h pfstreamBuf.cxx + gnu_getopt.c gnu_getopt.h gnu_getopt1.c pfstreamBuf.h pfstreamBuf.cxx \ + pfstream.cxx #define INSTALL_HEADERS \ executionEnvironment.I executionEnvironment.h filename.I \ diff --git a/dtool/src/interrogatedb/config_interrogatedb.h b/dtool/src/interrogatedb/config_interrogatedb.h index ff16ce258c..f13d9f400c 100644 --- a/dtool/src/interrogatedb/config_interrogatedb.h +++ b/dtool/src/interrogatedb/config_interrogatedb.h @@ -10,7 +10,7 @@ #include #include -NotifyCategoryDecl(interrogatedb, EXPCL_DTOOL, EXPTP_DTOOL); +NotifyCategoryDecl(interrogatedb, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG); const DSearchPath &get_interrogatedb_path(); diff --git a/dtool/src/interrogatedb/indexRemapper.h b/dtool/src/interrogatedb/indexRemapper.h index 46beda1cce..b112474205 100644 --- a/dtool/src/interrogatedb/indexRemapper.h +++ b/dtool/src/interrogatedb/indexRemapper.h @@ -21,7 +21,7 @@ // only reason it exists is because Microsoft can't // export STL map outside of the DLL. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL IndexRemapper { +class EXPCL_DTOOLCONFIG IndexRemapper { public: IndexRemapper(); ~IndexRemapper(); @@ -37,6 +37,3 @@ private: }; #endif - - - diff --git a/dtool/src/interrogatedb/interrogateComponent.h b/dtool/src/interrogatedb/interrogateComponent.h index cd6445922d..5bb804ec3c 100644 --- a/dtool/src/interrogatedb/interrogateComponent.h +++ b/dtool/src/interrogatedb/interrogateComponent.h @@ -21,7 +21,7 @@ class IndexRemapper; // interrogate database. This includes types, // functions, and function wrappers. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateComponent { +class EXPCL_DTOOLCONFIG InterrogateComponent { public: INLINE InterrogateComponent(InterrogateModuleDef *def = NULL); INLINE InterrogateComponent(const InterrogateComponent ©); diff --git a/dtool/src/interrogatedb/interrogateDatabase.h b/dtool/src/interrogatedb/interrogateDatabase.h index 264a35ca3e..b7ec3e220f 100644 --- a/dtool/src/interrogatedb/interrogateDatabase.h +++ b/dtool/src/interrogatedb/interrogateDatabase.h @@ -25,7 +25,7 @@ class IndexRemapper; // Description : This stores all of the interrogate data and handles // reading the data from a disk file when necessary. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateDatabase { +class EXPCL_DTOOLCONFIG InterrogateDatabase { private: InterrogateDatabase(); diff --git a/dtool/src/interrogatedb/interrogateElement.h b/dtool/src/interrogatedb/interrogateElement.h index 29020436ee..2a53098125 100644 --- a/dtool/src/interrogatedb/interrogateElement.h +++ b/dtool/src/interrogatedb/interrogateElement.h @@ -17,7 +17,7 @@ class IndexRemapper; // Description : An internal representation of a data element, like a // data member or a global variable. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateElement : public InterrogateComponent { +class EXPCL_DTOOLCONFIG InterrogateElement : public InterrogateComponent { public: INLINE InterrogateElement(InterrogateModuleDef *def = NULL); INLINE InterrogateElement(const InterrogateElement ©); diff --git a/dtool/src/interrogatedb/interrogateFunction.h b/dtool/src/interrogatedb/interrogateFunction.h index 2cdb64137c..885e77c3fc 100644 --- a/dtool/src/interrogatedb/interrogateFunction.h +++ b/dtool/src/interrogatedb/interrogateFunction.h @@ -18,7 +18,7 @@ class IndexRemapper; // Class : InterrogateFunction // Description : An internal representation of a function. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateFunction : public InterrogateComponent { +class EXPCL_DTOOLCONFIG InterrogateFunction : public InterrogateComponent { public: INLINE InterrogateFunction(InterrogateModuleDef *def = NULL); INLINE InterrogateFunction(const InterrogateFunction ©); diff --git a/dtool/src/interrogatedb/interrogateFunctionWrapper.h b/dtool/src/interrogatedb/interrogateFunctionWrapper.h index 41a53dd3fb..d8d3a77eb5 100644 --- a/dtool/src/interrogatedb/interrogateFunctionWrapper.h +++ b/dtool/src/interrogatedb/interrogateFunctionWrapper.h @@ -18,7 +18,7 @@ class IndexRemapper; // Class : InterrogateFunctionWrapper // Description : An internal representation of a function. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateFunctionWrapper : public InterrogateComponent { +class EXPCL_DTOOLCONFIG InterrogateFunctionWrapper : public InterrogateComponent { public: INLINE InterrogateFunctionWrapper(InterrogateModuleDef *def = NULL); INLINE InterrogateFunctionWrapper(const InterrogateFunctionWrapper ©); diff --git a/dtool/src/interrogatedb/interrogateManifest.h b/dtool/src/interrogatedb/interrogateManifest.h index 296c832d5c..bd7dcd6e37 100644 --- a/dtool/src/interrogatedb/interrogateManifest.h +++ b/dtool/src/interrogatedb/interrogateManifest.h @@ -16,7 +16,7 @@ class IndexRemapper; // Class : InterrogateManifest // Description : An internal representation of a manifest constant. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateManifest : public InterrogateComponent { +class EXPCL_DTOOLCONFIG InterrogateManifest : public InterrogateComponent { public: INLINE InterrogateManifest(InterrogateModuleDef *def = NULL); INLINE InterrogateManifest(const InterrogateManifest ©); diff --git a/dtool/src/interrogatedb/interrogateType.h b/dtool/src/interrogatedb/interrogateType.h index e83f129d69..c8926a7502 100644 --- a/dtool/src/interrogatedb/interrogateType.h +++ b/dtool/src/interrogatedb/interrogateType.h @@ -18,7 +18,7 @@ class IndexRemapper; // Class : InterrogateType // Description : An internal representation of a type. //////////////////////////////////////////////////////////////////// -class EXPCL_DTOOL InterrogateType : public InterrogateComponent { +class EXPCL_DTOOLCONFIG InterrogateType : public InterrogateComponent { public: INLINE InterrogateType(InterrogateModuleDef *def = NULL); INLINE InterrogateType(const InterrogateType ©); diff --git a/dtool/src/interrogatedb/interrogate_interface.h b/dtool/src/interrogatedb/interrogate_interface.h index cec3825cd1..7350035c5a 100644 --- a/dtool/src/interrogatedb/interrogate_interface.h +++ b/dtool/src/interrogatedb/interrogate_interface.h @@ -91,23 +91,23 @@ enum AtomicToken { // (whatever type interrogate thinks it is), as returned by the getter // function given by interrogate_manifest_getter(). -EXPCL_DTOOL int interrogate_number_of_manifests(); -EXPCL_DTOOL ManifestIndex interrogate_get_manifest(int n); -EXPCL_DTOOL ManifestIndex interrogate_get_manifest_by_name(const char *manifest_name); -EXPCL_DTOOL const char *interrogate_manifest_name(ManifestIndex manifest); -EXPCL_DTOOL const char *interrogate_manifest_definition(ManifestIndex manifest); -EXPCL_DTOOL bool interrogate_manifest_has_type(ManifestIndex manifest); -EXPCL_DTOOL TypeIndex interrogate_manifest_get_type(ManifestIndex manifest); -EXPCL_DTOOL bool interrogate_manifest_has_getter(ManifestIndex manifest); -EXPCL_DTOOL FunctionIndex interrogate_manifest_getter(ManifestIndex manifest); +EXPCL_DTOOLCONFIG int interrogate_number_of_manifests(); +EXPCL_DTOOLCONFIG ManifestIndex interrogate_get_manifest(int n); +EXPCL_DTOOLCONFIG ManifestIndex interrogate_get_manifest_by_name(const char *manifest_name); +EXPCL_DTOOLCONFIG const char *interrogate_manifest_name(ManifestIndex manifest); +EXPCL_DTOOLCONFIG const char *interrogate_manifest_definition(ManifestIndex manifest); +EXPCL_DTOOLCONFIG bool interrogate_manifest_has_type(ManifestIndex manifest); +EXPCL_DTOOLCONFIG TypeIndex interrogate_manifest_get_type(ManifestIndex manifest); +EXPCL_DTOOLCONFIG bool interrogate_manifest_has_getter(ManifestIndex manifest); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_manifest_getter(ManifestIndex manifest); // An exception is made for manifest constants that have an integer // type value, since these are so common. The scripting language can // query these values directly, which saves having to generate a // wrapper function for each stupid little manifest. In this case, // there will be no getter function available. -EXPCL_DTOOL bool interrogate_manifest_has_int_value(ManifestIndex manifest); -EXPCL_DTOOL int interrogate_manifest_get_int_value(ManifestIndex manifest); +EXPCL_DTOOLCONFIG bool interrogate_manifest_has_int_value(ManifestIndex manifest); +EXPCL_DTOOLCONFIG int interrogate_manifest_get_int_value(ManifestIndex manifest); ////////////////////////////////////////////////////////////////////////// @@ -120,10 +120,10 @@ EXPCL_DTOOL int interrogate_manifest_get_int_value(ManifestIndex manifest); // elements. Interrogate automatically generates a getter function // and, if possible, a setter function. -EXPCL_DTOOL const char *interrogate_element_name(ElementIndex element); -EXPCL_DTOOL const char *interrogate_element_scoped_name(ElementIndex element); -EXPCL_DTOOL ElementIndex interrogate_get_element_by_name(const char *element_name); -EXPCL_DTOOL ElementIndex interrogate_get_element_by_scoped_name(const char *element_name); +EXPCL_DTOOLCONFIG const char *interrogate_element_name(ElementIndex element); +EXPCL_DTOOLCONFIG const char *interrogate_element_scoped_name(ElementIndex element); +EXPCL_DTOOLCONFIG ElementIndex interrogate_get_element_by_name(const char *element_name); +EXPCL_DTOOLCONFIG ElementIndex interrogate_get_element_by_scoped_name(const char *element_name); // Be careful with this function. The element's bare type is not // likely to be directly useful to the scripting language. This is a @@ -133,12 +133,12 @@ EXPCL_DTOOL ElementIndex interrogate_get_element_by_scoped_name(const char *elem // scripting language can't handle directly, e.g. a Node, while the // getter will return (and the setter accept) a pointer to a Node, // which is what the scripting language actually works with. -EXPCL_DTOOL TypeIndex interrogate_element_type(ElementIndex element); +EXPCL_DTOOLCONFIG TypeIndex interrogate_element_type(ElementIndex element); -EXPCL_DTOOL bool interrogate_element_has_getter(ElementIndex element); -EXPCL_DTOOL FunctionIndex interrogate_element_getter(ElementIndex element); -EXPCL_DTOOL bool interrogate_element_has_setter(ElementIndex element); -EXPCL_DTOOL FunctionIndex interrogate_element_setter(ElementIndex element); +EXPCL_DTOOLCONFIG bool interrogate_element_has_getter(ElementIndex element); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_element_getter(ElementIndex element); +EXPCL_DTOOLCONFIG bool interrogate_element_has_setter(ElementIndex element); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_element_setter(ElementIndex element); ////////////////////////////////////////////////////////////////////////// // @@ -148,8 +148,8 @@ EXPCL_DTOOL FunctionIndex interrogate_element_setter(ElementIndex element); // This is the list of global data elements. -EXPCL_DTOOL int interrogate_number_of_globals(); -EXPCL_DTOOL ElementIndex interrogate_get_global(int n); +EXPCL_DTOOLCONFIG int interrogate_number_of_globals(); +EXPCL_DTOOLCONFIG ElementIndex interrogate_get_global(int n); ////////////////////////////////////////////////////////////////////////// // @@ -165,16 +165,16 @@ EXPCL_DTOOL ElementIndex interrogate_get_global(int n); // These are the global (nonmember) functions that appear outside of // any class definition. -EXPCL_DTOOL int interrogate_number_of_global_functions(); -EXPCL_DTOOL FunctionIndex interrogate_get_global_function(int n); +EXPCL_DTOOLCONFIG int interrogate_number_of_global_functions(); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_get_global_function(int n); // This can be used to traverse through *all* the functions known to // interrogate. It's usually not what you want, since this includes // global functions, class methods, and synthesized functions like // upcasts and downcasts. You probably want to use instead // interrogate_number_of_global_functions(), above. -EXPCL_DTOOL int interrogate_number_of_functions(); -EXPCL_DTOOL FunctionIndex interrogate_get_function(int n); +EXPCL_DTOOLCONFIG int interrogate_number_of_functions(); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_get_function(int n); // This is the function's name. It is not unique; it may be shared // between multiple different functions that have the same name but @@ -182,37 +182,37 @@ EXPCL_DTOOL FunctionIndex interrogate_get_function(int n); // Two different classes might also have member functions that have // the same name, or the same name as a global function (but also see // the scoped_name, below). -EXPCL_DTOOL const char *interrogate_function_name(FunctionIndex function); +EXPCL_DTOOLCONFIG const char *interrogate_function_name(FunctionIndex function); // The scoped name is the function name prefixed with the name of the // class that includes the function, if the function is a class // method. If it is a global function, the scoped name is the same as // the name returned above. In the absence of C++ function // overloading, this name will be unique to each function. -EXPCL_DTOOL const char *interrogate_function_scoped_name(FunctionIndex function); +EXPCL_DTOOLCONFIG const char *interrogate_function_scoped_name(FunctionIndex function); // This returns the C++ comment written for the function, either in // the header file or in the .C file, or both. -EXPCL_DTOOL bool interrogate_function_has_comment(TypeIndex type); -EXPCL_DTOOL const char *interrogate_function_comment(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_function_has_comment(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_function_comment(TypeIndex type); // This defines the function prototype as it appears in the C++ // source, useful primarily for documentation purposes. -EXPCL_DTOOL const char *interrogate_function_prototype(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_function_prototype(TypeIndex type); // This can be used to determine the class that the function is a // method for, if the function is a class method. -EXPCL_DTOOL bool interrogate_function_is_method(FunctionIndex function); -EXPCL_DTOOL TypeIndex interrogate_function_class(FunctionIndex function); +EXPCL_DTOOLCONFIG bool interrogate_function_is_method(FunctionIndex function); +EXPCL_DTOOLCONFIG TypeIndex interrogate_function_class(FunctionIndex function); // This returns the module name reported for the function, if // available. -EXPCL_DTOOL bool interrogate_function_has_module_name(FunctionIndex function); -EXPCL_DTOOL const char *interrogate_function_module_name(FunctionIndex function); +EXPCL_DTOOLCONFIG bool interrogate_function_has_module_name(FunctionIndex function); +EXPCL_DTOOLCONFIG const char *interrogate_function_module_name(FunctionIndex function); // This is true for virtual member functions. It's not likely that // this will be important to the scripting language. -EXPCL_DTOOL bool interrogate_function_is_virtual(FunctionIndex function); +EXPCL_DTOOLCONFIG bool interrogate_function_is_virtual(FunctionIndex function); // The actual callable function interface is defined via one or more @@ -223,11 +223,11 @@ EXPCL_DTOOL bool interrogate_function_is_virtual(FunctionIndex function); // calling convention or the Python calling convention. The set of // wrappers that will actually be available depends on the parameters // passed to the interrogate command line. -EXPCL_DTOOL int interrogate_function_number_of_c_wrappers(FunctionIndex function); -EXPCL_DTOOL FunctionWrapperIndex interrogate_function_c_wrapper(FunctionIndex function, int n); +EXPCL_DTOOLCONFIG int interrogate_function_number_of_c_wrappers(FunctionIndex function); +EXPCL_DTOOLCONFIG FunctionWrapperIndex interrogate_function_c_wrapper(FunctionIndex function, int n); -EXPCL_DTOOL int interrogate_function_number_of_python_wrappers(FunctionIndex function); -EXPCL_DTOOL FunctionWrapperIndex interrogate_function_python_wrapper(FunctionIndex function, int n); +EXPCL_DTOOLCONFIG int interrogate_function_number_of_python_wrappers(FunctionIndex function); +EXPCL_DTOOLCONFIG FunctionWrapperIndex interrogate_function_python_wrapper(FunctionIndex function, int n); ////////////////////////////////////////////////////////////////////////// // @@ -250,11 +250,11 @@ EXPCL_DTOOL FunctionWrapperIndex interrogate_function_python_wrapper(FunctionInd // Don't confuse this with the unique_name, below. The two are // related, but not identical. -EXPCL_DTOOL const char *interrogate_wrapper_name(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG const char *interrogate_wrapper_name(FunctionWrapperIndex wrapper); // This returns true if -fnames was given to interrogate, making the // wrapper function callable directly by its name. -EXPCL_DTOOL bool interrogate_wrapper_is_callable_by_name(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG bool interrogate_wrapper_is_callable_by_name(FunctionWrapperIndex wrapper); // Every function wrapper has zero or more parameters and may or may // not have a return value. Each parameter has a type and may or may @@ -264,8 +264,8 @@ EXPCL_DTOOL bool interrogate_wrapper_is_callable_by_name(FunctionWrapperIndex wr // its first parameter, it is a static member function, also called a // class method.) -EXPCL_DTOOL bool interrogate_wrapper_has_return_value(FunctionWrapperIndex wrapper); -EXPCL_DTOOL TypeIndex interrogate_wrapper_return_type(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG bool interrogate_wrapper_has_return_value(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG TypeIndex interrogate_wrapper_return_type(FunctionWrapperIndex wrapper); // Sometimes interrogate must synthesize a wrapper that allocates its // return value from the free store. Other times (especially if @@ -280,15 +280,15 @@ EXPCL_DTOOL TypeIndex interrogate_wrapper_return_type(FunctionWrapperIndex wrapp // that for the class). Otherwise, this function will return false, // and the scripting language should *not* call any destructor on this // value. -EXPCL_DTOOL bool interrogate_wrapper_caller_manages_return_value(FunctionWrapperIndex wrapper); -EXPCL_DTOOL FunctionIndex interrogate_wrapper_return_value_destructor(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG bool interrogate_wrapper_caller_manages_return_value(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_wrapper_return_value_destructor(FunctionWrapperIndex wrapper); // These define the parameters of the function. -EXPCL_DTOOL int interrogate_wrapper_number_of_parameters(FunctionWrapperIndex wrapper); -EXPCL_DTOOL TypeIndex interrogate_wrapper_parameter_type(FunctionWrapperIndex wrapper, int n); -EXPCL_DTOOL bool interrogate_wrapper_parameter_has_name(FunctionWrapperIndex wrapper, int n); -EXPCL_DTOOL const char *interrogate_wrapper_parameter_name(FunctionWrapperIndex wrapper, int n); -EXPCL_DTOOL bool interrogate_wrapper_parameter_is_this(FunctionWrapperIndex wrapper, int n); +EXPCL_DTOOLCONFIG int interrogate_wrapper_number_of_parameters(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG TypeIndex interrogate_wrapper_parameter_type(FunctionWrapperIndex wrapper, int n); +EXPCL_DTOOLCONFIG bool interrogate_wrapper_parameter_has_name(FunctionWrapperIndex wrapper, int n); +EXPCL_DTOOLCONFIG const char *interrogate_wrapper_parameter_name(FunctionWrapperIndex wrapper, int n); +EXPCL_DTOOLCONFIG bool interrogate_wrapper_parameter_is_this(FunctionWrapperIndex wrapper, int n); // This returns a pointer to a function that may be called to invoke // the function, if the -fptrs option to return function pointers was @@ -298,8 +298,8 @@ EXPCL_DTOOL bool interrogate_wrapper_parameter_is_this(FunctionWrapperIndex wrap // These two functions may be called without forcing a load of the // complete interrogate database. -EXPCL_DTOOL bool interrogate_wrapper_has_pointer(FunctionWrapperIndex wrapper); -EXPCL_DTOOL void *interrogate_wrapper_pointer(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG bool interrogate_wrapper_has_pointer(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG void *interrogate_wrapper_pointer(FunctionWrapperIndex wrapper); // This function will return a name that is guaranteed to be unique to // this particular function wrapper, and that will (usually) be @@ -310,7 +310,7 @@ EXPCL_DTOOL void *interrogate_wrapper_pointer(FunctionWrapperIndex wrapper); // The unique name is an ugly hashed name, not safe for human // consumption. Its sole purpose is to provide some consistent way to // identify function wrappers between sessions. -EXPCL_DTOOL const char *interrogate_wrapper_unique_name(FunctionWrapperIndex wrapper); +EXPCL_DTOOLCONFIG const char *interrogate_wrapper_unique_name(FunctionWrapperIndex wrapper); // This function provides a reverse-lookup on the above unique name, // returning the wrapper index corresponding to the given name. It @@ -320,7 +320,7 @@ EXPCL_DTOOL const char *interrogate_wrapper_unique_name(FunctionWrapperIndex wra // Thus function may be called without forcing a load of the complete // interrogate database. -EXPCL_DTOOL FunctionWrapperIndex interrogate_get_wrapper_by_unique_name(const char *unique_name); +EXPCL_DTOOLCONFIG FunctionWrapperIndex interrogate_get_wrapper_by_unique_name(const char *unique_name); ////////////////////////////////////////////////////////////////////////// @@ -342,16 +342,16 @@ EXPCL_DTOOL FunctionWrapperIndex interrogate_get_wrapper_by_unique_name(const ch // classes. These types are necessary to fully define all of the // function parameters, but need not themselves be wrapped. -EXPCL_DTOOL int interrogate_number_of_global_types(); -EXPCL_DTOOL TypeIndex interrogate_get_global_type(int n); -EXPCL_DTOOL int interrogate_number_of_types(); -EXPCL_DTOOL TypeIndex interrogate_get_type(int n); -EXPCL_DTOOL TypeIndex interrogate_get_type_by_name(const char *type_name); -EXPCL_DTOOL TypeIndex interrogate_get_type_by_scoped_name(const char *type_name); -EXPCL_DTOOL TypeIndex interrogate_get_type_by_true_name(const char *type_name); -EXPCL_DTOOL const char *interrogate_type_name(TypeIndex type); -EXPCL_DTOOL const char *interrogate_type_scoped_name(TypeIndex type); -EXPCL_DTOOL const char *interrogate_type_true_name(TypeIndex type); +EXPCL_DTOOLCONFIG int interrogate_number_of_global_types(); +EXPCL_DTOOLCONFIG TypeIndex interrogate_get_global_type(int n); +EXPCL_DTOOLCONFIG int interrogate_number_of_types(); +EXPCL_DTOOLCONFIG TypeIndex interrogate_get_type(int n); +EXPCL_DTOOLCONFIG TypeIndex interrogate_get_type_by_name(const char *type_name); +EXPCL_DTOOLCONFIG TypeIndex interrogate_get_type_by_scoped_name(const char *type_name); +EXPCL_DTOOLCONFIG TypeIndex interrogate_get_type_by_true_name(const char *type_name); +EXPCL_DTOOLCONFIG const char *interrogate_type_name(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_type_scoped_name(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_type_true_name(TypeIndex type); // A given type might be a nested type, meaning it is entirely defined // within (and scoped within) some different C++ class. In this case, @@ -359,27 +359,27 @@ EXPCL_DTOOL const char *interrogate_type_true_name(TypeIndex type); // within the class, while the scoped_name() will return the // fully-qualified name of the type, and is_nested() and outer_class() // can be used to determine the class it is nested within. -EXPCL_DTOOL bool interrogate_type_is_nested(TypeIndex type); -EXPCL_DTOOL TypeIndex interrogate_type_outer_class(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_nested(TypeIndex type); +EXPCL_DTOOLCONFIG TypeIndex interrogate_type_outer_class(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_has_comment(TypeIndex type); -EXPCL_DTOOL const char *interrogate_type_comment(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_has_comment(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_type_comment(TypeIndex type); // This returns the module name reported for the type, if available. -EXPCL_DTOOL bool interrogate_type_has_module_name(TypeIndex type); -EXPCL_DTOOL const char *interrogate_type_module_name(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_has_module_name(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_type_module_name(TypeIndex type); // If interrogate_type_is_atomic() returns true, the type is one of // the basic C types enumerated in AtomicToken, above. The type may // then be further modified by one or more of unsigned, signed, long, // longlong, or short. However, it will not be a pointer. -EXPCL_DTOOL bool interrogate_type_is_atomic(TypeIndex type); -EXPCL_DTOOL AtomicToken interrogate_type_atomic_token(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_unsigned(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_signed(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_long(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_longlong(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_short(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_atomic(TypeIndex type); +EXPCL_DTOOLCONFIG AtomicToken interrogate_type_atomic_token(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_unsigned(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_signed(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_long(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_longlong(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_short(TypeIndex type); // If interrogate_type_is_wrapped() returns true, this is a composite // type "wrapped" around some simpler type, for instance a pointer to @@ -388,19 +388,19 @@ EXPCL_DTOOL bool interrogate_type_is_short(TypeIndex type); // they use multiple wrappers. A const char pointer, for example, is // represented as a pointer wrapper around a const wrapper around an // atomic char.) -EXPCL_DTOOL bool interrogate_type_is_wrapped(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_pointer(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_const(TypeIndex type); -EXPCL_DTOOL TypeIndex interrogate_type_wrapped_type(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_wrapped(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_pointer(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_const(TypeIndex type); +EXPCL_DTOOLCONFIG TypeIndex interrogate_type_wrapped_type(TypeIndex type); // If interrogate_type_is_enum() returns true, this is an enumerated // type, which means it may take any one of a number of named integer // values. -EXPCL_DTOOL bool interrogate_type_is_enum(TypeIndex type); -EXPCL_DTOOL int interrogate_type_number_of_enum_values(TypeIndex type); -EXPCL_DTOOL const char *interrogate_type_enum_value_name(TypeIndex type, int n); -EXPCL_DTOOL const char *interrogate_type_enum_value_scoped_name(TypeIndex type, int n); -EXPCL_DTOOL int interrogate_type_enum_value(TypeIndex type, int n); +EXPCL_DTOOLCONFIG bool interrogate_type_is_enum(TypeIndex type); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_enum_values(TypeIndex type); +EXPCL_DTOOLCONFIG const char *interrogate_type_enum_value_name(TypeIndex type, int n); +EXPCL_DTOOLCONFIG const char *interrogate_type_enum_value_scoped_name(TypeIndex type, int n); +EXPCL_DTOOLCONFIG int interrogate_type_enum_value(TypeIndex type, int n); // If none of the above is true, the type is some extension type. It // may be a struct, class, or union (and the distinction between these @@ -408,19 +408,19 @@ EXPCL_DTOOL int interrogate_type_enum_value(TypeIndex type, int n); // any case, it may contain zero or more constructors, zero or one // destructor, zero or more member functions, and zero or more data // members; all of the remaining type functions may apply. -EXPCL_DTOOL bool interrogate_type_is_struct(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_class(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_is_union(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_struct(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_class(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_union(TypeIndex type); // If is_fully_defined() returns false, this class/struct was a // forward reference, and we really don't know anything about it. (In // this case, it will appear to have no methods or members.) -EXPCL_DTOOL bool interrogate_type_is_fully_defined(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_fully_defined(TypeIndex type); // If is_unpublished() returns false, the class/struct is unknown // because it was not marked to be published (or, in promiscuous mode, // it is a protected or private nested class). -EXPCL_DTOOL bool interrogate_type_is_unpublished(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_is_unpublished(TypeIndex type); // Otherwise, especially if the type is a struct or class, we may have // a number of member functions, including zero or more constructors @@ -441,32 +441,32 @@ EXPCL_DTOOL bool interrogate_type_is_unpublished(TypeIndex type); // same function index as the one returned by the ancestor class, and // interrogate_type_destructor_is_inherited() will return true for // this class. -EXPCL_DTOOL int interrogate_type_number_of_constructors(TypeIndex type); -EXPCL_DTOOL FunctionIndex interrogate_type_get_constructor(TypeIndex type, int n); -EXPCL_DTOOL bool interrogate_type_has_destructor(TypeIndex type); -EXPCL_DTOOL bool interrogate_type_destructor_is_inherited(TypeIndex type); -EXPCL_DTOOL FunctionIndex interrogate_type_get_destructor(TypeIndex type); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_constructors(TypeIndex type); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_type_get_constructor(TypeIndex type, int n); +EXPCL_DTOOLCONFIG bool interrogate_type_has_destructor(TypeIndex type); +EXPCL_DTOOLCONFIG bool interrogate_type_destructor_is_inherited(TypeIndex type); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_type_get_destructor(TypeIndex type); // This is the set of exposed data elements in the struct or class. -EXPCL_DTOOL int interrogate_type_number_of_elements(TypeIndex type); -EXPCL_DTOOL ElementIndex interrogate_type_get_element(TypeIndex type, int n); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_elements(TypeIndex type); +EXPCL_DTOOLCONFIG ElementIndex interrogate_type_get_element(TypeIndex type, int n); // This is the set of exposed member functions in the struct or class. -EXPCL_DTOOL int interrogate_type_number_of_methods(TypeIndex type); -EXPCL_DTOOL FunctionIndex interrogate_type_get_method(TypeIndex type, int n); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_methods(TypeIndex type); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_type_get_method(TypeIndex type, int n); // A C++ class may also define a number of explicit cast operators, // which define how to convert an object of this type to an object of // some other type (the type can be inferred by the return type of the // cast function). This is not related to upcast and downcast, // defined below. -EXPCL_DTOOL int interrogate_type_number_of_casts(TypeIndex type); -EXPCL_DTOOL FunctionIndex interrogate_type_get_cast(TypeIndex type, int n); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_casts(TypeIndex type); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_type_get_cast(TypeIndex type, int n); // A C++ class may inherit from zero or more base classes. This // defines the list of base classes for this particular type. -EXPCL_DTOOL int interrogate_type_number_of_derivations(TypeIndex type); -EXPCL_DTOOL TypeIndex interrogate_type_get_derivation(TypeIndex type, int n); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_derivations(TypeIndex type); +EXPCL_DTOOLCONFIG TypeIndex interrogate_type_get_derivation(TypeIndex type, int n); // For each base class, we might need to define an explicit upcast or // downcast operation to convert the pointer to the derived class to @@ -482,8 +482,8 @@ EXPCL_DTOOL TypeIndex interrogate_type_get_derivation(TypeIndex type, int n); // class. If this returns false, you may simply use the same pointer // as either a derived class pointer or a base class pointer without // any extra step. -EXPCL_DTOOL bool interrogate_type_derivation_has_upcast(TypeIndex type, int n); -EXPCL_DTOOL FunctionIndex interrogate_type_get_upcast(TypeIndex type, int n); +EXPCL_DTOOLCONFIG bool interrogate_type_derivation_has_upcast(TypeIndex type, int n); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_type_get_upcast(TypeIndex type, int n); // Although it is always possible to upcast a pointer to a base class, // it is not always possible to downcast from a base class to the @@ -493,14 +493,14 @@ EXPCL_DTOOL FunctionIndex interrogate_type_get_upcast(TypeIndex type, int n); // way as upcasting. (Of course, it is the caller's responsibility to // guarantee that the pointer actually represents an object of the // type being downcast to.) -EXPCL_DTOOL bool interrogate_type_derivation_downcast_is_impossible(TypeIndex type, int n); -EXPCL_DTOOL bool interrogate_type_derivation_has_downcast(TypeIndex type, int n); -EXPCL_DTOOL FunctionIndex interrogate_type_get_downcast(TypeIndex type, int n); +EXPCL_DTOOLCONFIG bool interrogate_type_derivation_downcast_is_impossible(TypeIndex type, int n); +EXPCL_DTOOLCONFIG bool interrogate_type_derivation_has_downcast(TypeIndex type, int n); +EXPCL_DTOOLCONFIG FunctionIndex interrogate_type_get_downcast(TypeIndex type, int n); // A C++ class may also define any number of nested types--classes or // enums defined within the scope of this class. -EXPCL_DTOOL int interrogate_type_number_of_nested_types(TypeIndex type); -EXPCL_DTOOL TypeIndex interrogate_type_get_nested_type(TypeIndex type, int n); +EXPCL_DTOOLCONFIG int interrogate_type_number_of_nested_types(TypeIndex type); +EXPCL_DTOOLCONFIG TypeIndex interrogate_type_get_nested_type(TypeIndex type, int n); #ifdef __cplusplus } diff --git a/dtool/src/interrogatedb/interrogate_request.h b/dtool/src/interrogatedb/interrogate_request.h index 654eff29f9..6fb62126ff 100644 --- a/dtool/src/interrogatedb/interrogate_request.h +++ b/dtool/src/interrogatedb/interrogate_request.h @@ -26,7 +26,7 @@ extern "C" { // database filename (*.in) be read in. This makes the interrogate // data available, but doesn't allow matching the database information // up with any compiled-in function wrappers or anything. -EXPCL_DTOOL void interrogate_request_database(const char *database_filename); +EXPCL_DTOOLCONFIG void interrogate_request_database(const char *database_filename); @@ -59,7 +59,7 @@ typedef struct { // This requests that the given module be loaded and made available. // This includes all of the function pointers and/or unique names that // might be compiled in. -EXPCL_DTOOL void interrogate_request_module(InterrogateModuleDef *def); +EXPCL_DTOOLCONFIG void interrogate_request_module(InterrogateModuleDef *def); #ifdef __cplusplus diff --git a/dtool/src/interrogatedb/vector_int.h b/dtool/src/interrogatedb/vector_int.h index 5213439a44..491e419a31 100644 --- a/dtool/src/interrogatedb/vector_int.h +++ b/dtool/src/interrogatedb/vector_int.h @@ -13,13 +13,13 @@ //////////////////////////////////////////////////////////////////// // Class : vector_int // Description : A vector of ints. This class is defined once here, -// and exported to DTOOL.DLL; other packages that want +// and exported to DTOOLCONFIG.DLL; other packages that want // to use a vector of this type (whether they need to // export it or not) should include this header file, // rather than defining the vector again. //////////////////////////////////////////////////////////////////// -EXPORT_TEMPLATE_CLASS(EXPCL_DTOOL, EXPTP_DTOOL, std::vector) +EXPORT_TEMPLATE_CLASS(EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG, std::vector) typedef vector vector_int; // Tell GCC that we'll take care of the instantiation explicitly here. diff --git a/dtool/src/pystub/Sources.pp b/dtool/src/pystub/Sources.pp index c5e5f10fd2..ab55bc7b2a 100644 --- a/dtool/src/pystub/Sources.pp +++ b/dtool/src/pystub/Sources.pp @@ -1,4 +1,4 @@ -#define BUILDING_DLL BUILDING_DTOOL +#define BUILDING_DLL BUILDING_DTOOLCONFIG #define LOCAL_LIBS dtoolbase #begin lib_target diff --git a/dtool/src/pystub/pystub.cxx b/dtool/src/pystub/pystub.cxx index 61209a85ca..67b2d16ee6 100644 --- a/dtool/src/pystub/pystub.cxx +++ b/dtool/src/pystub/pystub.cxx @@ -6,12 +6,12 @@ #include "pystub.h" extern "C" { - EXPCL_DTOOL int PyArg_ParseTuple(...); - EXPCL_DTOOL int Py_BuildValue(...); - EXPCL_DTOOL int Py_InitModule4(...); - EXPCL_DTOOL int PyObject_IsTrue(...); - EXPCL_DTOOL int PyErr_SetString(...); - EXPCL_DTOOL extern void *PyExc_AssertionError; + EXPCL_DTOOLCONFIG int PyArg_ParseTuple(...); + EXPCL_DTOOLCONFIG int Py_BuildValue(...); + EXPCL_DTOOLCONFIG int Py_InitModule4(...); + EXPCL_DTOOLCONFIG int PyObject_IsTrue(...); + EXPCL_DTOOLCONFIG int PyErr_SetString(...); + EXPCL_DTOOLCONFIG extern void *PyExc_AssertionError; }; int diff --git a/dtool/src/pystub/pystub.h b/dtool/src/pystub/pystub.h index ad11c1cd32..3de0794b41 100644 --- a/dtool/src/pystub/pystub.h +++ b/dtool/src/pystub/pystub.h @@ -26,7 +26,7 @@ // force the .so to be linked in--some OS'es try to be smart about not // pulling in shared libraries whose symbols aren't referenced // anywhere. -EXPCL_DTOOL void pystub(); +EXPCL_DTOOLCONFIG void pystub(); #endif diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp index 2cc39e2fcb..1e3f74b174 100644 --- a/panda/metalibs/panda/Sources.pp +++ b/panda/metalibs/panda/Sources.pp @@ -19,7 +19,7 @@ audio gui pandabase #define LOCAL_LIBS downloader event ipc express pandabase -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET panda diff --git a/panda/metalibs/pandadx/Sources.pp b/panda/metalibs/pandadx/Sources.pp index f93795c220..7cab219aca 100644 --- a/panda/metalibs/pandadx/Sources.pp +++ b/panda/metalibs/pandadx/Sources.pp @@ -12,7 +12,7 @@ #define COMPONENT_LIBS \ dxgsg wdxdisplay #define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET pandadx diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp index 2c14b1b904..65ab060a2f 100644 --- a/panda/metalibs/pandaegg/Sources.pp +++ b/panda/metalibs/pandaegg/Sources.pp @@ -11,7 +11,7 @@ egg2sg egg builder #define LOCAL_LIBS putil express -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET pandaegg diff --git a/panda/metalibs/pandaexpress/Sources.pp b/panda/metalibs/pandaexpress/Sources.pp index b838bc6d02..42e1a24cfd 100644 --- a/panda/metalibs/pandaexpress/Sources.pp +++ b/panda/metalibs/pandaexpress/Sources.pp @@ -9,7 +9,7 @@ #define USE_NET yes #define COMPONENT_LIBS downloader event ipc express pandabase -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET pandaexpress diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp index 7a6ab62bfb..2093640166 100644 --- a/panda/metalibs/pandagl/Sources.pp +++ b/panda/metalibs/pandagl/Sources.pp @@ -14,7 +14,7 @@ sgidisplay sgiglxdisplay sgiglutdisplay #define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET pandagl diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp index e52d82997a..1af58c2894 100644 --- a/panda/metalibs/pandaphysics/Sources.pp +++ b/panda/metalibs/pandaphysics/Sources.pp @@ -10,7 +10,7 @@ #define COMPONENT_LIBS \ physics particlesystem #define LOCAL_LIBS linmath putil express -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET pandaphysics diff --git a/panda/metalibs/pandarib/Sources.pp b/panda/metalibs/pandarib/Sources.pp index cfbbb0dbb6..c3f140cc89 100644 --- a/panda/metalibs/pandarib/Sources.pp +++ b/panda/metalibs/pandarib/Sources.pp @@ -12,7 +12,7 @@ #define COMPONENT_LIBS \ ribgsg ribdisplay #define LOCAL_LIBS gsgbase display express -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #begin metalib_target #define TARGET pandarib diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp index 8d2a726280..038da608dd 100644 --- a/panda/src/audio/Sources.pp +++ b/panda/src/audio/Sources.pp @@ -1,4 +1,4 @@ -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #define DIRECTORY_IF_AUDIO yes #define DIRECTORY_IF_IPC yes // #define USE_MIKMOD yes diff --git a/panda/src/audiotraits/Sources.pp b/panda/src/audiotraits/Sources.pp index 99fb6162db..4908cfc8f4 100644 --- a/panda/src/audiotraits/Sources.pp +++ b/panda/src/audiotraits/Sources.pp @@ -1,4 +1,4 @@ -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #define DIRECTORY_IF_AUDIO yes #define DIRECTORY_IF_IPC yes #define USE_AUDIO yes diff --git a/panda/src/builder/Sources.pp b/panda/src/builder/Sources.pp index e0a96b5d31..05e23db786 100644 --- a/panda/src/builder/Sources.pp +++ b/panda/src/builder/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET builder diff --git a/panda/src/chan/Sources.pp b/panda/src/chan/Sources.pp index 5f1f9405ce..f22a716031 100644 --- a/panda/src/chan/Sources.pp +++ b/panda/src/chan/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET chan diff --git a/panda/src/chancfg/Sources.pp b/panda/src/chancfg/Sources.pp index 368315587b..9a9f0db084 100644 --- a/panda/src/chancfg/Sources.pp +++ b/panda/src/chancfg/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET chancfg diff --git a/panda/src/char/Sources.pp b/panda/src/char/Sources.pp index 33775a826b..251432d2a1 100644 --- a/panda/src/char/Sources.pp +++ b/panda/src/char/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET char diff --git a/panda/src/chat/Sources.pp b/panda/src/chat/Sources.pp index 778e32a4e7..d7444a55c1 100644 --- a/panda/src/chat/Sources.pp +++ b/panda/src/chat/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET chat @@ -15,4 +16,3 @@ #define IGATESCAN all #end lib_target - diff --git a/panda/src/collide/Sources.pp b/panda/src/collide/Sources.pp index f24712747c..a40980fb50 100644 --- a/panda/src/collide/Sources.pp +++ b/panda/src/collide/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET collide diff --git a/panda/src/cull/Sources.pp b/panda/src/cull/Sources.pp index abf4b5116a..6b9105a901 100644 --- a/panda/src/cull/Sources.pp +++ b/panda/src/cull/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET cull diff --git a/panda/src/device/Sources.pp b/panda/src/device/Sources.pp index 13a7ecf275..998bb4c674 100644 --- a/panda/src/device/Sources.pp +++ b/panda/src/device/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET device diff --git a/panda/src/dgraph/Sources.pp b/panda/src/dgraph/Sources.pp index 2462e4fc27..110d8c0629 100644 --- a/panda/src/dgraph/Sources.pp +++ b/panda/src/dgraph/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET dgraph diff --git a/panda/src/display/Sources.pp b/panda/src/display/Sources.pp index 607bd316f0..83fcdb57d1 100644 --- a/panda/src/display/Sources.pp +++ b/panda/src/display/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET display diff --git a/panda/src/doc/Sources.pp b/panda/src/doc/Sources.pp index 656f9d5162..aa65c69390 100644 --- a/panda/src/doc/Sources.pp +++ b/panda/src/doc/Sources.pp @@ -1,2 +1,3 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m diff --git a/panda/src/downloader/Sources.pp b/panda/src/downloader/Sources.pp index e2b9aa27c5..ca1d5a7484 100644 --- a/panda/src/downloader/Sources.pp +++ b/panda/src/downloader/Sources.pp @@ -1,5 +1,6 @@ #define LOCAL_LIBS event ipc express pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_ZLIB yes #define USE_IPC yes diff --git a/panda/src/downloadertools/Sources.pp b/panda/src/downloadertools/Sources.pp index c549ce3b3f..5e51634ae0 100644 --- a/panda/src/downloadertools/Sources.pp +++ b/panda/src/downloadertools/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m pystub +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m pystub #define LOCAL_LIBS downloader express event ipc #define USE_IPC yes #define DIRECTORY_IF_IPC yes diff --git a/panda/src/dxgsg/Sources.pp b/panda/src/dxgsg/Sources.pp index c49c7725fa..5c9f7a0f66 100644 --- a/panda/src/dxgsg/Sources.pp +++ b/panda/src/dxgsg/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_DX yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_DX yes #begin lib_target diff --git a/panda/src/effects/Sources.pp b/panda/src/effects/Sources.pp index ee06f06e44..3d6b468c1e 100644 --- a/panda/src/effects/Sources.pp +++ b/panda/src/effects/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET effects diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp index ed79f7281d..f067f0bb63 100644 --- a/panda/src/egg/Sources.pp +++ b/panda/src/egg/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define YACC_PREFIX eggyy #define LFLAGS -i diff --git a/panda/src/egg2sg/Sources.pp b/panda/src/egg2sg/Sources.pp index 6ddbcd4f7b..d3373db61a 100644 --- a/panda/src/egg2sg/Sources.pp +++ b/panda/src/egg2sg/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET egg2sg diff --git a/panda/src/event/Sources.pp b/panda/src/event/Sources.pp index c92044dbc1..bb70c49885 100644 --- a/panda/src/event/Sources.pp +++ b/panda/src/event/Sources.pp @@ -1,5 +1,6 @@ #define LOCAL_LIBS ipc express pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET event diff --git a/panda/src/express/Sources.pp b/panda/src/express/Sources.pp index 1bac9ee3ef..c7a4c1a99f 100644 --- a/panda/src/express/Sources.pp +++ b/panda/src/express/Sources.pp @@ -1,5 +1,6 @@ #define LOCAL_LIBS pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET express diff --git a/panda/src/framework/Sources.pp b/panda/src/framework/Sources.pp index 87bcf493fc..c6238cf9ac 100644 --- a/panda/src/framework/Sources.pp +++ b/panda/src/framework/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin static_lib_target #define TARGET framework diff --git a/panda/src/glgsg/Sources.pp b/panda/src/glgsg/Sources.pp index c6d428261c..70221d32fc 100644 --- a/panda/src/glgsg/Sources.pp +++ b/panda/src/glgsg/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_GL yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_GL yes #begin lib_target diff --git a/panda/src/glutdisplay/Sources.pp b/panda/src/glutdisplay/Sources.pp index 7e0775d378..221ebe9118 100644 --- a/panda/src/glutdisplay/Sources.pp +++ b/panda/src/glutdisplay/Sources.pp @@ -1,7 +1,8 @@ #define DIRECTORY_IF_GL yes #define DIRECTORY_IF_GLUT yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_GL yes #define USE_GLUT yes diff --git a/panda/src/glxdisplay/Sources.pp b/panda/src/glxdisplay/Sources.pp index 1595f5500b..ee31f460ce 100644 --- a/panda/src/glxdisplay/Sources.pp +++ b/panda/src/glxdisplay/Sources.pp @@ -1,7 +1,8 @@ #define DIRECTORY_IF_GL yes #define DIRECTORY_IF_GLX yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_GL yes #begin lib_target diff --git a/panda/src/gobj/Sources.pp b/panda/src/gobj/Sources.pp index bda6cbeb99..b653f14ada 100644 --- a/panda/src/gobj/Sources.pp +++ b/panda/src/gobj/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET gobj diff --git a/panda/src/graph/Sources.pp b/panda/src/graph/Sources.pp index 7caec6e891..4edcf57a1e 100644 --- a/panda/src/graph/Sources.pp +++ b/panda/src/graph/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET graph diff --git a/panda/src/grutil/Sources.pp b/panda/src/grutil/Sources.pp index 456b6f3427..f08ca54439 100644 --- a/panda/src/grutil/Sources.pp +++ b/panda/src/grutil/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET grutil diff --git a/panda/src/gsgbase/Sources.pp b/panda/src/gsgbase/Sources.pp index b375e9f8b7..33afc3f1a2 100644 --- a/panda/src/gsgbase/Sources.pp +++ b/panda/src/gsgbase/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET gsgbase diff --git a/panda/src/gsgmisc/Sources.pp b/panda/src/gsgmisc/Sources.pp index 61fb930c94..165c833fb0 100644 --- a/panda/src/gsgmisc/Sources.pp +++ b/panda/src/gsgmisc/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET gsgmisc diff --git a/panda/src/gui/Sources.pp b/panda/src/gui/Sources.pp index ea718d8395..d157385eda 100644 --- a/panda/src/gui/Sources.pp +++ b/panda/src/gui/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS dtool +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET gui diff --git a/panda/src/ipc/Sources.pp b/panda/src/ipc/Sources.pp index d5741610e0..3f6c0f7467 100644 --- a/panda/src/ipc/Sources.pp +++ b/panda/src/ipc/Sources.pp @@ -1,5 +1,6 @@ #define LOCAL_LIBS express pandabase -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_NSPR yes #define USE_IPC yes #define DIRECTORY_IF_IPC yes diff --git a/panda/src/lerp/Sources.pp b/panda/src/lerp/Sources.pp index f1ba11299e..d5ee34f599 100644 --- a/panda/src/lerp/Sources.pp +++ b/panda/src/lerp/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET lerp diff --git a/panda/src/light/Sources.pp b/panda/src/light/Sources.pp index 41930ef4ec..659ca576ef 100644 --- a/panda/src/light/Sources.pp +++ b/panda/src/light/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET light diff --git a/panda/src/linmath/Sources.pp b/panda/src/linmath/Sources.pp index 3cbd8a27c7..e4526cac76 100644 --- a/panda/src/linmath/Sources.pp +++ b/panda/src/linmath/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET linmath diff --git a/panda/src/loader/Sources.pp b/panda/src/loader/Sources.pp index bc0d0a1042..7c3d9b8c75 100644 --- a/panda/src/loader/Sources.pp +++ b/panda/src/loader/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET loader diff --git a/panda/src/mathutil/Sources.pp b/panda/src/mathutil/Sources.pp index c3f13a30c6..a68c47aa1d 100644 --- a/panda/src/mathutil/Sources.pp +++ b/panda/src/mathutil/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET mathutil diff --git a/panda/src/net/Sources.pp b/panda/src/net/Sources.pp index 62c0014895..ced75386d3 100644 --- a/panda/src/net/Sources.pp +++ b/panda/src/net/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define DIRECTORY_IF_NET yes #define DIRECTORY_IF_NSPR yes #define USE_NET yes diff --git a/panda/src/pandabase/Sources.pp b/panda/src/pandabase/Sources.pp index 782329371d..38b05cbfde 100644 --- a/panda/src/pandabase/Sources.pp +++ b/panda/src/pandabase/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET pandabase diff --git a/panda/src/parametrics/Sources.pp b/panda/src/parametrics/Sources.pp index 91d2d9a59b..af4fc7c3d6 100644 --- a/panda/src/parametrics/Sources.pp +++ b/panda/src/parametrics/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET parametrics diff --git a/panda/src/particlesystem/Sources.pp b/panda/src/particlesystem/Sources.pp index 670308527a..a2f0c11f1e 100644 --- a/panda/src/particlesystem/Sources.pp +++ b/panda/src/particlesystem/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET particlesystem diff --git a/panda/src/physics/Sources.pp b/panda/src/physics/Sources.pp index 5fa155c0ca..40ec776fd6 100644 --- a/panda/src/physics/Sources.pp +++ b/panda/src/physics/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET physics diff --git a/panda/src/pnm/Sources.pp b/panda/src/pnm/Sources.pp index 1f4f5b5cd1..c310c50f82 100644 --- a/panda/src/pnm/Sources.pp +++ b/panda/src/pnm/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define LOCAL_LIBS pandabase #begin lib_target diff --git a/panda/src/pnmimage/Sources.pp b/panda/src/pnmimage/Sources.pp index c607ab506c..92797cf541 100644 --- a/panda/src/pnmimage/Sources.pp +++ b/panda/src/pnmimage/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET pnmimage diff --git a/panda/src/pnmimagetypes/Sources.pp b/panda/src/pnmimagetypes/Sources.pp index db9c94c634..42cbf50b7e 100644 --- a/panda/src/pnmimagetypes/Sources.pp +++ b/panda/src/pnmimagetypes/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_JPEG yes #begin lib_target diff --git a/panda/src/ps2display/Sources.pp b/panda/src/ps2display/Sources.pp index aaabc09596..f0d16fab08 100644 --- a/panda/src/ps2display/Sources.pp +++ b/panda/src/ps2display/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_PS2 yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET ps2display diff --git a/panda/src/ps2gsg/Sources.pp b/panda/src/ps2gsg/Sources.pp index 1120d4f169..1d768768ec 100644 --- a/panda/src/ps2gsg/Sources.pp +++ b/panda/src/ps2gsg/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_PS2 yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET ps2gsg diff --git a/panda/src/pstatclient/Sources.pp b/panda/src/pstatclient/Sources.pp index 2f3082be81..312bd056d0 100644 --- a/panda/src/pstatclient/Sources.pp +++ b/panda/src/pstatclient/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET pstatclient diff --git a/panda/src/putil/Sources.pp b/panda/src/putil/Sources.pp index 70a316950e..1ac4daf7c4 100644 --- a/panda/src/putil/Sources.pp +++ b/panda/src/putil/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define LOCAL_LIBS express pandabase #begin lib_target diff --git a/panda/src/ribdisplay/Sources.pp b/panda/src/ribdisplay/Sources.pp index 0471772cf3..741d91fcd6 100644 --- a/panda/src/ribdisplay/Sources.pp +++ b/panda/src/ribdisplay/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_RIB yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET ribdisplay diff --git a/panda/src/ribgsg/Sources.pp b/panda/src/ribgsg/Sources.pp index 2fd7445556..9bd96cc40d 100644 --- a/panda/src/ribgsg/Sources.pp +++ b/panda/src/ribgsg/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_RIB yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET ribgsg diff --git a/panda/src/sgidisplay/Sources.pp b/panda/src/sgidisplay/Sources.pp index 394983b8db..946cd4cb9b 100644 --- a/panda/src/sgidisplay/Sources.pp +++ b/panda/src/sgidisplay/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_SGIGL yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET sgidisplay diff --git a/panda/src/sgiglutdisplay/Sources.pp b/panda/src/sgiglutdisplay/Sources.pp index 31bf37df85..43e4abfbb7 100644 --- a/panda/src/sgiglutdisplay/Sources.pp +++ b/panda/src/sgiglutdisplay/Sources.pp @@ -1,7 +1,8 @@ #define DIRECTORY_IF_SGIGL yes #define DIRECTORY_IF_GLUT yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET sgiglutdisplay diff --git a/panda/src/sgiglxdisplay/Sources.pp b/panda/src/sgiglxdisplay/Sources.pp index 9491b3672a..94f55061a9 100644 --- a/panda/src/sgiglxdisplay/Sources.pp +++ b/panda/src/sgiglxdisplay/Sources.pp @@ -1,7 +1,8 @@ #define DIRECTORY_IF_SGIGL yes #define DIRECTORY_IF_GLX yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET sgiglxdisplay diff --git a/panda/src/sgmanip/Sources.pp b/panda/src/sgmanip/Sources.pp index fbfe75118e..00e057fd05 100644 --- a/panda/src/sgmanip/Sources.pp +++ b/panda/src/sgmanip/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET sgmanip diff --git a/panda/src/sgraph/Sources.pp b/panda/src/sgraph/Sources.pp index 548e636cb7..50a8120b76 100644 --- a/panda/src/sgraph/Sources.pp +++ b/panda/src/sgraph/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET sgraph diff --git a/panda/src/sgraphutil/Sources.pp b/panda/src/sgraphutil/Sources.pp index 8d523893bf..a04a4cabbc 100644 --- a/panda/src/sgraphutil/Sources.pp +++ b/panda/src/sgraphutil/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET sgraphutil diff --git a/panda/src/shader/Sources.pp b/panda/src/shader/Sources.pp index 9abd3c34ee..7ab94d9425 100644 --- a/panda/src/shader/Sources.pp +++ b/panda/src/shader/Sources.pp @@ -1,4 +1,4 @@ -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #define BUILDING_DLL BUILDING_SHADER diff --git a/panda/src/switchnode/Sources.pp b/panda/src/switchnode/Sources.pp index dfdc2b8e1b..837d2bf674 100644 --- a/panda/src/switchnode/Sources.pp +++ b/panda/src/switchnode/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET switchnode diff --git a/panda/src/testbed/Sources.pp b/panda/src/testbed/Sources.pp index 7977426200..fc63f5ded4 100644 --- a/panda/src/testbed/Sources.pp +++ b/panda/src/testbed/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m pystub +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m pystub #define LOCAL_LIBS \ framework putil collide loader sgmanip chan text chancfg cull \ pnmimage pnmimagetypes event effects shader graph gobj display \ diff --git a/panda/src/text/Sources.pp b/panda/src/text/Sources.pp index 1c854ef376..56b80226de 100644 --- a/panda/src/text/Sources.pp +++ b/panda/src/text/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET text diff --git a/panda/src/tform/Sources.pp b/panda/src/tform/Sources.pp index 9056871c89..0df3c29fdb 100644 --- a/panda/src/tform/Sources.pp +++ b/panda/src/tform/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET tform diff --git a/panda/src/tiff/Sources.pp b/panda/src/tiff/Sources.pp index c2ef017861..eb5e0f5f59 100644 --- a/panda/src/tiff/Sources.pp +++ b/panda/src/tiff/Sources.pp @@ -1,4 +1,4 @@ -#define OTHER_LIBS dtool +#define OTHER_LIBS dtoolconfig dtool #define LOCAL_LIBS pandabase #begin lib_target diff --git a/panda/src/vrpn/Sources.pp b/panda/src/vrpn/Sources.pp index 250c77c8ef..f982d82737 100644 --- a/panda/src/vrpn/Sources.pp +++ b/panda/src/vrpn/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_VRPN yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET pandavrpn diff --git a/panda/src/wdxdisplay/Sources.pp b/panda/src/wdxdisplay/Sources.pp index 4a5465b451..30be08016e 100644 --- a/panda/src/wdxdisplay/Sources.pp +++ b/panda/src/wdxdisplay/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_DX yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define USE_DX yes #begin lib_target diff --git a/panda/src/wgldisplay/Sources.pp b/panda/src/wgldisplay/Sources.pp index b9ad34d7c7..163788d386 100644 --- a/panda/src/wgldisplay/Sources.pp +++ b/panda/src/wgldisplay/Sources.pp @@ -1,6 +1,7 @@ #define DIRECTORY_IF_WGL yes -#define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #begin lib_target #define TARGET wgldisplay