Suppress warning in Win32 VS 2022 Cobalt Build (#644)

b/265873968 (cherry picked from commit b5a0219)
youtube · Jun 27, 2023 · 5c7d7b2 · 5c7d7b2
1 parent c6a77b1
commit 5c7d7b2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/starboard/build/config/win/BUILD.gn b/starboard/build/config/win/BUILD.gn
@@ -20,12 +20,16 @@ config("host") {
 }
 
 config("common") {
+<<<<<<< HEAD
   if (!cobalt_fastbuild) {
     # Containers cannot use PDBs, so we conditionally disable them.
     # We want to keep them for non-docker builds as they make compilation
     # significantly faster.
     configs = [ ":no_pdbs" ]
   }
+=======
+  configs = []
+>>>>>>> b5a0219ba12 (Suppress warning in Win32 VS 2022 Cobalt Build (#644))
 
   cflags_cc = [ "/TP" ]
   cflags = []
@@ -41,6 +45,9 @@ config("common") {
     "UNICODE",
   ]
 
+  # Allows compilation against VS 2022.
+  configs += [ "//build/config/win:visual_studio_version_compat" ]
+
   # msvs_base
   # OutputDirectory and IntermediateDirectory, maybe CharacterSet
   include_dirs += [