1 --- kicad-5.0.0/3d-viewer/3d_plugin_dir.h.in.orig 2018-08-15 21:40:42.199391486 +0200
2 +++ kicad-5.0.0/3d-viewer/3d_plugin_dir.h.in 2018-08-15 21:40:57.405953832 +0200
4 -#define PLUGINDIR "@CMAKE_INSTALL_LIBDIR@"
5 +#define PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@"
6 --- kicad-5.0.0/3d-viewer/3d_cache/3d_plugin_manager.cpp.orig 2018-07-13 21:53:52.000000000 +0200
7 +++ kicad-5.0.0/3d-viewer/3d_cache/3d_plugin_manager.cpp 2018-08-15 21:44:37.981095083 +0200
12 - // multiarch friendly determination of the plugin directory: the executable dir
13 - // is first determined via wxStandardPaths::Get().GetExecutablePath() and then
14 - // the CMAKE_INSTALL_LIBDIR path is appended relative to the executable dir.
16 - fn.Assign( wxStandardPaths::Get().GetExecutablePath() );
18 - wxString tfname = fn.GetPathWithSep();
19 - tfname.Append( wxString::FromUTF8Unchecked( PLUGINDIR ) );
20 - fn.Assign( tfname, "");
21 + fn.Assign( wxString::FromUTF8Unchecked( PLUGINDIR ), "");
22 fn.AppendDir( "kicad" );
24 // on windows the plugins directory is within the executable's directory