From 44058ed4338a3396e0b12d12fd45fa2bb66d7310 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 22 Jun 2009 21:56:49 +0000 Subject: [PATCH] one more osx fix --- dtool/pptempl/Global.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index f34ccc3395..341aad7613 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -482,7 +482,10 @@ // into a dylib *and* a bundle. #defer bundle_ext $[BUNDLE_EXT] #defer link_as_bundle $[and $[OSX_PLATFORM],$[LINK_AS_BUNDLE]] -#defer link_extra_bundle $[and $[OSX_PLATFORM],$[LINK_EXTRA_BUNDLE],$[not $[LINK_AS_BUNDLE]]] +//#defer link_extra_bundle $[and $[OSX_PLATFORM],$[LINK_EXTRA_BUNDLE],$[not $[LINK_AS_BUNDLE]]] + +// temp hack for people with old OSXTOOLS. +#defer link_extra_bundle $[and $[OSX_PLATFORM],$[or $[LINK_EXTRA_BUNDLE],$[BUNDLE_EXT]],$[not $[LINK_AS_BUNDLE]]] // The default library extension various based on the OS. #defer dynamic_lib_ext $[DYNAMIC_LIB_EXT]