From 64c8285efe9ff7665a604766643a7d09138ec298 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 4 Jan 2001 22:18:42 +0000 Subject: [PATCH] *** empty log message *** --- dtool/pptempl/Template.msvc.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp index ff2babd381..40cb5c62ef 100644 --- a/dtool/pptempl/Template.msvc.pp +++ b/dtool/pptempl/Template.msvc.pp @@ -35,14 +35,17 @@ #end file #end decygwin +#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase +#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]] // cant use DTOOL_INSTALL since may not be attached -//#define dtool_ver_dir_cyg $[DTOOL_INSTALL]/src/dtoolbase +// Actually, the above should work, assuming that DTOOL is set +// correctly before building, whether we are attached or not. The +// following lines incorrectly assume that DTOOL is a sibling of the +// current tree. +//#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase //#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]] -#define dtool_ver_dir_cyg ../../../dtool/src/dtoolbase -#define dtool_ver_dir $[decygwin %,%,$[dtool_ver_dir_cyg]] - ////////////////////////////////////////////////////////////////////// #if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]] //////////////////////////////////////////////////////////////////////