--- a/src/plugins/contrib/codesnippets/codesnippetsapp.cpp +++ b/src/plugins/contrib/codesnippets/codesnippetsapp.cpp @@ -1216,7 +1216,7 @@ if(platform::windows) { - data.assign(GetAppPath()); + data = GetAppPath() + _T("/.."); } else if(platform::macosx) { --- a/src/sdk/configmanager.cpp +++ b/src/sdk/configmanager.cpp @@ -1480,7 +1480,7 @@ if (data_path_global.IsEmpty()) { if (platform::windows) - ConfigManager::data_path_global = app_path + _T("\\share\\codeblocks"); + ConfigManager::data_path_global = app_path + _T("/../share/codeblocks"); else if (platform::macosx) ConfigManager::data_path_global = res_path + _T("/share/codeblocks"); else @@ -1493,7 +1493,7 @@ if (plugin_path_global.IsEmpty()) { if (platform::windows) - ConfigManager::plugin_path_global = data_path_global; + ConfigManager::plugin_path_global = app_path + _T("/../lib/codeblocks/plugins"); else if (platform::macosx) ConfigManager::plugin_path_global = data_path_global + _T("/plugins"); else @@ -1707,7 +1707,7 @@ static wxString getCompilerPluginFilename() { if (platform::windows) - return wxT("compiler.dll"); + return wxT("libcompiler.dll"); else if (platform::darwin || platform::macosx) return wxT("libcompiler.dylib"); else --- a/src/sdk/pluginmanager.cpp +++ b/src/sdk/pluginmanager.cpp @@ -777,7 +777,7 @@ wxString actual = fname.GetFullName(); // remove 'lib' prefix from plugin name (if any) - if (!platform::windows && actual.StartsWith("lib")) + if (actual.StartsWith("lib")) actual.Remove(0, 3); actual = ConfigManager::LocateDataFile(actual, sdPluginsUser | sdDataUser | sdPluginsGlobal | sdDataGlobal); @@ -941,7 +941,7 @@ wxString actual = fname.GetFullName(); // remove 'lib' prefix from plugin name (if any) - if (!platform::windows && actual.StartsWith("lib")) + if (actual.StartsWith("lib")) actual.Remove(0, 3); actual = ConfigManager::LocateDataFile(actual, sdPluginsUser | sdDataUser | sdPluginsGlobal | sdDataGlobal); --- a/src/src/app.cpp +++ b/src/src/app.cpp @@ -374,7 +374,7 @@ wxString data(wxT(APP_PREFIX)); if (platform::windows) - data.assign(GetAppPath()); + data = GetAppPath() + _T("/.."); else if (platform::macosx) { data.assign(GetResourcesDir()); // CodeBlocks.app/Contents/Resources