From abc64b3915318b11f60777bf1001a8d08f0bfe1c Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 4 Dec 2011 16:18:14 +0000 Subject: [PATCH] explicitly link with pnmimagetypes to foil dynamic linker optimizations --- panda/src/framework/pandaFramework.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/panda/src/framework/pandaFramework.cxx b/panda/src/framework/pandaFramework.cxx index 4e66d66f8e..87284c3162 100644 --- a/panda/src/framework/pandaFramework.cxx +++ b/panda/src/framework/pandaFramework.cxx @@ -106,10 +106,6 @@ open_framework(int &argc, char **&argv) { init_libtinydisplay(); #endif - // Get the available image types too. - extern EXPCL_PANDA_PNMIMAGETYPES void init_libpnmimagetypes(); - init_libpnmimagetypes(); - // Ensure the animation subsystem is available. extern EXPCL_PANDA_CHAR void init_libchar(); init_libchar(); @@ -122,6 +118,11 @@ open_framework(int &argc, char **&argv) { #endif + // Let's explicitly make a call to the image type library to ensure + // it gets pulled in by the dynamic linker. + extern EXPCL_PANDA_PNMIMAGETYPES void init_libpnmimagetypes(); + init_libpnmimagetypes(); + reset_frame_rate(); {