From 8c576bb549fb2757854c2827ab953b2338c0d1cf Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 14 May 2014 10:24:49 +0100 Subject: Update makefiles after merge of Chromium at 269467 This commit was generated by merge_from_chromium.py. Change-Id: I44c9bf3b064693963b928251073977622096d5f2 --- ft2.target.darwin-arm.mk | 2 ++ ft2.target.darwin-arm64.mk | 2 ++ ft2.target.darwin-mips.mk | 2 ++ ft2.target.darwin-x86.mk | 2 ++ ft2.target.darwin-x86_64.mk | 2 ++ ft2.target.linux-arm.mk | 2 ++ ft2.target.linux-arm64.mk | 2 ++ ft2.target.linux-mips.mk | 2 ++ ft2.target.linux-x86.mk | 2 ++ ft2.target.linux-x86_64.mk | 2 ++ 10 files changed, 20 insertions(+) diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 4e8aad0..c7c9a00 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -193,6 +194,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index 0ccb6b2..afc2251 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -96,6 +96,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -186,6 +187,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 7bd55fb..ce436e8 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -195,6 +196,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index b60a57c..8b12d05 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -194,6 +195,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index 64ebca0..8d7c98b 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -194,6 +195,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 4e8aad0..c7c9a00 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -193,6 +194,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk index 0ccb6b2..afc2251 100644 --- a/ft2.target.linux-arm64.mk +++ b/ft2.target.linux-arm64.mk @@ -96,6 +96,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -186,6 +187,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 7bd55fb..ce436e8 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -195,6 +196,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index b60a57c..8b12d05 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -194,6 +195,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index 64ebca0..8d7c98b 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ @@ -194,6 +195,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ '-DCHROME_PNG_WRITE_SUPPORT' \ -- cgit v1.2.3