SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove QUCSDIR and QUCS_LIBDIR

Browse Source
This commit is contained in:
Vadim Kuznetzov 2017-10-20 17:46:44 +03:00
parent 41779a93b8
commit 9085dd438b
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qucs/main.cpp
View File

@ -790,39 +790,26 @@ int main(int argc, char *argv[])
// continue to set up overrides or default settings (some are saved on exit)
// check for relocation env variable
char *var = NULL; // Don't use QUCSDIR with Qucs-S
QDir QucsDir;
if (var!= NULL)
{
QucsDir = QDir(QString(var));
qDebug() << "QUCSDIR set: " << QucsDir.absolutePath();
}
else
{
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
#ifdef __APPLE__
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
#else
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
#endif
}
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
#ifdef __APPLE__
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
#else
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
#endif
QucsSettings.BinDir = QucsDir.absolutePath() + "/bin/";
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
var = getenv("QUCS_LIBDIR");
if(var != NULL) {
QucsSettings.LibDir = QString(var);
}else{
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";
}
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";
QucsSettings.OctaveDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/octave/";
QucsSettings.ExamplesDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/examples/";
QucsSettings.DocDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/docs/";
QucsSettings.Editor = "qucs";
/// \todo Make the setting up of all executables below more consistent
char *var = NULL; // Don't use QUCSDIR with Qucs-S
var = getenv("QUCSATOR");
if(var != NULL) {
QucsSettings.QucsatorVar = QString(var);