From f07f3fb8033a7c333a882efcfc3d2dae9caedf26 Mon Sep 17 00:00:00 2001 From: Eugene Kliuchnikov Date: Mon, 25 Sep 2017 11:12:52 +0200 Subject: [PATCH] Pull brotli v1.0.0 --- Makefile | 4 ++-- brotli | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4b3bd7b..159a087 100644 --- 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 index 222564a..5b47699 160000 --- a/brotli +++ b/brotli @@ -1 +1 @@ -Subproject commit 222564a95d9ab58865a096b8d9f7324ea5f2e03e +Subproject commit 5b4769990dc14a2bd466d2599c946c5652cba4b2