Merge pull request #466 from jl777/dev

Dev
This commit is contained in:
jl777
2017-09-07 12:54:38 +02:00
committed by GitHub
2 changed files with 12 additions and 1 deletions

View File

@@ -16,6 +16,10 @@
#ifndef H_KOMODO_H
#define H_KOMODO_H
#ifdef _WIN32
#define printf(...)
#endif
// Todo:
// verify: reorgs

View File

@@ -604,7 +604,14 @@ boost::filesystem::path GetConfigFile()
char confname[512];
if ( ASSETCHAINS_SYMBOL[0] != 0 )
sprintf(confname,"%s.conf",ASSETCHAINS_SYMBOL);
else strcpy(confname,"komodo.conf");
else
{
#ifdef __APPLE__
strcpy(confname,"Komodo.conf");
#else
strcpy(confname,"komodo.conf");
#endif
}
boost::filesystem::path pathConfigFile(GetArg("-conf",confname));
if (!pathConfigFile.is_complete())
pathConfigFile = GetDataDir(false) / pathConfigFile;