summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-12-02 22:03:58 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-12-02 22:03:58 +0000
commitfeff10e334171f8c40c472f116726c203efb4607 (patch)
tree67ac7babc73a7f6887b1aca2ccc464940331ba1c
parentcac4ad2d98a25b3462382d0a513589369e461066 (diff)
downloadfreetype-feff10e334171f8c40c472f116726c203efb4607.tar.gz
Update makefiles after merge of Chromium at 238197
This commit was generated by merge_from_chromium.py. Change-Id: I252cc0ada443409795f0bdbb124ca8285128d309
-rw-r--r--ft2.target.darwin-arm.mk2
-rw-r--r--ft2.target.darwin-mips.mk2
-rw-r--r--ft2.target.darwin-x86.mk2
-rw-r--r--ft2.target.linux-arm.mk2
-rw-r--r--ft2.target.linux-mips.mk2
-rw-r--r--ft2.target.linux-x86.mk2
6 files changed, 12 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 1e6ccdb..7e2f951 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -95,6 +95,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
@@ -181,6 +182,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 29ccb26..211d47e 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -95,6 +95,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
@@ -181,6 +182,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index f3cccda..52a8b87 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -97,6 +97,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
@@ -186,6 +187,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 1e6ccdb..7e2f951 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -95,6 +95,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
@@ -181,6 +182,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 29ccb26..211d47e 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -95,6 +95,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
@@ -181,6 +182,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index f3cccda..52a8b87 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -97,6 +97,7 @@ MY_DEFS_Debug := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
@@ -186,6 +187,7 @@ MY_DEFS_Release := \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \