From 9fb308d90ffd1f1ceab08ee3c3116739b04bf459 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 28 Mar 2024 11:59:48 +0200 Subject: [PATCH] make : add grammar parser to common objects --- Makefile | 6 +++--- examples/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e1e0cb98..4cf76c6a 100644 --- a/Makefile +++ b/Makefile @@ -402,7 +402,7 @@ clean: CC_SDL=`sdl2-config --cflags --libs` -SRC_COMMON = examples/common.cpp examples/common-ggml.cpp +SRC_COMMON = examples/common.cpp examples/common-ggml.cpp examples/grammar-parser.cpp SRC_COMMON_SDL = examples/common-sdl.cpp main: examples/main/main.cpp $(SRC_COMMON) $(WHISPER_OBJ) @@ -421,8 +421,8 @@ server: examples/server/server.cpp $(SRC_COMMON) $(WHISPER_OBJ) stream: examples/stream/stream.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) $(CXX) $(CXXFLAGS) examples/stream/stream.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) -o stream $(CC_SDL) $(LDFLAGS) -command: examples/command/command.cpp examples/grammar-parser.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) - $(CXX) $(CXXFLAGS) examples/command/command.cpp examples/grammar-parser.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) -o command $(CC_SDL) $(LDFLAGS) +command: examples/command/command.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) + $(CXX) $(CXXFLAGS) examples/command/command.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) -o command $(CC_SDL) $(LDFLAGS) lsp: examples/lsp/lsp.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) $(CXX) $(CXXFLAGS) examples/lsp/lsp.cpp $(SRC_COMMON) $(SRC_COMMON_SDL) $(WHISPER_OBJ) -o lsp $(CC_SDL) $(LDFLAGS) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index f59f6b76..5025cb59 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -27,6 +27,7 @@ add_library(${TARGET} STATIC common.cpp common-ggml.h common-ggml.cpp + grammar-parser.h grammar-parser.cpp )