haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix accidental oversight for linux run from build dir paths

This commit is contained in:
Marek Roszko 2021-06-21 18:05:38 -04:00
parent aadb62bd42
commit 5184908dd1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/paths.cpp
View File

@ -153,8 +153,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
fn.RemoveLastDir(); fn.RemoveLastDir();
fn.RemoveLastDir(); fn.RemoveLastDir();
path = fn.GetPath(); path = fn.GetPath();
#else #elif defined( __WXMSW__ )
path = getWindowsKiCadRoot(); path = getWindowsKiCadRoot();
#else
path = Pgm().GetExecutablePath() + wxT( ".." );
#endif #endif
} }
else else
@ -350,7 +352,7 @@ wxString PATHS::GetOSXKicadDataDir()
#ifdef __WXWINDOWS__ #ifdef __WXWINDOWS__
wxString PATHS::getWindowsKiCadRoot() wxString PATHS::getWindowsKiCadRoot()
{ {
wxFileName root(Pgm().GetExecutablePath() + "/../"); wxFileName root( Pgm().GetExecutablePath() + "/../" );
root.MakeAbsolute(); root.MakeAbsolute();
return root.GetPathWithSep(); return root.GetPathWithSep();