Changeset 267034 in webkit

Timestamp:

Sep 14, 2020 1:17:40 PM (4 years ago)

Author:

Fujii Hironori

Message:

[WinCairo][MediaFoundation] r264188 introduced linker warning: LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
​https://bugs.webkit.org/show_bug.cgi?id=214170

Reviewed by Alex Christensen.

Source/WebCore:

r264188 added the linker flag /DELAYLOAD:mf.dll to WebCore. It
introduced a lot of linker warnings for modules not using
MediaFoundation, for example WebKitWebProcess.exe,
MiniBrowserLib.dll, etc. The linker option should be applied only
to direct WebCore consumers, namely WebKit.dll, WebKit2.dll and
TestWebCore.exe.

Define a INTERFACE library, and link it explicitly with the direct
WebCore consumers.

• PlatformWinCairo.cmake:

Source/WebKit:

• PlatformWin.cmake:

Source/WebKitLegacy:

• PlatformWin.cmake:

Tools:

• TestWebKitAPI/PlatformWin.cmake:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformWinCairo.cmake (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformWin.cmake (modified) (1 diff)
• Source/WebKitLegacy/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/PlatformWin.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/PlatformWin.cmake (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo][MediaFoundation] r264188 introduced linker warning: LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
+        https://bugs.webkit.org/show_bug.cgi?id=214170
+
+        Reviewed by Alex Christensen.
+
+        r264188 added the linker flag /DELAYLOAD:mf.dll to WebCore. It
+        introduced a lot of linker warnings for modules not using
+        MediaFoundation, for example WebKitWebProcess.exe,
+        MiniBrowserLib.dll, etc. The linker option should be applied only
+        to direct WebCore consumers, namely WebKit.dll, WebKit2.dll and
+        TestWebCore.exe.
+
+        Define a INTERFACE library, and link it explicitly with the direct
+        WebCore consumers.
+
+        * PlatformWinCairo.cmake:
+
 2020-09-14  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/PlatformWinCairo.cmake

@@ -39 +39 @@
 
 list(APPEND WebCore_LIBRARIES
-    D3d9
-    Mf
-    Mfplat
     comctl32
     crypt32
     delayimp
-    dxva2
-    evr
     iphlpapi
     rpcrt4
@@ -56 +51 @@
 )
 
-target_link_options(WebCore PUBLIC /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll)
+# Define a INTERFACE library for MediaFoundation and link it
+# explicitly with direct WebCore consumers because /DELAYLOAD causes
+# linker warnings for modules not using MediaFoundation.
+#  LINK : warning LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
+add_library(MediaFoundation INTERFACE)
+target_link_libraries(MediaFoundation INTERFACE
+    d3d9
+    dxva2
+    evr
+    mf
+    mfplat
+)
+target_link_options(MediaFoundation INTERFACE
+    /DELAYLOAD:d3d9.dll
+    /DELAYLOAD:dxva2.dll
+    /DELAYLOAD:evr.dll
+    /DELAYLOAD:mf.dll
+    /DELAYLOAD:mfplat.dll
+)
 
 if (USE_WOFF2)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo][MediaFoundation] r264188 introduced linker warning: LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
+        https://bugs.webkit.org/show_bug.cgi?id=214170
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
 2020-09-14  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKit/PlatformWin.cmake

@@ -167 +167 @@
     list(APPEND WebKit_PRIVATE_LIBRARIES
         $<TARGET_OBJECTS:WebCore>
+        MediaFoundation
         OpenSSL::SSL
         mfuuid.lib

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo][MediaFoundation] r264188 introduced linker warning: LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
+        https://bugs.webkit.org/show_bug.cgi?id=214170
+
+        Reviewed by Alex Christensen.
+
+        * PlatformWin.cmake:
+
 2020-08-12  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKitLegacy/PlatformWin.cmake

@@ -10 +10 @@
     list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
         $<TARGET_OBJECTS:WebCore>
+        MediaFoundation
         OpenSSL::SSL
         mfuuid.lib

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo][MediaFoundation] r264188 introduced linker warning: LNK4199: /DELAYLOAD:mf.dll ignored; no imports found from mf.dll
+        https://bugs.webkit.org/show_bug.cgi?id=214170
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/PlatformWin.cmake:
+
 2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/TestWebKitAPI/PlatformWin.cmake

@@ -54 +54 @@
     list(APPEND TestWebCore_LIBRARIES
         Cairo::Cairo
+        MediaFoundation
         OpenSSL::SSL
         mfuuid