Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Unified Diff: media/BUILD.gn

Issue 400233002: GN Windows build fixes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 37dc76f81093bb63507f5bdb2135e69a71611c25..71bbc7f934ccd421710e04d677b2b21ac77b86f4 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -73,9 +73,9 @@ config("media_config") {
}
}
-if (is_win) {
- config("media_dependent_config") {
- ldflags += [
+config("media_dependent_config") {
+ if (is_win) {
brettw 2014/07/18 17:23:00 For this, I prefer to unconditionally add configs
DaleCurtis 2014/07/18 18:24:06 Acknowledged.
+ ldflags = [
"/DELAYLOAD:mf.dll",
"/DELAYLOAD:mfplat.dll",
"/DELAYLOAD:mfreadwrite.dll",
@@ -513,7 +513,9 @@ component("media") {
]
configs += [ ":media_config", ]
+ all_dependent_configs = [ ":media_dependent_config" ]
+ cflags = []
libs = []
defines = []
deps = []
@@ -783,8 +785,6 @@ component("media") {
"/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
# http://crbug.com/171009
]
- configs += [ ":media_dependent_config" ]
- all_dependent_configs = [ ":media_dependent_config" ]
}
if (proprietary_codecs) {

Powered by Google App Engine
This is Rietveld 408576698