From 362b10c6954ce1c16dc8249c41183d3c88c0d4f0 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 1 May 2001 22:14:53 +0000 Subject: [PATCH] *** empty log message *** --- dtool/Config.pp | 13 ++++++++++--- dtool/pptempl/Global.gmsvc.pp | 2 +- dtool/pptempl/Global.msvc.pp | 2 +- dtool/pptempl/Template.gmsvc.pp | 8 -------- dtool/pptempl/Template.msvc.pp | 8 -------- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 6e7b607292..055d73643b 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -71,8 +71,11 @@ // not taking advantage of distributed make, because of // the overhead associated with Cygwin fork() calls. // -#define BUILD_TYPE unix - +#if $[eq $[PLATFORM],Win32] + #define BUILD_TYPE msvc +#else + #define BUILD_TYPE unix +#endif // What is the default install directory for all trees in the Panda // suite? You may also override this for a particular tree by @@ -81,7 +84,11 @@ // control your attachment to the trees; in this case, the install // directory for each tree will by default be the root of the tree // itself (although this may be overridden). -#define INSTALL_DIR /usr/local/panda +#if $[eq $[PLATFORM],Win32] + #define INSTALL_DIR /pandadir +#else + #define INSTALL_DIR /usr/local/panda +#endif // What level of compiler optimization/debug symbols should we build? diff --git a/dtool/pptempl/Global.gmsvc.pp b/dtool/pptempl/Global.gmsvc.pp index b6d6f66708..02a0155dcf 100644 --- a/dtool/pptempl/Global.gmsvc.pp +++ b/dtool/pptempl/Global.gmsvc.pp @@ -74,7 +74,7 @@ #define dlllib dll #endif -#include $[DTOOL]/pptempl/compilerSettings.pp +#include $[THISDIRPREFIX]compilerSettings.pp #define WARNING_LEVEL_FLAG /W3 diff --git a/dtool/pptempl/Global.msvc.pp b/dtool/pptempl/Global.msvc.pp index 7ab2e4cdbd..77c659b5c7 100644 --- a/dtool/pptempl/Global.msvc.pp +++ b/dtool/pptempl/Global.msvc.pp @@ -76,7 +76,7 @@ #define CFLAGS_SHARED -#include $[DTOOL]/pptempl/compilerSettings.pp +#include $[THISDIRPREFIX]compilerSettings.pp #define WARNING_LEVEL_FLAG /W3 diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp index 323cfe3964..6241f7e430 100644 --- a/dtool/pptempl/Template.gmsvc.pp +++ b/dtool/pptempl/Template.gmsvc.pp @@ -36,14 +36,6 @@ #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 -// 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]] - ////////////////////////////////////////////////////////////////////// #if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]] ////////////////////////////////////////////////////////////////////// diff --git a/dtool/pptempl/Template.msvc.pp b/dtool/pptempl/Template.msvc.pp index b03d162c3d..8085f3f66c 100644 --- a/dtool/pptempl/Template.msvc.pp +++ b/dtool/pptempl/Template.msvc.pp @@ -41,14 +41,6 @@ #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 -// 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]] - ////////////////////////////////////////////////////////////////////// #if $[or $[eq $[DIR_TYPE], src],$[eq $[DIR_TYPE], metalib]] //////////////////////////////////////////////////////////////////////