VirtualBox

Changeset 25034 in vbox


Ignore:
Timestamp:
Nov 27, 2009 1:38:24 AM (15 years ago)
Author:
vboxsync
Message:

Config.kmk,tools,VBoxNetFlt/Makefile.kmk,/Makefile.kmk: Added VBOX_WITH_DEBUG_VCC_CRT to select the debug CRT when using Visual C++ (only tested with 8.0/amd64)

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r25017 r25034  
    12031203
    12041204#
     1205# Select the CRT type we're using with Microsoft Visual C++.
     1206#
     1207ifdef VBOX_WITH_DEBUG_VCC_CRT
     1208 VBOX_VCC_CRT_TYPE   = d
     1209 VBOX_VCC_CRT_TYPE_N =
     1210else
     1211 VBOX_VCC_CRT_TYPE   =
     1212 VBOX_VCC_CRT_TYPE_N = d
     1213endif
     1214
     1215#
    12051216# ARCH_BITS_DEFS.
    12061217#
    … …  
    24722483 TEMPLATE_VBOXR3EXE_SDKS               = WINPSDK
    24732484 ifdef VBOX_USE_VCC80
    2474   TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
     2485  TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    24752486  TEMPLATE_VBOXR3EXE_CXXFLAGS.debug    = -RTCsu
    24762487 else
    2477   TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD -W3 -wd4065 -wd4244 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
     2488  TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    24782489  TEMPLATE_VBOXR3EXE_CXXFLAGS.debug    = -GZ
    24792490 endif
    … …  
    24882499        /DISALLOWLIB:libcmt.lib \
    24892500        /DISALLOWLIB:libcmtd.lib \
    2490         /DISALLOWLIB:msvcrtd.lib
     2501        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE_N).lib \
     2502        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib
    24912503 TEMPLATE_VBOXR3EXE_LIBS               = \
    2492         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt.lib \
    2493         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt.lib \
     2504        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
     2505        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
    24942506        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib
    24952507 TEMPLATE_VBOXR3EXE_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
    … …  
    25962608TEMPLATE_VBOXR3STATIC_EXTENDS          = VBOXR3EXE
    25972609ifeq ($(KBUILD_TARGET),win)
    2598  TEMPLATE_VBOXR3STATIC_CFLAGS          = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT
    2599  TEMPLATE_VBOXR3STATIC_CXXFLAGS        = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT
    2600  TEMPLATE_VBOXR3STATIC_LDFLAGS         = $(filter-out /DISALLOWLIB:libcmt.lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
     2610 TEMPLATE_VBOXR3STATIC_CFLAGS          = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
     2611 TEMPLATE_VBOXR3STATIC_CXXFLAGS        = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
     2612 TEMPLATE_VBOXR3STATIC_LDFLAGS         = $(filter-out /DISALLOWLIB:libcmt$(VBOX_VCC_CRT_TYPE).lib /DISALLOWLIB:libcpmt$(VBOX_VCC_CRT_TYPE).lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
    26012613        /DISALLOWLIB:msvcrt.lib \
    2602         /DISALLOWLIB:msvcprt.lib
     2614        /DISALLOWLIB:msvcrtd.lib \
     2615        /DISALLOWLIB:msvcprt.lib \
     2616        /DISALLOWLIB:msvcprtd.lib
    26032617 TEMPLATE_VBOXR3STATIC_LIBS            = \
    26042618        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL)_LIB)/oldnames.lib \
    2605         $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL)_LIB)/libcmt.lib \
    2606         $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL)_LIB)/libcpmt.lib
     2619        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
     2620        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
    26072621else ifn1of ($(KBUILD_TARGET), darwin)
    26082622 # The gcc guys sans darwin.
    … …  
    28572871 ifdef VBOX_USE_VCC80
    28582872  TEMPLATE_VBOXMAINEXE_TOOL              = $(VBOX_VCC_TOOL)
    2859   TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD -W3 -wd4065 -wd4996 -wd4250 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
     2873  TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4996 -wd4250 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    28602874  TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug    = -RTCsu
    28612875 else
    28622876  TEMPLATE_VBOXMAINEXE_TOOL              = VCC70
    2863   TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD -W3 -wd4065 -wd4250 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
     2877  TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4250 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    28642878  TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug    = -GZ
    28652879 endif
    … …  
    28742888        /DISALLOWLIB:libc.lib \
    28752889        /DISALLOWLIB:libcd.lib \
    2876         /DISALLOWLIB:msvcrt.lib \
    2877         /DISALLOWLIB:msvcrtd.lib \
     2890        /DISALLOWLIB:libcmt.lib \
    28782891        /DISALLOWLIB:libcmtd.lib \
    2879         /DISALLOWLIB:libcmt.lib
     2892        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE_N).lib \
     2893        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE_N).lib
    28802894 TEMPLATE_VBOXMAINEXE_LIBS               = \
    28812895        $(LIB_RUNTIME) \
    2882         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt.lib \
    2883         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt.lib \
     2896        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
     2897        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
    28842898        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
    2885         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
     2899        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls$(VBOX_VCC_CRT_TYPE).lib
    28862900 TEMPLATE_VBOXMAINEXE_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
    28872901
    … …  
    31493163
    31503164 ifeq ($(KBUILD_TARGET),win)
     3165  # Note! No use of VBOX_VCC_CRT_TYPE here yet as it requires a /MDd build of Qt as well.
    31513166  TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_VCC_TOOL)
    31523167  TEMPLATE_VBOXQT4GUIEXE_DEFS += \
    … …  
    33183333 endif
    33193334 ifneq ($(TEMPLATE_VBOXBLDPROG_TOOL),VCC70)
    3320   TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT -W3 -wd4996 -Zc:wchar_t-
     3335  TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3 -wd4996 -Zc:wchar_t-
    33213336  TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    = -RTCsu
    33223337  TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  = -O2 -Oy- -GS-
    33233338 else
    3324   TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT -W3
     3339  TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3
    33253340  TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    = -GZ
    33263341  TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  = -Ogitb2 -Oy-
    … …  
    33353350 TEMPLATE_VBOXBLDPROG_LDFLAGS            = \
    33363351        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LARGEADDRESSAWARE /DEBUG \
    3337         /DISALLOWLIB:libcd.lib \
    3338         /DISALLOWLIB:libcmtd.lib \
     3352        /DISALLOWLIB:libc$(VBOX_VCC_CRT_TYPE_N).lib \
     3353        /DISALLOWLIB:libcmt$(VBOX_VCC_CRT_TYPE_N).lib \
    33393354        /DISALLOWLIB:msvcrt.lib \
    33403355        /DISALLOWLIB:msvcrtd.lib \
    … …  
    33433358 TEMPLATE_VBOXBLDPROG_LIBS               = \
    33443359        $(PATH_TOOL_$(TEMPLATE_VBOXBLDPROG_TOOL)_LIB)/oldnames.lib \
    3345         $(PATH_TOOL_$(TEMPLATE_VBOXBLDPROG_TOOL)_LIB)/libcmt.lib \
    3346         $(PATH_TOOL_$(TEMPLATE_VBOXBLDPROG_TOOL)_LIB)/libcpmt.lib
     3360        $(PATH_TOOL_$(TEMPLATE_VBOXBLDPROG_TOOL)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
     3361        $(PATH_TOOL_$(TEMPLATE_VBOXBLDPROG_TOOL)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
    33473362
    33483363else
    … …  
    34693484 TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
    34703485 TEMPLATE_VBOXGUESTR3EXE_SDKS     = $(TEMPLATE_VBOXR3EXE_SDKS) VBOX_NTDLL
    3471  TEMPLATE_VBOXGUESTR3EXE_CFLAGS   = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT
    3472  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(filter-out -MD, $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT
    3473  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out /DISALLOWLIB:libcmt.lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
    3474         /DISALLOWLIB:msvcrt.lib \
    3475         /DISALLOWLIB:msvcprt.lib
     3486 TEMPLATE_VBOXGUESTR3EXE_CFLAGS   = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
     3487 TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS = $(filter-out -MD$(VBOX_VCC_CRT_TYPE), $(TEMPLATE_VBOXR3EXE_CFLAGS)) -MT$(VBOX_VCC_CRT_TYPE)
     3488 TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out /DISALLOWLIB:libcmt$(VBOX_VCC_CRT_TYPE).lib /DISALLOWLIB:libcpmt$(VBOX_VCC_CRT_TYPE).lib, $(TEMPLATE_VBOXR3EXE_LDFLAGS)) \
     3489        /DISALLOWLIB:msvcrt$(VBOX_VCC_CRT_TYPE).lib \
     3490        /DISALLOWLIB:msvcprt$(VBOX_VCC_CRT_TYPE).lib
    34763491 TEMPLATE_VBOXGUESTR3EXE_LIBS     = \
    34773492        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/oldnames.lib \
    3478         $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcmt.lib \
    3479         $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcpmt.lib
     3493        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
     3494        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
    34803495else # the gcc guys
    34813496 TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE

  • trunk/Makefile.kmk

    r24858 r25034  
    107107  include $(KBUILD_PATH)/tools/VCC80X86.kmk
    108108  include $(KBUILD_PATH)/tools/VCC80AMD64.kmk
    109   bin_SOURCES.x86 += \
    110         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    111         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
    112         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
    113         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    114         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
    115         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
    116   bin_SOURCES.amd64 += \
    117         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    118         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
    119         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
    120         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    121         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
    122         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
     109  ifeq ($(VBOX_VCC_CRT_TYPE),d)
     110   bin_SOURCES.x86 += \
     111         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
     112         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
     113         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \
     114         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
     115         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
     116         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
     117   bin_SOURCES.amd64 += \
     118         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
     119         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
     120         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \
     121         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
     122         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
     123         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
     124  else
     125   bin_SOURCES.x86 += \
     126         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
     127         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
     128         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
     129         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
     130         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
     131         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
     132   bin_SOURCES.amd64 += \
     133         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
     134         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
     135         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
     136         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
     137         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
     138         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
     139  endif
    123140 endif
    124141 ifndef VBOX_USE_VCC80
    … …  
    131148  include $(KBUILD_PATH)/tools/VCC70.kmk
    132149  ## @todo Move these defines to VCC70.
    133   DLL_TOOL_VCC70_MSVCR71 ?= $(PATH_TOOL_VCC70)/bin/msvcr71.dll
     150  DLL_TOOL_VCC70_MSVCR71 ?= $(PATH_TOOL_VCC70)/bin/msvcr71$(VBOX_VCC_CRT_TYPE).dll
    134151  ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71)),)
    135152   bin_SOURCES += \
    … …  
    137154        $(DLL_TOOL_VCC70_MSVCR71)=>testcase/msvcr71.dll
    138155  endif
    139   DLL_TOOL_VCC70_MSVCP71 ?= $(PATH_TOOL_VCC70)/bin/msvcp71.dll
     156  DLL_TOOL_VCC70_MSVCP71 ?= $(PATH_TOOL_VCC70)/bin/msvcp71$(VBOX_VCC_CRT_TYPE).dll
    140157  ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71)),)
    141158   bin_SOURCES += \
    142         $(DLL_TOOL_VCC70_MSVCP71)=>msvcp71.dll \
    143         $(DLL_TOOL_VCC70_MSVCP71)=>testcase/msvcp71.dll
     159        $(DLL_TOOL_VCC70_MSVCP71)=>msvcp71$(VBOX_VCC_CRT_TYPE).dll \
     160        $(DLL_TOOL_VCC70_MSVCP71)=>testcase/msvcp71$(VBOX_VCC_CRT_TYPE).dll
    144161   endif
    145   DLL_TOOL_VCC70_MSVCRT  ?= $(PATH_TOOL_VCC70)/bin/msvcrt.dll
     162  DLL_TOOL_VCC70_MSVCRT  ?= $(PATH_TOOL_VCC70)/bin/msvcrt$(VBOX_VCC_CRT_TYPE).dll
    146163  ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCRT)),)
    147164   bin_SOURCES += \
    148         $(DLL_TOOL_VCC70_MSVCRT)=>msvcrt.dll \
    149         $(DLL_TOOL_VCC70_MSVCRT)=>testcase/msvcrt.dll
     165        $(DLL_TOOL_VCC70_MSVCRT)=>msvcrt$(VBOX_VCC_CRT_TYPE).dll \
     166        $(DLL_TOOL_VCC70_MSVCRT)=>testcase/msvcrt$(VBOX_VCC_CRT_TYPE).dll
    150167  endif
    151168 endif

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r24675 r25034  
    212212        win/notifyobj/VBoxNetFltNotify.rc
    213213VBoxNetFltNotify_LIBS       = \
    214         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
     214        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls$(VBOX_VCC_CRT_TYPE).lib
    215215#VBoxNetFltNotify_INTERMEDIATES =
    216216VBoxNetFltNotify_DEPS       = \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette