Pull brotli v1.0.0

google · Sep 25, 2017 · f07f3fb · f07f3fb
1 parent aa283a5
commit f07f3fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 OS := $(shell uname)
 
-CPPFLAGS = -I./brotli/include/ -I./src
+CPPFLAGS = -I./brotli/c/include/ -I./src
 
 AR ?= ar
 CC ?= gcc
@@ -28,7 +28,7 @@ OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
          variable_length.o
 
 BROTLI = brotli
-BROTLIOBJ = $(BROTLI)/bin/obj
+BROTLIOBJ = $(BROTLI)/bin/obj/c
 ENCOBJ = $(BROTLIOBJ)/enc/*.o
 DECOBJ = $(BROTLIOBJ)/dec/*.o
 COMMONOBJ = $(BROTLIOBJ)/common/*.o

diff --git a/brotli b/brotli