diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index df69174080..4153742161 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -864,6 +864,7 @@ DTOOL_CONFIG=[
     ("HAVE_FFTW",                      'UNDEF',                  'UNDEF'),
     ("HAVE_OPENSSL",                   'UNDEF',                  'UNDEF'),
     ("HAVE_NET",                       'UNDEF',                  'UNDEF'),
+    ("HAVE_EGG",                       '1',                      '1'),
     ("HAVE_CG",                        'UNDEF',                  'UNDEF'),
     ("HAVE_CGGL",                      'UNDEF',                  'UNDEF'),
     ("HAVE_CGDX9",                     'UNDEF',                  'UNDEF'),
diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp
index 73e302bc4b..eb89a1b655 100644
--- a/panda/metalibs/pandaegg/Sources.pp
+++ b/panda/metalibs/pandaegg/Sources.pp
@@ -5,6 +5,7 @@
 // under Windows).
 
 #define DIR_TYPE metalib
+#define BUILD_DIRECTORY $[HAVE_EGG]
 #define BUILDING_DLL BUILDING_PANDAEGG
 
 #define COMPONENT_LIBS \
diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp
index 82f3f0a11c..ee9801d8d7 100644
--- a/panda/src/egg/Sources.pp
+++ b/panda/src/egg/Sources.pp
@@ -1,3 +1,5 @@
+#define BUILD_DIRECTORY $[HAVE_EGG]
+
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m prc:c
 #define YACC_PREFIX eggyy
diff --git a/panda/src/egg2pg/Sources.pp b/panda/src/egg2pg/Sources.pp
index ab2fe7025e..e686438e4f 100644
--- a/panda/src/egg2pg/Sources.pp
+++ b/panda/src/egg2pg/Sources.pp
@@ -1,3 +1,5 @@
+#define BUILD_DIRECTORY $[HAVE_EGG]
+
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m prc:c
 
diff --git a/panda/src/framework/Sources.pp b/panda/src/framework/Sources.pp
index 251c795e9a..24bb849e60 100644
--- a/panda/src/framework/Sources.pp
+++ b/panda/src/framework/Sources.pp
@@ -6,7 +6,7 @@
   #define BUILDING_DLL BUILDING_FRAMEWORK
   #define LOCAL_LIBS \
     recorder pgui pgraph putil collide chan text \
-    pnmimage pnmimagetypes event
+    pnmimage pnmimagetypes event char
 
 #if $[LINK_ALL_STATIC]
   // If we're statically linking, we need to explicitly link with
@@ -22,7 +22,9 @@
   #endif
 
   // And we might like to have the egg loader available.
-  #define LOCAL_LIBS pandaegg $[LOCAL_LIBS]
+  #if $[HAVE_EGG]
+    #define LOCAL_LIBS pandaegg $[LOCAL_LIBS]
+  #endif
 #endif
 
 
diff --git a/panda/src/framework/pandaFramework.cxx b/panda/src/framework/pandaFramework.cxx
index 02d0f6beb2..cf098a765b 100644
--- a/panda/src/framework/pandaFramework.cxx
+++ b/panda/src/framework/pandaFramework.cxx
@@ -106,9 +106,15 @@ open_framework(int &argc, char **&argv) {
   extern EXPCL_PANDA_PNMIMAGETYPES void init_libpnmimagetypes();
   init_libpnmimagetypes();
 
+  // Ensure the animation subsystem is available.
+  extern EXPCL_PANDA_CHAR void init_libchar();
+  init_libchar();
+
   // We also want the egg loader.
+  #ifdef HAVE_EGG
   extern EXPCL_PANDAEGG void init_libpandaegg();
   init_libpandaegg();
+  #endif
 
 #endif