diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:28 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:28 +0100 |
| commit | bf9249c676afbcdc9f9bfda798af24e7c72e6622 (patch) | |
| tree | 1ed362120357aefb59195e98c8ad2095f370666c | |
| parent | b8577fedc03d7dfba080ce747d110db614df54e6 (diff) | |
| parent | 465c9389cd7f21adc1b8c7af740cafd57eadd8c0 (diff) | |
| download | freetype-bf9249c676afbcdc9f9bfda798af24e7c72e6622.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I7e693cbd2f0f938f28ef91c9a09a37ddd61f9360
| -rw-r--r-- | ft2.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 55cf8c2..51d39f1 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -83,6 +83,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 58c002f..324b649 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -86,6 +86,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index d4bafd1..79d3c56 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -85,6 +85,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 55cf8c2..51d39f1 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -83,6 +83,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 58c002f..324b649 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -86,6 +86,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index d4bafd1..79d3c56 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -85,6 +85,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ |