Changeset 58233 in vbox

Timestamp:

Oct 14, 2015 12:06:56 PM (9 years ago)

Author:

vboxsync

Message:

Another VBOX_WITH_DEBUG_VCC_CRT fix.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1574 +1574 @@
 # Select the CRT type we're using with Microsoft Visual C++.
 #
+if1of ($(KBUILD_TYPE), debug dbgopt strict)
+#not yet# VBOX_WITH_DEBUG_VCC_CRT = 1
+endif
 ifdef VBOX_WITH_DEBUG_VCC_CRT
  VBOX_VCC_CRT_TYPE   = d
@@ -5217 +5220 @@
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
-  ifdef VBOX_WITH_DEBUG_VCC_CRT # VBoxCOM (static) is causing trouble of course.
-   TEMPLATE_VBOXQT4GUIEXE_LIBS += \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib
-  endif
   TEMPLATE_VBOXQT4GUIEXE_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS)
 
@@ -5311 +5309 @@
  # Add COM/XPCOM stuff
  TEMPLATE_VBOXQT4GUIEXE_LIBS += \
-        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBoxCOM$(if-expr defined(VBOX_WITH_DEBUG_VCC_CRT) && $(KBUILD_TARGET) == win,-GUI,)$(VBOX_SUFF_LIB)
  ifdef VBOX_WITH_XPCOM
   ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM.

trunk/src/VBox/Main/Makefile.kmk

@@ -932 +932 @@
 endif
 
+# -MD version for the GUI in -MDd builds.
+ifeq ($(KBUILD_TARGET).$(VBOX_VCC_CRT_TYPE),win.d)
+ LIBRARIES += VBoxCOM-GUI
+ USES += qt4
+ VBoxCOM-GUI_TEMPLATE = VBOXQT4GUI$(if-expr defined(VBOX_WITH_HARDENING),,EXE)
+ VBoxCOM-GUI_EXTENDS  = VBoxCOM
+endif
+