*** empty log message ***

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

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

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

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

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

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.
+
+

dtool/src/dconfig/configTable.h

@@ -17,7 +17,7 @@
 
 namespace Config {
 
-class EXPCL_DTOOL ConfigTable {
+class EXPCL_DTOOLCONFIG ConfigTable {
    private:
       static ConfigTable* _instance;
    public:

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

dtool/src/dconfig/config_notify.h

@@ -9,7 +9,7 @@
 #include <dtoolbase.h>
 #include "dconfig.h"
 
-ConfigureDecl(config_notify, EXPCL_DTOOL, EXPTP_DTOOL);
+ConfigureDecl(config_notify, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
 
 bool get_assert_abort();
 

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 GetConfig>
 class Config {

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();

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);

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

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<SymbolEnt>);
+EXPORT_TEMPLATE_CLASS(EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG, std::vector<SymbolEnt>);
 typedef std::vector<SymbolEnt> vector_SymbolEnt;
 
 #include "symbolEnt.I"

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
 

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	\

dtool/src/interrogatedb/config_interrogatedb.h

@@ -10,7 +10,7 @@
 #include <notifyCategoryProxy.h>
 #include <dSearchPath.h>
 
-NotifyCategoryDecl(interrogatedb, EXPCL_DTOOL, EXPTP_DTOOL);
+NotifyCategoryDecl(interrogatedb, EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG);
 
 const DSearchPath &get_interrogatedb_path();
 

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
-
-
-

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 &copy);

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();
 

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 &copy);

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 &copy);

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 &copy);

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 &copy);

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 &copy);

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
 }

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

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<int>)
+EXPORT_TEMPLATE_CLASS(EXPCL_DTOOLCONFIG, EXPTP_DTOOLCONFIG, std::vector<int>)
 typedef vector<int> vector_int;
 
 // Tell GCC that we'll take care of the instantiation explicitly here.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
-

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

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

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

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

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

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
 

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
 

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

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

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

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
 

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

panda/src/shader/Sources.pp

@@ -1,4 +1,4 @@
-#define OTHER_LIBS dtool
+#define OTHER_LIBS dtoolconfig dtool
 
 #define BUILDING_DLL BUILDING_SHADER
 

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

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 \

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