Changeset 106762 in vbox

Timestamp:

Oct 29, 2024 12:44:27 AM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165648

Message:

/Config.kmk,EFI/Makefile.kmk: Applied VBOX_WITH_NEW_VCC=1 so it can be reused for the VCC143 upgrade. jiraref:1253

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/EFI/Firmware/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -384 +384 @@
 endif
 # Select new VC++ on Windows.
-VBOX_WITH_NEW_VCC = 1
+#VBOX_WITH_NEW_VCC = 1
 # Use this to disable control flow.
 #VBOX_WITHOUT_CONTROL_FLOW_GUARD = 1
@@ -1910 +1910 @@
 #
 ifndef VBOX_VCC_TOOL_STEM
- ifdef VBOX_WITH_NEW_VCC
-  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.arm64)
-   VBOX_VCC_TOOL_STEM := VCC143
-  else
-   VBOX_VCC_TOOL_STEM := VCC142
-  endif
+ ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.arm64)
+  VBOX_VCC_TOOL_STEM := VCC143
  else
-  VBOX_VCC_TOOL_STEM := VCC100
+  VBOX_VCC_TOOL_STEM := VCC142
  endif
 else ifn1of ($(VBOX_VCC_TOOL_STEM), VCC100 VCC110 VCC120 VCC140 VCC141 VCC142 VCC143)

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -77 +77 @@
 #
 ifeq ($(KBUILD_HOST),win)
- ifdef VBOX_WITH_NEW_VCC # ACtually using VS2019, but no config for it, so VS2017 will have to do for now.
-  VBOX_EFI_TOOL_CHAIN := VS2017
- else
-  VBOX_EFI_TOOL_CHAIN := VS2010
- endif
+ # Actually using VS2019, but no config for it, so VS2017 will have to do for now.
+ ## @todo EFI has a VS2019 template now. We should migrate to it before we start using 2022... ;-)
+ VBOX_EFI_TOOL_CHAIN := VS2017
 else
  VBOX_EFI_TOOL_CHAIN = GCC48