TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

allowing explicit paths

Browse Source
This commit is contained in:
Dave Schuyler 2005-07-01 23:05:40 +00:00
parent f2b122e218
commit 6ad0abbb8f
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/Package.pp
View File

@ -20,7 +20,9 @@
// Where should we find the PANDA source directory? // Where should we find the PANDA source directory?
#if $[or $[CTPROJS],$[PANDA]] #if $[PANDA_SOURCE]
#define PANDA_SOURCE $[unixfilename $[PANDA_SOURCE]]
#elif $[or $[CTPROJS],$[PANDA]]
// If we are presently attached, use the environment variable. // If we are presently attached, use the environment variable.
#define PANDA_SOURCE $[unixfilename $[PANDA]] #define PANDA_SOURCE $[unixfilename $[PANDA]]
#if $[eq $[PANDA],] #if $[eq $[PANDA],]
@ -33,7 +35,10 @@
#endif #endif
// Where should we install DIRECT? // Where should we install DIRECT?
#if $[or $[CTPROJS],$[DIRECT]] #if $[DIRECT_INSTALL]
#define DIRECT_INSTALL $[DIRECT_INSTALL]
#define DIRECT_INSTALL_OTHER $(DIRECT_INSTALL)
#elif $[or $[CTPROJS],$[DIRECT]]
#set DIRECT $[unixfilename $[DIRECT]] #set DIRECT $[unixfilename $[DIRECT]]
#define DIRECT_INSTALL $[DIRECT] #define DIRECT_INSTALL $[DIRECT]
#define DIRECT_INSTALL_OTHER $(DIRECT) #define DIRECT_INSTALL_OTHER $(DIRECT)
@ -47,7 +52,8 @@
// Also get the PANDA Package file and everything that includes. // Also get the PANDA Package file and everything that includes.
#if $[not $[isfile $[PANDA_SOURCE]/Package.pp]] #if $[not $[isfile $[PANDA_SOURCE]/Package.pp]]
#error PANDA source directory not found! Are you attached properly? #printvar PANDA_SOURCE
#error PANDA source directory not found from direct! Are you attached properly?
#endif #endif
#include $[PANDA_SOURCE]/Package.pp #include $[PANDA_SOURCE]/Package.pp

10
dtool/Package.pp
View File

@ -31,7 +31,11 @@
#endif #endif
// Where should we install DTOOL, specifically? // Where should we install DTOOL, specifically?
#if $[or $[CTPROJS],$[DTOOL]] #if $[DTOOL_INSTALL]
#set DTOOL $[unixfilename $[DTOOL_INSTALL]]
#define DTOOL_INSTALL $[DTOOL]
#define DTOOL_INSTALL_OTHER $(DTOOL)
#elif $[or $[CTPROJS],$[DTOOL]]
// If we are presently attached, use the environment variable. // If we are presently attached, use the environment variable.
// We define two variables: one for ourselves, which burns in the // We define two variables: one for ourselves, which burns in the
// current value of the DTOOL environment variable (so that any // current value of the DTOOL environment variable (so that any
@ -85,14 +89,14 @@
// above. // above.
#if $[ne $[PPREMAKE_CONFIG],] #if $[ne $[PPREMAKE_CONFIG],]
#define PPREMAKE_CONFIG $[unixfilename $[PPREMAKE_CONFIG]] #define PPREMAKE_CONFIG $[unixfilename $[PPREMAKE_CONFIG]]
#print Reading $[PPREMAKE_CONFIG] #print Reading $[PPREMAKE_CONFIG] (referred to by PPREMAKE_CONFIG)
#include $[PPREMAKE_CONFIG] #include $[PPREMAKE_CONFIG]
#elif $[wildcard $[unixfilename $[INSTALL_DIR]]/Config.pp] #elif $[wildcard $[unixfilename $[INSTALL_DIR]]/Config.pp]
// If the PPREMAKE_CONFIG variable is not, but there exists a // If the PPREMAKE_CONFIG variable is not, but there exists a
// Config.pp in the compiled-in INSTALL_DIR, use that one by default. // Config.pp in the compiled-in INSTALL_DIR, use that one by default.
#define PPREMAKE_CONFIG $[unixfilename $[INSTALL_DIR]]/Config.pp #define PPREMAKE_CONFIG $[unixfilename $[INSTALL_DIR]]/Config.pp
#print Reading $[PPREMAKE_CONFIG] #print Reading $[PPREMAKE_CONFIG] (referred to by INSTALL_DIR, because PPREMAKE_CONFIG is empty)
#include $[PPREMAKE_CONFIG] #include $[PPREMAKE_CONFIG]
#else #else

12
panda/Package.pp
View File

@ -20,7 +20,9 @@
// Where should we find the DTOOL source directory? // Where should we find the DTOOL source directory?
#if $[or $[CTPROJS],$[DTOOL]] #if $[DTOOL_SOURCE]
#define DTOOL_SOURCE $[unixfilename $[DTOOL_SOURCE]]
#elif $[or $[CTPROJS],$[DTOOL]]
// If we are presently attached, use the environment variable. // If we are presently attached, use the environment variable.
#define DTOOL_SOURCE $[unixfilename $[DTOOL]] #define DTOOL_SOURCE $[unixfilename $[DTOOL]]
#if $[eq $[DTOOL],] #if $[eq $[DTOOL],]
@ -33,7 +35,10 @@
#endif #endif
// Where should we install PANDA? // Where should we install PANDA?
#if $[or $[CTPROJS],$[PANDA]] #if $[PANDA_INSTALL]
#define PANDA_INSTALL $[PANDA_INSTALL]
#define PANDA_INSTALL_OTHER $(PANDA_INSTALL)
#elif $[or $[CTPROJS],$[PANDA]]
#set PANDA $[unixfilename $[PANDA]] #set PANDA $[unixfilename $[PANDA]]
#define PANDA_INSTALL $[PANDA] #define PANDA_INSTALL $[PANDA]
#define PANDA_INSTALL_OTHER $(PANDA) #define PANDA_INSTALL_OTHER $(PANDA)
@ -47,7 +52,8 @@
// Also get the DTOOL Package file and everything that includes. // Also get the DTOOL Package file and everything that includes.
#if $[not $[isfile $[DTOOL_SOURCE]/Package.pp]] #if $[not $[isfile $[DTOOL_SOURCE]/Package.pp]]
#error DTOOL source directory not found! Are you attached properly? #printvar DTOOL_SOURCE
#error DTOOL source directory not found from panda! Are you attached properly?
#endif #endif
#include $[DTOOL_SOURCE]/Package.pp #include $[DTOOL_SOURCE]/Package.pp