mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 18:03:56 -04:00
remove implicit c:/cygwin, fix logic some more
This commit is contained in:
parent
cb2e0c46f0
commit
f488b04bc7
@ -133,12 +133,9 @@ get_panda_root() {
|
|||||||
const char *envvar = getenv("PANDA_ROOT");
|
const char *envvar = getenv("PANDA_ROOT");
|
||||||
if (envvar != (const char *)NULL) {
|
if (envvar != (const char *)NULL) {
|
||||||
panda_root = front_to_back_slash(envvar);
|
panda_root = front_to_back_slash(envvar);
|
||||||
} else if (Filename("c:/cygwin").is_directory()) {
|
|
||||||
//setenv("PANDA_ROOT", "c:/cygwin", 1);
|
|
||||||
panda_root = "c:/cygwin";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!panda_root.empty() || panda_root[panda_root.length() - 1] != '\\') {
|
if (!panda_root.empty() && panda_root[panda_root.length() - 1] != '\\') {
|
||||||
panda_root += '\\';
|
panda_root += '\\';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user