Skip to content

Update brotli to v1.2.1 #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garretrieger merged 2 commits into from
Oct 28, 2026
Merged

Update brotli to v1.2.1 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0227be3
Update brotli to v1.2.1
garretrieger Oct 28, 2026
3d9b650
Fix build to work with updated brotli.
garretrieger Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
variable_length.o

BROTLI = brotli
BROTLIOBJ = $(BROTLI)/bin/obj/c
ENCOBJ = $(BROTLIOBJ)/enc/*.o
DECOBJ = $(BROTLIOBJ)/dec/*.o
COMMONOBJ = $(BROTLIOBJ)/common/*.o
ENCOBJ = $(patsubst %.c, %.o, $(wildcard $(BROTLI)/c/enc/*.c))
DECOBJ = $(patsubst %.c, %.o, $(wildcard $(BROTLI)/c/dec/*.c))
COMMONOBJ = $(patsubst %.c, %.o, $(wildcard $(BROTLI)/c/common/*.c))
BROTLI_OBJS = $(COMMONOBJ) $(ENCOBJ) $(DECOBJ)

OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ))
EXECUTABLES=woff2_compress woff2_decompress woff2_info
Expand All @@ -48,16 +48,13 @@ endif

all : $(OBJS) $(EXECUTABLES) $(ARCHIVES)

$(ARCHIVES) : $(ARCHIVE_OBJS) $(OBJS) deps
$(ARCHIVES) : $(ARCHIVE_OBJS) $(OBJS) $(BROTLI_OBJS)
$(AR) $(ARFLAGS) $(SRCDIR)/[email protected] $(OBJS) \
$(COMMONOBJ) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/[email protected]
$(BROTLI_OBJS) $(SRCDIR)/[email protected]

$(EXECUTABLES) : $(EXE_OBJS) deps
$(CXX) $(LFLAGS) $(OBJS) $(COMMONOBJ) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/[email protected] -o $@

deps :
$(MAKE) -C $(BROTLI) lib
$(EXECUTABLES) : $(EXE_OBJS) $(OBJS) $(BROTLI_OBJS)
$(CXX) $(LFLAGS) $(OBJS) $(BROTLI_OBJS) $(SRCDIR)/[email protected] -o $@

clean :
rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)
$(MAKE) -C $(BROTLI) clean
rm -f $(OBJS) $(BROTLI_OBJS) $(EXE_OBJS) $(EXECUTABLES) \
$(ARCHIVE_OBJS) $(patsubst %, $(SRCDIR)/%.a, $(ARCHIVES))
2 changes: 1 addition & 1 deletion brotli
Open in desktop
Submodule brotli updated 320 files
Loading