diff --git a/bin/assets/plugins/aiassistant.json b/bin/assets/plugins/aiassistant.json index 7e939d607..0f3df03cb 100644 --- a/bin/assets/plugins/aiassistant.json +++ b/bin/assets/plugins/aiassistant.json @@ -490,6 +490,11 @@ "display_name": "kimi-k2.5" } ] + }, + "llama.cpp": { + "api_url": "http://localhost:8080/api/chat", + "fetch_models_url": "http://localhost:8080/api/tags", + "open_api": true } } } diff --git a/premake5.lua b/premake5.lua index 9d5837496..baad33e4e 100644 --- a/premake5.lua +++ b/premake5.lua @@ -410,7 +410,11 @@ function build_link_configuration( package_name, use_ee_icon ) filter { "system:bsd" } if package_name ~= "eepp" and package_name ~= "eepp-static" then - flags { "RelativeLinks" } + if type(userelativelinks) == "function" then + userelativelinks "On" + else + flags { "RelativeLinks" } + end end filter { "system:windows", "action:not vs*", "architecture:x86" } @@ -957,7 +961,11 @@ workspace "eepp" symbols "On" filter { "system:windows", "action:vs*" } - flags { "MultiProcessorCompile" } + if type(multiprocessorcompile) == "function" then + multiprocessorcompile "On" + else + flags { "MultiProcessorCompile" } + end disablewarnings{ "4305", "4146", "4996", "4244", "4267" } filter "system:bsd" diff --git a/src/tools/ecode/plugins/aiassistant/aiassistantplugin.cpp b/src/tools/ecode/plugins/aiassistant/aiassistantplugin.cpp index dfade78f1..ce6a0241b 100644 --- a/src/tools/ecode/plugins/aiassistant/aiassistantplugin.cpp +++ b/src/tools/ecode/plugins/aiassistant/aiassistantplugin.cpp @@ -178,7 +178,7 @@ void AIAssistantPlugin::load( PluginManager* pluginManager ) { path = pluginManager->getPluginsPath() + "aiassistant.json"; if ( FileSystem::fileExists( path ) || FileSystem::fileWrite( - path, "{\n\"config\":{},\n \"keybindings\":{},\n\"providers\":[]\n}\n" ) ) { + path, "{\n\"config\":{},\n \"keybindings\":{},\n\"providers\":{}\n}\n" ) ) { mConfigPath = path; paths.emplace_back( path ); }