mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
make ctattach behavior only when ctprojs defined
This commit is contained in:
parent
2034bd25bb
commit
df2e738dfe
@ -37,7 +37,7 @@
|
|||||||
// Where should we install DIRECT?
|
// Where should we install DIRECT?
|
||||||
#if $[DIRECT_INSTALL]
|
#if $[DIRECT_INSTALL]
|
||||||
#define DIRECT_INSTALL $[unixfilename $[DIRECT_INSTALL]]
|
#define DIRECT_INSTALL $[unixfilename $[DIRECT_INSTALL]]
|
||||||
#elif $[or $[CTPROJS],$[DIRECT]]
|
#elif $[CTPROJS]
|
||||||
#set DIRECT $[unixfilename $[DIRECT]]
|
#set DIRECT $[unixfilename $[DIRECT]]
|
||||||
#define DIRECT_INSTALL $[DIRECT]/built
|
#define DIRECT_INSTALL $[DIRECT]/built
|
||||||
#if $[eq $[DIRECT],]
|
#if $[eq $[DIRECT],]
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
// Where should we install DTOOL, specifically?
|
// Where should we install DTOOL, specifically?
|
||||||
#if $[DTOOL_INSTALL]
|
#if $[DTOOL_INSTALL]
|
||||||
#define DTOOL_INSTALL $[unixfilename $[DTOOL_INSTALL]]
|
#define DTOOL_INSTALL $[unixfilename $[DTOOL_INSTALL]]
|
||||||
#elif $[or $[CTPROJS],$[DTOOL]]
|
#elif $[CTPROJS]
|
||||||
// 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
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
// Where should we install PANDA?
|
// Where should we install PANDA?
|
||||||
#if $[PANDA_INSTALL]
|
#if $[PANDA_INSTALL]
|
||||||
#define PANDA_INSTALL $[unixfilename $[PANDA_INSTALL]]
|
#define PANDA_INSTALL $[unixfilename $[PANDA_INSTALL]]
|
||||||
#elif $[or $[CTPROJS],$[PANDA]]
|
#elif $[CTPROJS]
|
||||||
#set PANDA $[unixfilename $[PANDA]]
|
#set PANDA $[unixfilename $[PANDA]]
|
||||||
#define PANDA_INSTALL $[PANDA]/built
|
#define PANDA_INSTALL $[PANDA]/built
|
||||||
#if $[eq $[PANDA],]
|
#if $[eq $[PANDA],]
|
||||||
|
@ -35,15 +35,15 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Where should we install PANDAAPP?
|
// Where should we install PANDAAPP?
|
||||||
#if $[or $[CTPROJS],$[PANDAAPP]]
|
#if $[PANDAAPP_INSTALL]
|
||||||
|
#define PANDAAPP_INSTALL $[unixfilename $[PANDAAPP_INSTALL]]
|
||||||
|
#elif $[CTPROJS]
|
||||||
#define PANDAAPP_INSTALL $[PANDAAPP]/built
|
#define PANDAAPP_INSTALL $[PANDAAPP]/built
|
||||||
#define PANDAAPP_INSTALL_OTHER $(PANDAAPP)
|
|
||||||
#if $[eq $[PANDAAPP],]
|
#if $[eq $[PANDAAPP],]
|
||||||
#error You seem to be attached to some trees, but not PANDAAPP!
|
#error You seem to be attached to some trees, but not PANDAAPP!
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#defer PANDAAPP_INSTALL $[unixfilename $[INSTALL_DIR]]
|
#defer PANDAAPP_INSTALL $[unixfilename $[INSTALL_DIR]]
|
||||||
#defer PANDAAPP_INSTALL_OTHER $[unixfilename $[INSTALL_DIR]]
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Also get the PANDATOOL Package file and everything that includes.
|
// Also get the PANDATOOL Package file and everything that includes.
|
||||||
|
@ -35,7 +35,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Where should we install PANDATOOL?
|
// Where should we install PANDATOOL?
|
||||||
#if $[or $[CTPROJS],$[PANDATOOL]]
|
#if $[PANDATOOL_INSTALL]
|
||||||
|
#define PANDATOOL_INSTALL $[unixfilename $[PANDATOOL_INSTALL]]
|
||||||
|
#elif $[CTPROJS]
|
||||||
#set PANDATOOL $[unixfilename $[PANDATOOL]]
|
#set PANDATOOL $[unixfilename $[PANDATOOL]]
|
||||||
#define PANDATOOL_INSTALL $[PANDATOOL]/built
|
#define PANDATOOL_INSTALL $[PANDATOOL]/built
|
||||||
#if $[eq $[PANDATOOL],]
|
#if $[eq $[PANDATOOL],]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user