Changeset 83767 in vbox for trunk

Timestamp:

Apr 17, 2020 3:59:51 PM (5 years ago)

Author:

vboxsync

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

137290

Message:

iprt/win/imagehlp.h: VC++ 14.1 build tweaking. bugref:8489

Location:

trunk

Files:

• include/iprt/win/dbghelp.h (modified) (2 diffs)
• src/VBox/Runtime/tools/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/tools/RTSignTool.cpp (modified) (1 diff)

trunk/include/iprt/win/dbghelp.h

@@ -1 +1 @@
 /** @file
- * Safe way to include dbghelp.h.
+ * Safe way to include Dbghelp.h.
  */
 
@@ -32 +32 @@
 #ifdef _MSC_VER
 /*
- * Unfortunately, the Windows.h file in SDK 7.1 is not clean wrt warning C2220 with VCC141:
+ * Unfortunately, the Windows.h file in SDK 7.1 is not clean wrt warning C4091 with VCC141:
  *      Dbghelp.h(1540): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-hdBase>' when no variable is declared
  *      Dbghelp.h(3056): warning C4091: 'typedef ': ignored on left of '<unnamed-enum-sfImage>' when no variable is declared

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -43 +43 @@
  bldRTIsoMaker_DEFS = \
         IPRT_BLDCFG_SCM_REV=$(if $(VBOX_SVN_REV_FALLBACK),$(VBOX_SVN_REV_FALLBACK),$(VBOX_SVN_REV)) \
-        IPRT_BLDCFG_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
         IPRT_BLDCFG_VERSION_MAJOR=$(VBOX_VERSION_MAJOR) \
         IPRT_BLDCFG_VERSION_MINOR=$(VBOX_VERSION_MINOR) \
-        IPRT_BLDCFG_VERSION_BUILD=$(VBOX_VERSION_BUILD) \
+        IPRT_BLDCFG_VERSION_BUILD=$(VBOX_VERSION_BUILD)
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+  bldRTIsoMaker_DEFS += \
+        IPRT_BLDCFG_VERSION_STRING="$(VBOX_VERSION_STRING)" \
+        IPRT_BLDCFG_TARGET="$(KBUILD_TARGET)" \
+        IPRT_BLDCFG_TARGET_ARCH="$(KBUILD_TARGET_ARCH)" \
+        IPRT_BLDCFG_TYPE="$(KBUILD_TYPE)"
+ else
+  bldRTIsoMaker_DEFS += \
+        IPRT_BLDCFG_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
         IPRT_BLDCFG_TARGET=\"$(KBUILD_TARGET)\" \
         IPRT_BLDCFG_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
         IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\"
+ endif
  bldRTIsoMaker_INCS = ../include
 endif

trunk/src/VBox/Runtime/tools/RTSignTool.cpp

@@ -57 +57 @@
 #ifdef RT_OS_WINDOWS
 # include <iprt/win/windows.h>
-# include <ImageHlp.h>
+# include <iprt/win/imagehlp.h>
 #endif