mingw fixes 3

Author: mccakit

BUILD.gn

@@ -497,7 +497,11 @@ optional("fontmgr_win_gdi") {
   public_defines = [ "SK_FONTMGR_GDI_AVAILABLE" ]
   public = skia_ports_windows_fonts_public
   sources = skia_ports_fonthost_win_sources
-  libs = [ "Gdi32.lib" ]
+  if (is_msvc) {
+    libs = [ "Gdi32.lib" ]
+  } else {
+    libs = [ "gdi32" ]
+  }
 }
 
 if (skia_lex) {
@@ -898,7 +902,31 @@ optional("gpu_shared") {
 
   if (skia_use_dawn) {
     public_defines += [ "SK_DAWN" ]
-    public_deps += [ "//third_party/dawn" ]
+
+    # When building for WASM, the WebGPU headers are provided by Emscripten. For native builds we
+    # have to depend on Dawn directly.
+    if (!skia_use_webgpu) {
+      public_deps += [
+        "//third_party/externals/dawn/include/dawn:cpp_headers",
+        "//third_party/externals/dawn/src/dawn:cpp",
+        "//third_party/externals/dawn/src/dawn:proc",
+      ]
+
+      if (dawn_enable_d3d12 || dawn_enable_d3d11 || dawn_enable_desktop_gl ||
+          dawn_enable_metal || dawn_enable_opengles || dawn_enable_vulkan) {
+        public_deps += [ "//third_party/externals/dawn/src/dawn/native" ]
+      }
+      if (dawn_enable_d3d12) {
+        if (is_msvc) {
+          libs += ["d3d12.lib", "dxgi.lib", "d3dcompiler.lib"]
+        } else {
+          libs += ["d3d12", "dxgi", "d3dcompiler"]
+        }
+
+      } else if (dawn_enable_metal) {
+        frameworks += [ "Metal.framework" ]
+      }
+    }
   }
 
   if (skia_use_direct3d) {
@@ -1001,7 +1029,12 @@ optional("gpu") {
         "src/gpu/ganesh/gl/win/GrGLMakeWinInterface.cpp",
       ]
       if (target_cpu != "arm64") {
-        libs += [ "OpenGL32.lib" ]
+        if (is_msvc) {
+          libs += [ "OpenGL32.lib" ]
+        } else {
+          libs += [ "opengl32" ]
+        }
+
       }
     } else {
       sources += [ "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
@@ -1026,11 +1059,19 @@ optional("gpu") {
     if (skia_enable_direct3d_debug_layer) {
       public_defines += [ "SK_ENABLE_D3D_DEBUG_LAYER" ]
     }
-    libs += [
-      "d3d12.lib",
-      "dxgi.lib",
-      "d3dcompiler.lib",
-    ]
+    if(is_msvc) {
+      libs += [
+        "d3d12.lib",
+        "dxgi.lib",
+        "d3dcompiler.lib",
+      ]
+    } else {
+      libs += [
+        "d3d12",
+        "dxgi",
+        "d3dcompiler",
+      ]
+    }
   }
 
   cflags_objcc = []
@@ -1760,17 +1801,18 @@ skia_component("skia") {
                  "src/ports/SkDebug_win.cpp",
                  "src/ports/SkImageGeneratorWIC.cpp",
                ]
-    libs += [
-      "Ole32.lib",
-      "OleAut32.lib",
-    ]
-
+    if(is_msvc) {
+        libs += ["Ole32.lib","OleAut32.lib"]
+    } else {
+        libs += ["ole32","oleaut32"]
+    }
     if (!skia_enable_winuwp) {
-      libs += [
-        "FontSub.lib",
-        "User32.lib",
-        "Usp10.lib",
-      ]
+      if(is_msvc) {
+        libs += ["FontSub.lib", "User32.lib", "Usp10.lib"]
+      } else {
+        libs += ["fontsub", "user32", "usp10"]
+      }
+
     }
   } else {
     sources += [ "src/ports/SkOSFile_posix.cpp" ]

gn/BUILDCONFIG.gn

@@ -173,7 +173,7 @@ if (is_msvc) {
   if (win_toolchain_version == "") {
     win_toolchain_version = exec_script("//gn/highest_version_dir.py",
                                         [
-                                          "$win_vc/Tools/MSVC",
+                                          "$win_vc/tools/msvc",
                                           "[0-9]{2}\.[0-9]{2}\.[0-9]{5}",
                                         ],
                                         "trim string")