TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

here we go.

Browse Source
This commit is contained in:
Cary Sandvig 2000-12-15 00:47:24 +00:00
parent d143358212
commit 5ca922b0ff
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/dconfig/configTable.I
View File

@ -70,3 +70,7 @@ INLINE void ConfigTable::ArgSuffixDefault(void) {
INLINE void ConfigTable::CommandStubDefault(void) { INLINE void ConfigTable::CommandStubDefault(void) {
commandstub = "CONFIG"; commandstub = "CONFIG";
} }
INLINE ConfigString ConfigTable::GetConfigPath(void) const {
return configpath;
}

11
dtool/src/dconfig/configTable.cxx
View File

@ -165,16 +165,15 @@ void ConfigTable::ReadConfigFile(void) {
if (microconfig_cat->is_spam()) if (microconfig_cat->is_spam())
microconfig_cat->spam() << "examining file '" << config_file << "'" microconfig_cat->spam() << "examining file '" << config_file << "'"
<< endl; << endl;
/* if (config_file.is_executable()) {
if (file_access(convert_executable_pathname(config_file), X_OK) == 0) { ConfigString line = config_file.to_os_specific() + " "
ConfigString line = config_file + " " + ExecutionEnvironment::get_binary_name(); + ExecutionEnvironment::get_binary_name();
if (microconfig_cat->is_spam()) if (microconfig_cat->is_spam())
microconfig_cat->spam() << "file is executable, running '" microconfig_cat->spam() << "file is executable, running '"
<< line << "'" << endl; << line << "'" << endl;
ipfstream ifs(line); IPipeStream ifs(line);
ParseConfigFile(ifs, config_file); ParseConfigFile(ifs, config_file);
} else } else {
*/{
if (microconfig_cat->is_spam()) if (microconfig_cat->is_spam())
microconfig_cat->spam() microconfig_cat->spam()
<< "file is not executable, reading normally" << endl; << "file is not executable, reading normally" << endl;

1
dtool/src/dconfig/configTable.h
View File

@ -73,6 +73,7 @@ class EXPCL_DTOOL ConfigTable {
SymEnt Get(const ConfigString& sym, const ConfigString qual = ""); SymEnt Get(const ConfigString& sym, const ConfigString qual = "");
const Symbol& GetSym(const ConfigString& sym, const Symbol& GetSym(const ConfigString& sym,
const ConfigString qual = ""); const ConfigString qual = "");
INLINE ConfigString GetConfigPath(void) const;
}; };
#include "configTable.I" #include "configTable.I"