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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « third_party/woff2/CONTRIBUTING.md ('k') | third_party/woff2/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 OS := $(shell uname) 1 OS := $(shell uname)
2 2
3 CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src 3 CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src
4 4
5 CC ?= gcc 5 CC ?= gcc
6 CXX ?= g++ 6 CXX ?= g++
7 7
8 COMMON_FLAGS = -fno-omit-frame-pointer -no-canonical-prefixes -DFONT_COMPRESSION _BIN 8 COMMON_FLAGS = -fno-omit-frame-pointer -no-canonical-prefixes -DFONT_COMPRESSION _BIN -D __STDC_FORMAT_MACROS
9 9
10 ifeq ($(OS), Darwin) 10 ifeq ($(OS), Darwin)
11 CPPFLAGS += -DOS_MACOSX 11 CPPFLAGS += -DOS_MACOSX
12 else 12 else
13 COMMON_FLAGS += -fno-tree-vrp 13 COMMON_FLAGS += -fno-tree-vrp
14 endif 14 endif
15 15
16 CFLAGS += $(COMMON_FLAGS) 16 CFLAGS += $(COMMON_FLAGS)
17 CXXFLAGS += $(COMMON_FLAGS) -std=c++11 17 CXXFLAGS += $(COMMON_FLAGS) -std=c++11
18 18
19 SRCDIR = src 19 SRCDIR = src
20 20
21 OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \ 21 OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
22 woff2_dec.o woff2_enc.o woff2_common.o variable_length.o 22 woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \
23 variable_length.o
23 24
24 BROTLI = brotli 25 BROTLI = brotli
25 ENCOBJ = $(BROTLI)/enc/*.o 26 ENCOBJ = $(BROTLI)/enc/*.o
26 DECOBJ = $(BROTLI)/dec/*.o 27 DECOBJ = $(BROTLI)/dec/*.o
27 28
28 OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ)) 29 OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ))
29 EXECUTABLES=woff2_compress woff2_decompress 30 EXECUTABLES=woff2_compress woff2_decompress
30 31
31 EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES)) 32 EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES))
32 33
34 ifeq (,$(wildcard $(BROTLI)/*))
35 $(error Brotli dependency not found : you must initialize the Git submodule)
36 endif
37
33 all : $(OBJS) $(EXECUTABLES) 38 all : $(OBJS) $(EXECUTABLES)
34 39
35 $(EXECUTABLES) : $(EXE_OBJS) deps 40 $(EXECUTABLES) : $(EXE_OBJS) deps
36 $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@ 41 $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
37 42
38 deps : 43 deps :
39 $(MAKE) -C $(BROTLI)/dec 44 $(MAKE) -C $(BROTLI)/dec
40 $(MAKE) -C $(BROTLI)/enc 45 $(MAKE) -C $(BROTLI)/enc
41 46
42 clean : 47 clean :
43 rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES) 48 rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)
44 $(MAKE) -C $(BROTLI)/dec clean 49 $(MAKE) -C $(BROTLI)/dec clean
45 $(MAKE) -C $(BROTLI)/enc clean 50 $(MAKE) -C $(BROTLI)/enc clean
OLDNEW
« 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