summaryrefslogtreecommitdiff
path: root/ft2.target.darwin-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-12-05 17:58:41 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-12-05 17:58:41 +0000
commit2db2f930232981cefc080c7f456a5f2e91062132 (patch)
tree8c46f0fa2f790700ecce4b685dd2038a6abd67e9 /ft2.target.darwin-x86.mk
parentdaad0dc7c514023a11807cff0d4012cd87adbf7a (diff)
downloadfreetype-2db2f930232981cefc080c7f456a5f2e91062132.tar.gz
Update makefiles after merge of Chromium at 238989
This commit was generated by merge_from_chromium.py. Change-Id: I5b29315d9de4aa80d7ee93b7ed410d8714c7eb76
Diffstat (limited to 'ft2.target.darwin-x86.mk')
-rw-r--r--ft2.target.darwin-x86.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 8f7b071..1a01141 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -84,10 +84,10 @@ MY_CFLAGS_Debug := \
MY_DEFS_Debug := \
'-DANGLE_DX11' \
+ '-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DV8_DEPRECATION_WARNINGS' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
@@ -175,10 +175,10 @@ MY_CFLAGS_Release := \
MY_DEFS_Release := \
'-DANGLE_DX11' \
+ '-DV8_DEPRECATION_WARNINGS' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
- '-DV8_DEPRECATION_WARNINGS' \
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \