From b809994360791276a8feba04f53531cfe0c2111a Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Sun, 14 Jun 2026 15:06:37 +0800 Subject: [PATCH] can build llama server now --- Makefile | 2 +- tools/server/server-http.cpp | 2 +- tools/server/ui.cpp | 10 ++++++++++ tools/server/ui.h | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 tools/server/ui.cpp create mode 100644 tools/server/ui.h diff --git a/Makefile b/Makefile index 1fe86f817..6f264a3c6 100644 --- a/Makefile +++ b/Makefile @@ -730,7 +730,7 @@ otherarch/sdcpp/thirdparty/zip.o: otherarch/sdcpp/thirdparty/zip.c OBJS_SDTYPE := otherarch/sdcpp/sdtype_adapter.o $(OBJS_SDCOMMON) -LLAMASERVER_SRCS := tools/server/main.cpp tools/server/server.cpp tools/server/server-chat.cpp tools/server/server-common.cpp tools/server/server-context.cpp tools/server/server-http.cpp tools/server/server-models.cpp tools/server/server-queue.cpp tools/server/server-task.cpp tools/server/server-tools.cpp +LLAMASERVER_SRCS := tools/server/main.cpp tools/server/server.cpp tools/server/server-chat.cpp tools/server/server-common.cpp tools/server/server-context.cpp tools/server/server-http.cpp tools/server/server-models.cpp tools/server/server-queue.cpp tools/server/server-task.cpp tools/server/server-tools.cpp tools/server/ui.cpp LLAMASERVER_COMMON_SRCS := common/arg.cpp common/chat.cpp common/preset.cpp common/download.cpp vendor/cpp-httplib/httplib.cpp LLAMASERVER_CXXFLAGS := -I./tools/mtmd diff --git a/tools/server/server-http.cpp b/tools/server/server-http.cpp index 98443cac3..3c58fcfec 100644 --- a/tools/server/server-http.cpp +++ b/tools/server/server-http.cpp @@ -1,7 +1,7 @@ #include "common.h" #include "server-http.h" #include "server-common.h" -// #include "ui.h" +#include "ui.h" #include diff --git a/tools/server/ui.cpp b/tools/server/ui.cpp new file mode 100644 index 000000000..a0577f053 --- /dev/null +++ b/tools/server/ui.cpp @@ -0,0 +1,10 @@ +#include "ui.h" + +const llama_ui_asset * llama_ui_find_asset(const std::string &) { + return nullptr; +} +const std::array & llama_ui_get_assets() { + static const std::array empty{}; + return empty; +} +bool llama_ui_use_gzip() { return false; } diff --git a/tools/server/ui.h b/tools/server/ui.h new file mode 100644 index 000000000..fbcaaaea8 --- /dev/null +++ b/tools/server/ui.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include + +struct llama_ui_asset { + std::string name; + const unsigned char * data; + std::size_t size; + std::string etag; + std::string type; +}; + +const llama_ui_asset * llama_ui_find_asset(const std::string & name); +bool llama_ui_use_gzip(); +const std::array & llama_ui_get_assets();