diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-09-06 11:42:33 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-09-06 11:42:33 +0000 |
| commit | 91337ae955764bf5e37a0939fd040026e6c605f9 (patch) | |
| tree | a367cc2e10061306c43298e912d4ef5c60200ec7 | |
| parent | 9944c4543ffc4c89b1ef44bb4961bf7b0acacbd4 (diff) | |
| download | freetype-91337ae955764bf5e37a0939fd040026e6c605f9.tar.gz | |
Update makefiles after merge of Chromium at r221681
This commit was generated by merge_from_chromium.py.
Change-Id: I9fe382a3d701989014e054d6ad48918c459e2e08
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 8921fcb..cdac6b9 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ @@ -180,6 +181,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 960d179..d131420 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ @@ -180,6 +181,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 7f74c78..0a48959 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 8921fcb..cdac6b9 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ @@ -180,6 +181,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 960d179..d131420 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ @@ -180,6 +181,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 7f74c78..0a48959 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -97,6 +97,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DANDROID' \ |