Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: third_party/woff2/Makefile

Issue 1873123002: Update woff2 to 4e698b8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update BUILD.gn (win8 build fix?) Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/woff2/CONTRIBUTING.md ('k') | third_party/woff2/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/woff2/Makefile
diff --git a/third_party/woff2/Makefile b/third_party/woff2/Makefile
index 4620278828b99f21fb82ac914b05ac1bea393b82..92b8d5463b3cba84e2833b0362ff63fff45c48eb 100644
--- a/third_party/woff2/Makefile
+++ b/third_party/woff2/Makefile
@@ -5,7 +5,7 @@ CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src
CC ?= gcc
CXX ?= g++
-COMMON_FLAGS = -fno-omit-frame-pointer -no-canonical-prefixes -DFONT_COMPRESSION_BIN
+COMMON_FLAGS = -fno-omit-frame-pointer -no-canonical-prefixes -DFONT_COMPRESSION_BIN -D __STDC_FORMAT_MACROS
ifeq ($(OS), Darwin)
CPPFLAGS += -DOS_MACOSX
@@ -19,7 +19,8 @@ CXXFLAGS += $(COMMON_FLAGS) -std=c++11
SRCDIR = src
OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
- woff2_dec.o woff2_enc.o woff2_common.o variable_length.o
+ woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \
+ variable_length.o
BROTLI = brotli
ENCOBJ = $(BROTLI)/enc/*.o
@@ -30,6 +31,10 @@ EXECUTABLES=woff2_compress woff2_decompress
EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES))
+ifeq (,$(wildcard $(BROTLI)/*))
+ $(error Brotli dependency not found : you must initialize the Git submodule)
+endif
+
all : $(OBJS) $(EXECUTABLES)
$(EXECUTABLES) : $(EXE_OBJS) deps
« no previous file with comments | « third_party/woff2/CONTRIBUTING.md ('k') | third_party/woff2/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698