From 3a41895780387b435620583762f9f6aeccc246d7 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 17 Apr 2009 22:18:46 +0000
Subject: [PATCH] remove LINK_IN_GL etc.

---
 dtool/Config.pp                              |  7 ------
 dtool/LocalSetup.pp                          |  6 -----
 panda/metalibs/panda/Sources.pp              | 12 ----------
 panda/metalibs/panda/panda.cxx               | 24 --------------------
 panda/metalibs/pandagl/Sources.pp            | 10 +++-----
 panda/metalibs/pandaphysics/Sources.pp       |  8 ++-----
 panda/metalibs/pandaphysics/pandaphysics.cxx |  5 ----
 7 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/dtool/Config.pp b/dtool/Config.pp
index 17b6611ab1..45c1810267 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -883,13 +883,6 @@
 // on Windows.  Some Windows compilers may not support this syntax.
 #defer EXPORT_TEMPLATES yes
 
-// Define this to explicitly link in the various external drivers, which
-// are normally separate, as part of the Panda library.
-//#define LINK_IN_GL yes
-//#define LINK_IN_DX yes
-//#define LINK_IN_EGG yes
-//#define LINK_IN_PHYSICS yes
-
 // Define USE_COMPILER to switch the particular compiler that should
 // be used.  A handful of tokens are recognized, depending on BUILD_TYPE.
 // This may also be further customized within Global.$[BUILD_TYPE].pp.
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index f0e4af5de2..616f4015a5 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -380,12 +380,6 @@ $[cdefine NOTIFY_DEBUG]
    makes sense to MSVC++. */
 $[cdefine EXPORT_TEMPLATES]
 
-/* Define if we are linking PANDAGL in with PANDA. */
-$[cdefine LINK_IN_GL]
-
-/* Define if we are linking PANDAPHYSICS in with PANDA. */
-$[cdefine LINK_IN_PHYSICS]
-
 /* The compiled-in character(s) to expect to separate different
    components of a path list (e.g. $PRC_PATH). */
 # define DEFAULT_PATHSEP "$[DEFAULT_PATHSEP]"
diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp
index 7f151728b0..4c709336f5 100644
--- a/panda/metalibs/panda/Sources.pp
+++ b/panda/metalibs/panda/Sources.pp
@@ -26,18 +26,6 @@
   interrogatedb:c dconfig:c dtoolconfig:m \
   dtoolutil:c dtoolbase:c dtool:m prc:c
 
-#if $[LINK_IN_GL]
-  #define BUILDING_DLL $[BUILDING_DLL] BUILDING_PANDAGL
-  #define COMPONENT_LIBS $[COMPONENT_LIBS] \
-    glgsg glxdisplay wgldisplay
-#endif
-
-#if $[LINK_IN_PHYSICS]
-  #define BUILDING_DLL $[BUILDING_DLL] BUILDING_PANDAPHYSICS
-  #define COMPONENT_LIBS $[COMPONENT_LIBS] \
-    physics particlesystem
-#endif
-
 #begin metalib_target
   #define TARGET panda
 
diff --git a/panda/metalibs/panda/panda.cxx b/panda/metalibs/panda/panda.cxx
index d55b76a973..6e2a9bcfaa 100644
--- a/panda/metalibs/panda/panda.cxx
+++ b/panda/metalibs/panda/panda.cxx
@@ -13,18 +13,6 @@
 #include "config_pstats.h"
 #endif
 
-#ifdef LINK_IN_GL
-#include "config_glgsg.h"
-#ifdef HAVE_WGL
-#include "config_wgldisplay.h"
-#endif
-#endif
-
-#ifdef LINK_IN_PHYSICS
-#include "config_physics.h"
-#include "config_particlesystem.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.
@@ -48,16 +36,4 @@ init_libpanda() {
 #ifdef DO_PSTATS
   init_libpstatclient();
 #endif
-
-#ifdef LINK_IN_GL
-  init_libglgsg();
-#ifdef HAVE_WGL
-  init_libwgldisplay();
-#endif
-#endif
-
-#ifdef LINK_IN_PHYSICS
-  init_libphysics();
-  init_libparticlesystem();
-#endif
 }
diff --git a/panda/metalibs/pandagl/Sources.pp b/panda/metalibs/pandagl/Sources.pp
index 059b5bc6bf..b0a943c2af 100644
--- a/panda/metalibs/pandagl/Sources.pp
+++ b/panda/metalibs/pandagl/Sources.pp
@@ -8,13 +8,9 @@
 #define BUILDING_DLL BUILDING_PANDAGL
 #define BUILD_DIRECTORY $[HAVE_GL]
 
-#if $[eq $[LINK_IN_GL],]
-  // We don't have any components if we're linking the GL library
-  // directly into Panda.
-  #define COMPONENT_LIBS \
-      glgsg glxdisplay  \
-      wgldisplay osxdisplay
-#endif
+#define COMPONENT_LIBS \
+    glgsg glxdisplay  \
+    wgldisplay osxdisplay
 
 #define LOCAL_LIBS gsgbase display express
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp
index cd1814c63e..53ec7f5e29 100644
--- a/panda/metalibs/pandaphysics/Sources.pp
+++ b/panda/metalibs/pandaphysics/Sources.pp
@@ -7,12 +7,8 @@
 #define DIR_TYPE metalib
 #define BUILDING_DLL BUILDING_PANDAPHYSICS
 
-#if $[eq $[LINK_IN_PHYSICS],]
-  // We don't have any components if we're linking the Physics library
-  // directly into Panda.
-  #define COMPONENT_LIBS \
-      physics particlesystem
-#endif
+#define COMPONENT_LIBS \
+    physics particlesystem
 
 #define LOCAL_LIBS linmath putil express
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
diff --git a/panda/metalibs/pandaphysics/pandaphysics.cxx b/panda/metalibs/pandaphysics/pandaphysics.cxx
index cca2e1aa8d..4f46a4297a 100644
--- a/panda/metalibs/pandaphysics/pandaphysics.cxx
+++ b/panda/metalibs/pandaphysics/pandaphysics.cxx
@@ -4,11 +4,8 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pandaphysics.h"
-
-#ifndef LINK_IN_PHYSICS
 #include "config_physics.h"
 #include "config_particlesystem.h"
-#endif
 
 // By including checkPandaVersion.h, we guarantee that runtime
 // attempts to load libpandaphysics.so/.dll will fail if they
@@ -26,8 +23,6 @@
 ////////////////////////////////////////////////////////////////////
 void
 init_libpandaphysics() {
-#ifndef LINK_IN_PHYSICS
   init_libphysics();
   init_libparticlesystem();
-#endif
 }