general: Move inclusion of checkPandaVersion.h to dtoolbase

CFSworks · CFSworks · commit 0ce9dc98b1d5 · 2018-05-26T18:39:24.000-06:00
This includes it everywhere, meaning developers no longer must
remember to include it in each metalib init file.
diff --git a/dtool/src/dtoolbase/dtoolbase_cc.h b/dtool/src/dtoolbase/dtoolbase_cc.h
@@ -19,6 +19,13 @@
 
 #ifdef __cplusplus
 
+// By including checkPandaVersion.h, we guarantee that runtime attempts to
+// load any DLL will fail if they inadvertently link with the wrong version of
+// dtool, which, transitively, means all DLLs must be from the same
+// (ABI-compatible) version of Panda.
+
+#include "checkPandaVersion.h"
+
 #ifdef USE_TAU
 // Tau provides this destructive version of stdbool.h that we must mask.
 #define __PDT_STDBOOL_H_
diff --git a/panda/metalibs/panda/panda.cxx b/panda/metalibs/panda/panda.cxx
@@ -14,12 +14,6 @@
 #include "config_pstatclient.h"
 #endif
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpanda.so.dll will fail if they inadvertently link with the wrong
-// version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 #if !defined(CPPPARSER) && !defined(BUILDING_LIBPANDA)
   #error Buildsystem error: BUILDING_LIBPANDA not defined
 #endif
diff --git a/panda/metalibs/pandabullet/pandabullet.cxx b/panda/metalibs/pandabullet/pandabullet.cxx
@@ -7,12 +7,6 @@
 #include "pandabullet.h"
 #include "config_bullet.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandabullet.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandadx9/pandadx9.cxx b/panda/metalibs/pandadx9/pandadx9.cxx
@@ -9,12 +9,6 @@
 #include "config_dxgsg9.h"
 #include "wdxGraphicsPipe9.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandadx9.dll will fail if they inadvertently link with the wrong
-// version of libdtool.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandaegg/pandaegg.cxx b/panda/metalibs/pandaegg/pandaegg.cxx
@@ -9,12 +9,6 @@
 #include "config_egg.h"
 #include "config_egg2pg.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandaegg.so.dll will fail if they inadvertently link with the wrong
-// version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandaegg/pandaeggnopg.cxx b/panda/metalibs/pandaegg/pandaeggnopg.cxx
@@ -8,12 +8,6 @@
 
 #include "config_egg.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandaegg.so.dll will fail if they inadvertently link with the wrong
-// version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandaexpress/pandaexpress.cxx b/panda/metalibs/pandaexpress/pandaexpress.cxx
@@ -3,9 +3,3 @@
  * @author drose
  * @date 2000-05-15
  */
-
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandaexpress.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
diff --git a/panda/metalibs/pandafx/pandafx.cxx b/panda/metalibs/pandafx/pandafx.cxx
@@ -8,12 +8,6 @@
 
 #include "config_distort.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandafx.so.dll will fail if they inadvertently link with the wrong
-// version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandagl/pandagl.cxx b/panda/metalibs/pandagl/pandagl.cxx
@@ -30,12 +30,6 @@
 #error One of HAVE_WGL, HAVE_COCOA, HAVE_CARBON or HAVE_GLX must be defined when compiling pandagl!
 #endif
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandagl.so.dll will fail if they inadvertently link with the wrong
-// version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandagles/pandagles.cxx b/panda/metalibs/pandagles/pandagles.cxx
@@ -17,12 +17,6 @@
 #include "eglGraphicsPipe.h"
 #endif
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandagles.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandagles2/pandagles2.cxx b/panda/metalibs/pandagles2/pandagles2.cxx
@@ -12,12 +12,6 @@
 #include "config_egldisplay.h"
 #include "eglGraphicsPipe.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandagles2.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandaode/pandaode.cxx b/panda/metalibs/pandaode/pandaode.cxx
@@ -7,12 +7,6 @@
 #include "pandaode.h"
 #include "config_ode.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandaode.so.dll will fail if they inadvertently link with the wrong
-// version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandaphysics/pandaphysics.cxx b/panda/metalibs/pandaphysics/pandaphysics.cxx
@@ -8,12 +8,6 @@
 #include "config_physics.h"
 #include "config_particlesystem.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandaphysics.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/metalibs/pandaphysx/pandaphysx.cxx b/panda/metalibs/pandaphysx/pandaphysx.cxx
@@ -7,12 +7,6 @@
 #include "pandaphysx.h"
 #include "config_physx.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libpandaphysx.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 /**
  * Initializes the library.  This must be called at least once before any of
  * the functions or classes in this library can be used.  Normally it will be
diff --git a/panda/src/android/pview.cxx b/panda/src/android/pview.cxx
@@ -21,12 +21,6 @@
 #include "bamCache.h"
 #include "virtualFileSystem.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to run
-// pview will fail if it inadvertently links with the wrong version of
-// libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 int main(int argc, char **argv) {
   PandaFramework framework;
   framework.open_framework(argc, argv);
diff --git a/panda/src/framework/config_framework.cxx b/panda/src/framework/config_framework.cxx
@@ -16,12 +16,6 @@
 #include "dconfig.h"
 #include "windowFramework.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to
-// load libframework.so.dll will fail if they inadvertently link with the
-// wrong version of libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 #if !defined(CPPPARSER) && !defined(BUILDING_FRAMEWORK)
   #error Buildsystem error: BUILDING_FRAMEWORK not defined
 #endif
diff --git a/panda/src/testbed/pview.cxx b/panda/src/testbed/pview.cxx
@@ -29,12 +29,6 @@
 #include "asyncTask.h"
 #include "boundingSphere.h"
 
-// By including checkPandaVersion.h, we guarantee that runtime attempts to run
-// pview will fail if it inadvertently links with the wrong version of
-// libdtool.so.dll.
-
-#include "checkPandaVersion.h"
-
 PandaFramework framework;
 
 ConfigVariableBool pview_test_hack
