DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #466 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2017-09-07 12:54:38 +02:00
committed by GitHub
parent a6a269f7ad e319fd1267
commit c4a12d9618
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/komodo.h
View File

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

9
src/util.cpp
View File

@@ -604,7 +604,14 @@ boost::filesystem::path GetConfigFile()
char confname[512]; char confname[512];
if ( ASSETCHAINS_SYMBOL[0] != 0 ) if ( ASSETCHAINS_SYMBOL[0] != 0 )
sprintf(confname,"%s.conf",ASSETCHAINS_SYMBOL); 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)); boost::filesystem::path pathConfigFile(GetArg("-conf",confname));
if (!pathConfigFile.is_complete()) if (!pathConfigFile.is_complete())
pathConfigFile = GetDataDir(false) / pathConfigFile; pathConfigFile = GetDataDir(false) / pathConfigFile;