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

Unified Diff: media/BUILD.gn

Issue 400233002: GN Windows build fixes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ipc 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
« no previous file with comments | « ipc/BUILD.gn ('k') | ui/views/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 6b710be16a25c60320c7d92b83499d633be39349..5f5871d5b2e07e118b76c8294e63b6f2050f01ca 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -32,9 +32,9 @@ config("media_config") {
}
}
-if (is_win) {
- config("media_dependent_config") {
- ldflags += [
+config("media_dependent_config") {
+ if (is_win) {
+ ldflags = [
"/DELAYLOAD:mf.dll",
"/DELAYLOAD:mfplat.dll",
"/DELAYLOAD:mfreadwrite.dll",
@@ -354,7 +354,9 @@ component("media") {
]
configs += [ ":media_config", ]
+ all_dependent_configs = [ ":media_dependent_config" ]
+ cflags = []
libs = []
defines = []
deps = []
@@ -555,8 +557,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) {
« no previous file with comments | « ipc/BUILD.gn ('k') | ui/views/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698