luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed inclusion of APPDATA into search path on Windows - this was pulling DLLs from other installations.

This commit is contained in:
Matthias Koefferlein 2021-02-02 22:31:22 +01:00
parent 47777b7eba
commit 8e7d571c2c
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lay/lay/laySystemPaths.cc
View File

@ -55,28 +55,6 @@ get_appdata_path ()
return tl::to_string (appdata_dir.absoluteFilePath (appdata_folder)); return tl::to_string (appdata_dir.absoluteFilePath (appdata_folder));
} }
#ifdef _WIN32
static void
get_other_system_paths (std::vector <std::string> &p)
{
// Use "Application Data" if it exists on Windows
const wchar_t *appdata_env = 0;
if ((appdata_env = _wgetenv (L"APPDATA")) != 0) {
QDir appdata_dir = QString ((const QChar *) appdata_env);
QString appdata_folder = QString::fromUtf8 ("KLayout");
if (appdata_dir.exists () && appdata_dir.exists (appdata_folder)) {
p.push_back (tl::to_string (appdata_dir.absoluteFilePath (appdata_folder)));
}
}
}
#else
static void
get_other_system_paths (std::vector <std::string> &)
{
// .. nothing yet ..
}
#endif
static void static void
split_path (const std::string &path, std::vector <std::string> &pc) split_path (const std::string &path, std::vector <std::string> &pc)
{ {
@ -129,7 +107,6 @@ get_klayout_path ()
if (! env.empty ()) { if (! env.empty ()) {
split_path (env, klayout_path); split_path (env, klayout_path);
} else { } else {
get_other_system_paths (klayout_path);
klayout_path.push_back (tl::get_inst_path ()); klayout_path.push_back (tl::get_inst_path ());
} }