Skip to content

Commit 4897ff6

Browse files
committed
fix build
1 parent 5648e30 commit 4897ff6

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,6 @@ llama-server: \
14771477
examples/server/json-schema-to-grammar.mjs.hpp \
14781478
examples/server/loading.html.hpp \
14791479
common/json.hpp \
1480-
common/stb_image.h \
14811480
$(OBJ_ALL)
14821481
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
14831482
$(CXX) $(CXXFLAGS) $(filter-out %.h %.hpp $<,$^) -Iexamples/server $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(LWINSOCK2)
@@ -1500,7 +1499,6 @@ libllava.a: examples/llava/llava.cpp \
15001499
examples/llava/llava.h \
15011500
examples/llava/clip.cpp \
15021501
examples/llava/clip.h \
1503-
common/stb_image.h \
15041502
common/base64.hpp \
15051503
$(OBJ_ALL)
15061504
$(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ -Wno-cast-qual

examples/llava/clip.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "ggml-vulkan.h"
2424
#endif
2525

26-
#define STB_IMAGE_IMPLEMENTATION
26+
#include "vision.h" // without this, we get duplicated symbol error
2727
#include "stb_image.h"
2828

2929
#include <cassert>

0 commit comments

Comments
 (0)