Changeset 83759 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2020 2:56:02 PM (5 years ago)

Author:

vboxsync

Message:

/Config.kmk,Runtime/Makefile.kmk: VC++ 14.1 build tweaking. bugref:8489

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -153 +153 @@
         IPRT_BLDCFG_VERSION_MINOR=$(VBOX_VERSION_MINOR) \
         IPRT_BLDCFG_VERSION_BUILD=$(VBOX_VERSION_BUILD)
-if1of ($(VBOX_VCC_TOOL_STEM), VCC140 VCC141 VCC142)
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
 common/misc/buildconfig.cpp_DEFS += \
         IPRT_BLDCFG_VERSION_STRING="$(VBOX_VERSION_STRING)" \
@@ -2162 +2162 @@
 endif
 ifdef VBOX_WITH_DTRACE_R3
- VBoxRT_DEFS                  += IPRT_WITH_DTRACE IPRT_DTRACE_INCLUDE=\"dtrace/iprt.h\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  VBoxRT_DEFS                 += IPRT_WITH_DTRACE IPRT_DTRACE_INCLUDE="dtrace/iprt.h"
+ else
+  VBoxRT_DEFS                 += IPRT_WITH_DTRACE IPRT_DTRACE_INCLUDE=\"dtrace/iprt.h\"
+ endif
 endif
 VBoxRT_DEFS.$(KBUILD_TYPE)    := $(RuntimeR3_DEFS.$(KBUILD_TYPE))
@@ -2559 +2563 @@
 endif
 if defined(VBOX_WITH_DTRACE_R0) && !defined(VBOX_ONLY_VALIDATIONKIT)
- RuntimeR0_DEFS        += IPRT_WITH_DTRACE IPRT_DTRACE_PREFIX=VBOXVMM_ IPRT_DTRACE_INCLUDE=\"dtrace/VBoxVMM.h\"
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  RuntimeR0_DEFS        += IPRT_WITH_DTRACE IPRT_DTRACE_PREFIX=VBOXVMM_ IPRT_DTRACE_INCLUDE="dtrace/VBoxVMM.h"
+ else
+  RuntimeR0_DEFS        += IPRT_WITH_DTRACE IPRT_DTRACE_PREFIX=VBOXVMM_ IPRT_DTRACE_INCLUDE=\"dtrace/VBoxVMM.h\"
+ endif
 endif
 RuntimeR0_INCS          = include