VirtualBox

Changeset 42288 in vbox


Ignore:
Timestamp:
Jul 20, 2012 6:30:53 PM (12 years ago)
Author:
vboxsync
Message:

Jettisoned the old compilers.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r42287 r42288  
    2121# Marker.
    2222VBOX_ROOT_CONFIG_KMK_INCLUDED = 1
    23 
    24 ## TEMPORARY
    25 # Enable Visual C++ 2010 for everyone. Support for older compiler version will be removed shortly.
    26 VBOX_USE_VCC100 = 1
    27 ## TEMPORARY
    2823
    2924#
    … …  
    411406VBOX_WITH_WDDM = 1
    412407# Enable Wddm Video driver for Windows 8 guests.
    413 ifdef VBOX_USE_VCC100
    414  VBOX_WITH_WDDM_W8 = 1
    415 endif
     408VBOX_WITH_WDDM_W8 = 1
    416409# Lazy developer!!
    417410VBOXWDDM_WITH_VBVA = 1
    … …  
    13221315# Decide which Visual C++ compiler version we're using by default.
    13231316#
     1317ifndef VBOX_VCC_TOOL_STEM
     1318 VBOX_VCC_TOOL_STEM := VCC100
     1319else ifn1of ($(VBOX_VCC_TOOL_STEM), VCC100 VCC110)
     1320 $(error VBox: VBOX_VCC_TOOL_STEM='$(VBOX_VCC_TOOL_STEM)' is not supported, only VCC100 and VCC110 is)
     1321endif
    13241322ifndef VBOX_VCC_TOOL
    1325  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.amd64)
    1326   if !defined(VBOX_USE_VCC100) && !defined(VBOx_USE_VCC110)
    1327    VBOX_USE_VCC80 ?= 1 # the default for win.amd64
    1328   endif
    1329  endif
    1330  ifdef VBOX_USE_VCC110
    1331   VBOX_VCC_TOOL_STEM = VCC110
    1332  else ifdef VBOX_USE_VCC100
    1333   VBOX_VCC_TOOL_STEM = VCC100
    1334  else ifdef VBOX_USE_VCC80
    1335   VBOX_VCC_TOOL_STEM = VCC80
    1336  else
    1337   VBOX_VCC_TOOL := VCC70
    1338   VBOX_VCC_TOOL_STEM := VCC70
    1339  endif
    1340  ifndef VBOX_VCC_TOOL
    1341   VBOX_VCC_TOOL := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_TARGET_ARCH))
    1342  endif
    1343 else ifndef VBOX_VCC_TOOL_STEM
    1344 $(error VBOX_VCC_TOOL_STEM is not defined)
    1345 endif
    1346 # VCC70 is hopefully the most special case here...
    1347 if !defined(VBOX_USE_VCC100) && !defined(VBOX_USE_VCC90) && !defined(VBOX_USE_VCC80) && !defined(VBOX_USE_VCC70)
    1348  VBOX_USE_VCC70 := 1
     1323 VBOX_VCC_TOOL := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_TARGET_ARCH))
    13491324endif
    13501325
    … …  
    13601335## @todo Remove the default tool crap here!
    13611336TOOL = $(VBOX_GCC_TOOL)
    1362 ifdef VBOX_USE_VCC70
    1363  TOOL.win = VCC70
    1364 else
    1365  TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X86
    1366  TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64
    1367 endif
     1337TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X86
     1338TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64
    13681339ASTOOL = $(VBOX_ASTOOL)
    13691340
    … …  
    13861357   CXXFLAGS.l4 = -mno-red-zone
    13871358  else
    1388    $(error L4_ARCH=$(L4_ARCH))
     1359   $(error VBox: L4_ARCH=$(L4_ARCH))
    13891360  endif
    13901361  L4_OBJ := $(L4_DIR)/build-$(L4_ARCH)-$(L4_CPU)-$(L4_API)
    … …  
    15251496 VBOX_GCC_OPT    ?= -O2 $(VBOX_GCC_mtune-generic)
    15261497 VBOX_VCC_FP     ?= -Oy-
    1527  ifndef VBOX_USE_VCC70
    15281498 VBOX_VCC_OPT    ?= -O2 -GS-
    1529  else
    1530  VBOX_VCC_OPT    ?= -Ogitb2
    1531  endif
    15321499 VBOX_GCC_R0_FP  ?= -fno-omit-frame-pointer
    15331500 VBOX_GCC_R0_OPT ?= -O2 $(VBOX_GCC_mtune-generic)
    15341501 VBOX_VCC_R0_FP  ?= -Oy-
    1535  ifndef VBOX_USE_VCC70
    15361502 VBOX_VCC_R0_OPT ?= -O2 -GS-
    1537  else
    1538  VBOX_VCC_R0_OPT ?= -Ogitb2
    1539  endif
    15401503 VBOX_GCC_GC_FP  ?= -fno-omit-frame-pointer
    15411504 VBOX_GCC_GC_OPT ?= -O2 $(VBOX_GCC_mtune-generic)
    15421505 VBOX_VCC_GC_FP  ?= -Oy-
    1543  ifndef VBOX_USE_VCC70
    15441506 VBOX_VCC_GC_OPT ?= -O2
    1545  else
    1546  VBOX_VCC_GC_OPT ?= -Ogitb2
    1547  endif
    15481507endif
    15491508ifeq ($(KBUILD_TARGET_ARCH),x86)
    … …  
    15691528# Decide which Windows DDK to use by default.
    15701529#
    1571 ifdef VBOX_USE_VCC110
    1572  VBOX_WINDDK          ?= WINDDK80
    1573  VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
    1574  VBOX_WINDDK_GST_W2K3 ?= $(VBOX_WINDDK)WNET
    1575  VBOX_WINDDK_GST_W7   ?= $(VBOX_WINDDK)W7
    1576 else ifdef VBOX_USE_VCC100
    1577  VBOX_WINDDK          ?= WINDDK71
    1578  VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
    1579  VBOX_WINDDK_GST_W2K3 ?= $(VBOX_WINDDK)WNET
    1580  VBOX_WINDDK_GST_W7   ?= $(VBOX_WINDDK)W7
    1581 else ifdef VBOX_USE_WINDDK
    1582  VBOX_WINDDK          ?= WINDDK
    1583  VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
    1584  VBOX_WINDDK_GST_W2K3 ?= $(VBOX_WINDDK)WNET
    1585  VBOX_WINDDK_GST_W7   ?= WINDDK71W7
    1586 else
    1587  VBOX_WINDDK          ?= W2K3DDK
    1588  VBOX_WINDDK_WLH      ?= WINDDKWLH
    1589  VBOX_WINDDK_GST_W2K3 ?= W2K3DDK
    1590  VBOX_WINDDK_GST_W7   ?= WINDDK71W7
    1591 endif
    1592 VBOX_WINDDK_GST       ?= $(VBOX_WINDDK)
    1593 VBOX_WINDDK_GST_WLH   ?= $(VBOX_WINDDK_WLH)
    1594 VBOX_WINDDK_GST_W8    ?= WINDDK80W8
     1530ifeq ($(VBOX_VCC_TOOL_STEM),VCC110)
     1531 VBOX_WINDDK         ?= WINDDK80
     1532else
     1533 VBOX_WINDDK         ?= WINDDK71
     1534endif
     1535VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
     1536
     1537VBOX_WINDDK_GST      ?= $(VBOX_WINDDK)
     1538VBOX_WINDDK_GST_W8   ?= WINDDK80W8
     1539VBOX_WINDDK_GST_W7   ?= $(VBOX_WINDDK_GST)W7
     1540VBOX_WINDDK_GST_WLH  ?= $(VBOX_WINDDK_GST)WLH
     1541VBOX_WINDDK_GST_W2K3 ?= WINDDK71WNET
    15951542ifeq ($(KBUILD_TARGET_ARCH),x86)
    1596  ifneq ($(VBOX_WINDDK_GST),W2K3DDK)
    1597   VBOX_WINDDK_GST_WXP ?= $(VBOX_WINDDK_GST)WXP
    1598   VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST_WXP)
    1599   VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST_WXP)
    1600  else
    1601   VBOX_WINDDK_GST_WXP ?= $(VBOX_WINDDK_GST)
    1602   VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST)
    1603   VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST)
    1604  endif
    1605 else
    1606  VBOX_WINDDK_GST_WXP   = $(VBOX_WINDDK_GST_W2K3)
    1607  VBOX_WINDDK_GST_W2K   = $(VBOX_WINDDK_GST_W2K3)
    1608  VBOX_WINDDK_GST_NT4   = $(VBOX_WINDDK_GST_W2K3)
     1543 VBOX_WINDDK_GST_WXP ?= WINDDK71WXP
     1544 VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST_WXP)
     1545 VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST_WXP)
     1546else
     1547 VBOX_WINDDK_GST_WXP ?= $(VBOX_WINDDK_GST_W2K3)
     1548 VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST_W2K3)
     1549 VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST_W2K3)
    16091550endif
    16101551
    … …  
    16131554# Decide which Windows SDK to use by default.
    16141555#
    1615 ifdef VBOX_USE_VCC110
     1556ifeq ($(VBOX_VCC_TOOL_STEM),VCC110)
    16161557 VBOX_WINPSDK ?= WINPSDK80
    1617 else ifdef VBOX_USE_VCC100
     1558else
    16181559 VBOX_WINPSDK ?= WINPSDK71
    1619 else
    1620  VBOX_WINPSDK ?= WINPSDK
    1621 endif
    1622 VBOX_WINPSDK_GST     ?= $(VBOX_WINPSDK)
    1623 VBOX_WINPSDK_GST_W8  ?= $(VBOX_WINPSDK_GST)
    1624 VBOX_WINPSDK_GST_W7  ?= $(VBOX_WINPSDK_GST)
    1625 VBOX_WINPSDK_GST_WLH ?= $(VBOX_WINPSDK_GST)
    1626 VBOX_WINPSDK_GST_WXP ?= $(VBOX_WINPSDK_GST)
     1560endif
     1561VBOX_WINPSDK_GST      ?= $(VBOX_WINPSDK)
     1562VBOX_WINPSDK_GST_W8   ?= WINPSDK80
     1563VBOX_WINPSDK_GST_W7   ?= $(VBOX_WINPSDK_GST)
     1564VBOX_WINPSDK_GST_WLH  ?= $(VBOX_WINPSDK_GST)
     1565VBOX_WINPSDK_GST_WXP  ?= $(VBOX_WINPSDK_GST)
    16271566ifeq ($(KBUILD_TARGET_ARCH),x86)
    16281567 VBOX_WINPSDK_GST_W2K ?= $(VBOX_WINPSDK_GST)
    16291568 VBOX_WINPSDK_GST_NT4 ?= $(VBOX_WINPSDK_GST)
    16301569else
    1631  VBOX_WINPSDK_GST_W2K = $(VBOX_WINPSDK_GST_WXP)
    1632  VBOX_WINPSDK_GST_NT4 = $(VBOX_WINPSDK_GST_WXP)
     1570 VBOX_WINPSDK_GST_W2K ?= $(VBOX_WINPSDK_GST_WXP)
     1571 VBOX_WINPSDK_GST_NT4 ?= $(VBOX_WINPSDK_GST_WXP)
    16331572endif
    16341573
    … …  
    16441583 ARCH_BITS_DEFS    := HC_ARCH_BITS=32
    16451584else
    1646  error KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)
     1585 $(error VBox: KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH))
    16471586endif
    16481587
    … …  
    18601799# Note! The scripts has been moved to Bin in v8.0.
    18611800VBOX_PATH_WIX       ?= $(PATH_DEVTOOLS)/win.x86/wix/v3.5.2519.0
    1862 ifdef VBOX_USE_VCC100
    18631801VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiTran.Exe
    18641802VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiDb.Exe
    18651803VBOX_PATH_WISUBSTG  ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSubStg.vbs
    18661804VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSumInf.vbs
    1867 else
    1868 VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiTran.Exe
    1869 VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiDb.Exe
    1870 VBOX_PATH_WISUBSTG  ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSubStg.vbs
    1871 VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSumInf.vbs
    1872 endif
    18731805VBOX_PATH_DIFX      ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1-r3
    18741806VBOX_PATH_CABSDK    ?= $(PATH_DEVTOOLS)/win.x86/cabsdk/r1
    … …  
    19541886  else
    19551887   if $(VBOX_XCODE_VERSION_MAJOR) >= 4
    1956     $(error Too new Xcode version ($(VBOX_XCODE_VERSION)) for non-Cocoa builds.)
     1888    $(error VBox: Too new Xcode version ($(VBOX_XCODE_VERSION)) for non-Cocoa builds.)
    19571889   endif
    19581890   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
    … …  
    19621894 else
    19631895  if $(VBOX_XCODE_VERSION_MAJOR) < 4 && "$(VBOX_XCODE_VERSION)" != "3.2"
    1964    $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
     1896   $(error VBox: 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
    19651897  endif
    19661898  VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
    … …  
    20111943        -Wl,-headerpad_max_install_names $(VBOX_DARWIN_CLASSIC_LINKER)
    20121944 else
    2013   VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.4 SDK)
    2014   VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.4 SDK)
     1945  VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
     1946  VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
    20151947 endif
    20161948
    … …  
    20251957        -Wl,-headerpad_max_install_names $(VBOX_DARWIN_NO_COMPACT_LINKEDIT)
    20261958 else
    2027   VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.5 SDK)
    2028   VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.5 SDK)
     1959  VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
     1960  VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
    20291961 endif
    20301962
    … …  
    20391971         -Wl,-headerpad_max_install_names
    20401972 else
    2041   VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.6 SDK)
    2042   VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.6 SDK)
     1973  VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
     1974  VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
    20431975 endif
    20441976
    … …  
    20591991         -Wl,-headerpad_max_install_names
    20601992 else
    2061   VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.7 SDK)
    2062   VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.7 SDK)
     1993  VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)
     1994  VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)
    20631995 endif
    20641996
    … …  
    20872019#
    20882020if defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_ORIGIN)
    2089  $(error VBOX_WITH_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
     2021 $(error VBox: VBOX_WITH_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
    20902022endif
    20912023if defined(VBOX_WITH_RELATIVE_RUNPATH) && defined(VBOX_WITH_ORIGIN)
    2092  $(error VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
     2024 $(error VBox: VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
    20932025endif
    20942026if defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
    2095  $(error VBOX_WITH_RUNPATH and VBOX_WITH_RELATIVE_RUNPATH are mutually exclusive)
     2027 $(error VBox: VBOX_WITH_RUNPATH and VBOX_WITH_RELATIVE_RUNPATH are mutually exclusive)
    20962028endif
    20972029if defined(VBOX_WITH_RELATIVE_RUNPATH) && defined(VBOX_WITH_HARDENING)
    2098  $(error VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_HARDENING are mutually exclusive)
     2030 $(error VBox: VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_HARDENING are mutually exclusive)
    20992031endif
    21002032
    … …  
    25052437   VBOX_TSA_URL_ARGS ?= /t "$(VBOX_TSA_URL)"
    25062438  else
    2507    $(error Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
     2439   $(error VBox: Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
    25082440  endif
    25092441  VBOX_CERTIFICATE_STORE ?= my
    … …  
    28762808
    28772809 ifeq ($(VBOX_LDR_FMT32),pe)
    2878   ifndef VBOX_USE_VCC70
    2879    TEMPLATE_VBoxRc_TOOL              = $(VBOX_VCC_TOOL_STEM)X86
    2880    ifdef TODO_MORE_WARNINGS
    2881     TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
    2882    else
    2883     TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
    2884    endif
     2810  TEMPLATE_VBoxRc_TOOL               = $(VBOX_VCC_TOOL_STEM)X86
     2811  ifdef TODO_MORE_WARNINGS
     2812   TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) -W4 -wd4244 -wd4996 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_WERR)
    28852813  else
    2886    TEMPLATE_VBoxRc_TOOL              = VCC70
    2887    ifdef TODO_MORE_WARNINGS
    2888     TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
    2889    else
    2890     TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
    2891    endif
     2814   TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) -W3 -wd4244 -wd4996 $(VBOX_VCC_WERR)
    28922815  endif
    28932816  TEMPLATE_VBoxRc_CFLAGS             = $(TEMPLATE_VBoxRc_CXXFLAGS)
    28942817  TEMPLATE_VBoxRc_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Debug
    2895   ifdef VBOX_USE_VCC100
    2896    TEMPLATE_VBoxRc_LIBS               = \
    2897         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
    2898   else
    2899    if !defined(VBOX_NOINC_MISC) && !defined(VBOX_USE_VCC100)
    2900     include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
    2901    endif
    29022818  TEMPLATE_VBoxRc_LIBS               = \
    2903         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
    2904   endif
     2819        $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
    29052820  TEMPLATE_VBoxRc_LIBS              += \
    29062821        $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
    … …  
    29582873 ifeq ($(VBOX_LDR_FMT32),pe)
    29592874  TEMPLATE_VBoxRcExe_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
    2960   ifdef VBOX_USE_VCC100
    2961    TEMPLATE_VBoxRcExe_SDKS   = ReorderCompilerIncs $(VBOX_WINPSDK)
    2962   else
    2963    TEMPLATE_VBoxRcExe_SDKS   = WIN32SDK
    2964   endif
    2965   ifndef VBOX_USE_VCC70
    2966    TEMPLATE_VBoxRcExe_LIBS   = \
    2967         $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/libcmt.lib \
    2968         $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/oldnames.lib
    2969   else
    2970    TEMPLATE_VBoxRcExe_LIBS   = \
    2971         $(PATH_TOOL_VCC70_LIB)/libcmt.lib \
    2972         $(PATH_TOOL_VCC70_LIB)/oldnames.lib
    2973   endif
     2875  TEMPLATE_VBoxRcExe_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK)
     2876  TEMPLATE_VBoxRcExe_LIBS    = \
     2877        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/libcmt.lib \
     2878        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/oldnames.lib
    29742879 endif
    29752880
    … …  
    30262931ifeq ($(VBOX_LDR_FMT),pe)
    30272932TEMPLATE_VBoxR0_TOOL                = $(VBOX_VCC_TOOL)
    3028  ifndef VBOX_USE_VCC70
    3029   ifdef TODO_MORE_WARNINGS
    3030 TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_WERR)
    3031   else
    3032 TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_WERR)
    3033   endif
     2933 ifdef TODO_MORE_WARNINGS
     2934TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -wd4996 $(VBOX_VCC_WERR)
    30342935 else
    3035   ifdef TODO_MORE_WARNINGS
    3036 TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_WERR)
    3037   else
    3038 TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_WERR)
    3039   endif
     2936TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -W3 -wd4244 -wd4996 $(VBOX_VCC_WERR)
    30402937 endif
    30412938TEMPLATE_VBoxR0_CFLAGS              = $(TEMPLATE_VBoxR0_CXXFLAGS)
    … …  
    30462943TEMPLATE_VBoxR0_LIBS                = \
    30472944        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
    3048  ifdef VBOX_USE_VCC100
    3049   include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
     2945 include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
    30502946TEMPLATE_VBoxR0_LIBS.x86            = \
    30512947        $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
    3052  else
    3053 TEMPLATE_VBoxR0_LIBS.x86            = \
    3054         $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
    3055  endif
    30562948TEMPLATE_VBoxR0_POST_CMDS           = $(VBOX_SIGN_DRIVER_CMDS)
    30572949endif # pe
    … …  
    31483040 TEMPLATE_VBOXR0DRV_DEFS.x86          += WIN9X_COMPAT_SPINLOCK     # Avoid multiply defined _KeInitializeSpinLock@4
    31493041 TEMPLATE_VBOXR0DRV_DEFS.amd64         = _AMD64_
    3150  ifndef VBOX_USE_VCC70
    3151   TEMPLATE_VBOXR0DRV_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -Gz -W3 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    3152  else
    3153   TEMPLATE_VBOXR0DRV_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -Gz -W3 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    3154  endif
     3042 TEMPLATE_VBOXR0DRV_CXXFLAGS           = -Zi -Zl -GR- -EHs- -GF -Gz -W3 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    31553043 TEMPLATE_VBOXR0DRV_CFLAGS             = $(TEMPLATE_VBOXR0DRV_CXXFLAGS)
    31563044 TEMPLATE_VBOXR0DRV_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD -Debug
    … …  
    34013289ifeq ($(KBUILD_TARGET),win)
    34023290# TEMPLATE_VBOXR3EXE_TOOL               = $(VBOX_VCC_TOOL)
    3403 ifdef VBOX_USE_VCC70
    3404  TEMPLATE_VBOXR3EXE_TOOL.win.x86       = $(VBOX_VCC_TOOL)
    3405  TEMPLATE_VBOXR3EXE_TOOL.win.amd64     = VCC80AMD64
    3406 else
    34073291 TEMPLATE_VBOXR3EXE_TOOL.win.x86       = $(VBOX_VCC_TOOL_STEM)X86
    34083292 TEMPLATE_VBOXR3EXE_TOOL.win.amd64     = $(VBOX_VCC_TOOL_STEM)AMD64
    3409 endif
    34103293 TEMPLATE_VBOXR3EXE_RCDEFS             = \
    34113294        VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \
    … …  
    34183301        VBOX_SVN_REV_NR=$(VBOX_SVN_REV)
    34193302 TEMPLATE_VBOXR3EXE_SDKS               = ReorderCompilerIncs $(VBOX_WINPSDK)
    3420  ifndef VBOX_USE_VCC70
    3421   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)
    3422   TEMPLATE_VBOXR3EXE_CXXFLAGS.debug    = -RTCsu
    3423  else
    3424   TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    3425   TEMPLATE_VBOXR3EXE_CXXFLAGS.debug    = -GZ
    3426  endif
     3303 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)
     3304 TEMPLATE_VBOXR3EXE_CXXFLAGS.debug     = -RTCsu
    34273305 TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile  = -Gh -GH
    34283306 TEMPLATE_VBOXR3EXE_CFLAGS             = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
    … …  
    39333811 #       C4065 is about default only switches.
    39343812 #       C4996 is about deprected function (CRT only?).
    3935  ifndef VBOX_USE_VCC70
    3936   TEMPLATE_VBOXMAINEXE_TOOL              = $(VBOX_VCC_TOOL)
    3937   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)
    3938   TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug    = -RTCsu
    3939  else
    3940   TEMPLATE_VBOXMAINEXE_TOOL              = VCC70
    3941   TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4250 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
    3942   TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug    = -GZ
    3943  endif
     3813 TEMPLATE_VBOXMAINEXE_TOOL               = $(VBOX_VCC_TOOL)
     3814 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)
     3815 TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug     = -RTCsu
    39443816 TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile  = -Gh -GH
    39453817 TEMPLATE_VBOXMAINEXE_CFLAGS             = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)
    … …  
    42814153   endif
    42824154  else if1of ($(KBUILD_TARGET), win)
    4283    ifdef VBOX_USE_VCC100
    4284     VBOX_PATH_QT4 ?= $(lastword $(filter %-vcc100,$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
    4285    else
    4286     VBOX_PATH_QT4 ?= $(lastword $(filter-out %-vcc100,$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
    4287    endif
     4155   VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
    42884156  else if1of ($(KBUILD_TARGET), linux solaris)
    42894157   VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
    … …  
    43404208     QT_DLL _CRT_SECURE_NO_DEPRECATE \
    43414209     $(QMAKE_PRL_DEFINES)
    4342   ## @todo VCC70 flags?
    4343   ifndef VBOX_USE_VCC70
    4344    TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
    4345         -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
    4346    TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
    4347   else
    4348    TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
    4349         -nologo -Zm200 -W3 -MD -Zi -GX
    4350    TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -GZ
    4351   endif
     4210  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
     4211  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
    43524212  TEMPLATE_VBOXQT4GUIEXE_INCS += \
    43534213        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
    … …  
    45174377TEMPLATE_VBOXBLDPROG_ASFLAGS.amd64      := $(VBOX_ASFLAGS64)
    45184378ifeq ($(KBUILD_HOST),win)
    4519  ifndef VBOX_USE_VCC70
    4520   TEMPLATE_VBOXBLDPROG_TOOL             := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_HOST_ARCH))
    4521   TEMPLATE_VBOXBLDPROG_SDKS             := ReorderCompilerIncs $(VBOX_WINPSDK)
    4522  else if1of ($(KBUILD_HOST_ARCH), x86)
    4523   TEMPLATE_VBOXBLDPROG_TOOL             := VCC70
    4524   TEMPLATE_VBOXBLDPROG_SDKS             := ReorderCompilerIncs WIN32SDK
    4525  else if1of ($(KBUILD_HOST_ARCH), amd64)
    4526   TEMPLATE_VBOXBLDPROG_TOOL             := VCC80AMD64
    4527   TEMPLATE_VBOXBLDPROG_SDKS             := ReorderCompilerIncs WIN64SDK
    4528  else
    4529   $(error KBUILD_HOST_ARCH=$(KBUILD_HOST_ARCH))
    4530  endif
    4531  ifneq ($(TEMPLATE_VBOXBLDPROG_TOOL),VCC70)
    4532   TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3 -wd4996 -Zc:wchar_t-
    4533   TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    = -RTCsu
    4534   TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  = -O2 -Oy- -GS-
    4535  else
    4536   TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3
    4537   TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    = -GZ
    4538   TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  = -Ogitb2 -Oy-
    4539  endif
     4379 TEMPLATE_VBOXBLDPROG_TOOL              := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_HOST_ARCH))
     4380 TEMPLATE_VBOXBLDPROG_SDKS              := ReorderCompilerIncs $(VBOX_WINPSDK)
     4381 TEMPLATE_VBOXBLDPROG_CXXFLAGS          := -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3 -wd4996 -Zc:wchar_t-
     4382 TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    := -RTCsu
     4383 TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  := -O2 -Oy- -GS-
    45404384 TEMPLATE_VBOXBLDPROG_CXXFLAGS.profile   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
    45414385 TEMPLATE_VBOXBLDPROG_CXXFLAGS.kprofile  = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
    … …  
    47584602        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
    47594603        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
    4760  ifdef VBOX_USE_VCC100
    4761   TEMPLATE_VBOXGUESTR3EXE_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
    4762   TEMPLATE_VBOXGUESTR3EXE_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
    4763  endif
     4604 # Hack for running on NT4, W2K and XP w/o SP: Change OS and subsystem version in the image.
     4605 TEMPLATE_VBOXGUESTR3EXE_POST_CMDS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
     4606 TEMPLATE_VBOXGUESTR3EXE_LNK_DEPS.win.x86   = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
    47644607else # the gcc guys
    47654608 TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
    … …  
    49294772TEMPLATE_VBOXGUESTR0_EXTENDS     = VBOXR0DRV
    49304773TEMPLATE_VBOXGUESTR0_INST        = $(INST_ADDITIONS)
    4931 if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
    49324774TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
    49334775TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
    4934 else
    4935 TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs WIN32SDK $(VBOX_WINDDK)
    4936 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
    4937 endif
    49384776TEMPLATE_VBOXGUESTR0_LIBS.win.x86   = \
    49394777        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/int64.lib
    … …  
    50824920ifneq ($(VBOX_BUILD_PUBLISHER),)
    50834921 if $(length $(VBOX_BUILD_PUBLISHER)) > 10
    5084   $(error VBOX_BUILD_PUBLISHER must not be longer than 10 characters!)
     4922  $(error VBox: VBOX_BUILD_PUBLISHER must not be longer than 10 characters!)
    50854923 endif
    50864924 if "$(substr $(VBOX_BUILD_PUBLISHER), 1, 1)" != "_"
    5087   $(error VBOX_BUILD_PUBLISHER must start with an underscore!)
     4925  $(error VBox: VBOX_BUILD_PUBLISHER must start with an underscore!)
    50884926 endif
    50894927 if "$(translate $(substr $(VBOX_BUILD_PUBLISHER),2),$(VBOX_VERSION_COMP_VALID_CHAR_SET),)" != ""
    5090   $(error VBOX_BUILD_PUBLISHER='$(VBOX_BUILD_PUBLISHER)' contains bad characters! Valid set is:$(NLTAB)$(VBOX_VERSION_COMP_VALID_CHAR_SET))
     4928  $(error VBox: VBOX_BUILD_PUBLISHER='$(VBOX_BUILD_PUBLISHER)' contains bad characters! Valid set is:$(NLTAB)$(VBOX_VERSION_COMP_VALID_CHAR_SET))
    50914929 endif
    50924930endif
    50934931
    50944932if $(words $(VBOX_VERSION_STRING)) != 1
    5095  $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains spaces or is empty.)
     4933 $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains spaces or is empty.)
    50964934endif
    50974935if "$(subst __,-,$(VBOX_VERSION_STRING))" != "$(VBOX_VERSION_STRING)"
    5098  $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains double underscores.)
     4936 $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains double underscores.)
    50994937endif
    51004938
    … …  
    51024940
    51034941if $(words $(VBOX_VER_TMP1)) > 3
    5104  $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains too many parts (underscores), max 3!)
     4942 $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains too many parts (underscores), max 3!)
    51054943endif
    51064944if "$(translate $(word 1,$(VBOX_VER_TMP1)),0123456789,)" != ".."
    5107  $(error The x.y.z part of VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' is malformed: '$(word 1,$(VBOX_VER_TMP1))')
     4945 $(error VBox: The x.y.z part of VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' is malformed: '$(word 1,$(VBOX_VER_TMP1))')
    51084946endif
    51094947if "$(word 1,$(VBOX_VER_TMP1))" != "$(VBOX_VERSION_STRING_RAW)"
    5110  $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' does not start with VBOX_VERSION_STRING_RAW='$(VBOX_VERSION_STRING_RAW)')
     4948 $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' does not start with VBOX_VERSION_STRING_RAW='$(VBOX_VERSION_STRING_RAW)')
    51114949endif
    51124950
    … …  
    51194957  VBOX_VER_TMP2 = 3
    51204958 else
    5121   $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
     4959  $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
    51224960 endif
    51234961 if "$(translate $(substr $(word 2,$(VBOX_VER_TMP1)),$(VBOX_VER_TMP2)),0123456789)" != ""
    5124   $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
     4962  $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
    51254963 endif
    51264964endif

  • trunk/Makefile.kmk

    r42276 r42288  
    9595# The compiler runtime DLLs.
    9696ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
    97  ifdef VBOX_USE_VCC100
    98    VBOX_PATH_VCC_REDIST         = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
    99    VBOX_PATH_VCC_REDIST_CRT     = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT
    100    VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT
    101    InstallExternalLibs_SOURCES += \
    102         $(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll \
    103         $(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll \
    104         $(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll=>testcase/msvcr100.dll \
    105         $(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll=>testcase/msvcp100.dll
    106   ifeq ($(VBOX_VCC_CRT_TYPE),d)
    107         $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll \
    108         $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll \
    109         $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll=>testcase/msvcr100.dll \
    110         $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll=>testcase/msvcp100.dll
    111   endif
     97  VBOX_PATH_VCC_REDIST         = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
     98  VBOX_PATH_VCC_REDIST_CRT     = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT
     99  VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT
     100  InstallExternalLibs_SOURCES += \
     101        $(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     102        $(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     103        $(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     104        $(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     105 ifeq ($(VBOX_VCC_CRT_TYPE),d)
     106        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     107        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     108        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     109        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
    112110 endif
    113  ifdef VBOX_USE_VCC80
    114   include $(KBUILD_PATH)/tools/VCC80X86.kmk
    115   include $(KBUILD_PATH)/tools/VCC80AMD64.kmk
    116   InstallExternalLibs_SOURCES.x86 += \
    117         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    118         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
    119         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
    120         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    121         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
    122         $(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
    123   InstallExternalLibs_SOURCES.amd64 += \
    124         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    125         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
    126         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
    127         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    128         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
    129         $(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
    130   ifeq ($(VBOX_VCC_CRT_TYPE),d)
    131    InstallExternalLibs_SOURCES.x86 += \
    132         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
    133         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
    134         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \
    135         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
    136         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
    137         $(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
    138    InstallExternalLibs_SOURCES.amd64 += \
    139         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
    140         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
    141         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \
    142         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
    143         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
    144         $(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
    145   endif
    146  endif
    147  ifndef VBOX_USE_VCC100
    148   ifndef VBOX_USE_VCC80
    149    VBOX_INSTALL_VCC70_RT = 1
    150   endif
    151   ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
    152    VBOX_INSTALL_VCC70_RT = 1
    153   endif
    154  endif
    155  ifdef VBOX_INSTALL_VCC70_RT
    156   include $(KBUILD_PATH)/tools/VCC70.kmk
    157 
    158   ## @todo Move these defines to VCC70.
    159   DLL_TOOL_VCC70_MSVCR71 ?= $(PATH_TOOL_VCC70)/bin/msvcr71.dll
    160   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71)),)
    161    InstallExternalLibs_SOURCES += \
    162         $(DLL_TOOL_VCC70_MSVCR71)=>msvcr71.dll \
    163         $(DLL_TOOL_VCC70_MSVCR71)=>testcase/msvcr71.dll
    164   endif
    165   ifeq ($(VBOX_VCC_CRT_TYPE),d)
    166    DLL_TOOL_VCC70_MSVCR71D ?= $(PATH_TOOL_VCC70)/bin/msvcr71d.dll
    167    ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71D)),)
    168     InstallExternalLibs_SOURCES += \
    169         $(DLL_TOOL_VCC70_MSVCR71D)=>msvcr71d.dll \
    170         $(DLL_TOOL_VCC70_MSVCR71D)=>testcase/msvcr71d.dll
    171    endif
    172   endif
    173 
    174   DLL_TOOL_VCC70_MSVCP71 ?= $(PATH_TOOL_VCC70)/bin/msvcp71.dll
    175   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71)),)
    176    InstallExternalLibs_SOURCES += \
    177         $(DLL_TOOL_VCC70_MSVCP71)=>msvcp71.dll \
    178         $(DLL_TOOL_VCC70_MSVCP71)=>testcase/msvcp71.dll
    179   endif
    180   ifeq ($(VBOX_VCC_CRT_TYPE),d)
    181    DLL_TOOL_VCC70_MSVCP71D ?= $(PATH_TOOL_VCC70)/bin/msvcp71d.dll
    182    ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71D)),)
    183     InstallExternalLibs_SOURCES += \
    184         $(DLL_TOOL_VCC70_MSVCP71D)=>msvcp71d.dll \
    185         $(DLL_TOOL_VCC70_MSVCP71D)=>testcase/msvcp71d.dll
    186    endif
    187   endif
    188 
    189   DLL_TOOL_VCC70_MSVCRT  ?= $(PATH_TOOL_VCC70)/bin/msvcrt.dll
    190   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCRT)),)
    191    InstallExternalLibs_SOURCES += \
    192         $(DLL_TOOL_VCC70_MSVCRT)=>msvcrt.dll \
    193         $(DLL_TOOL_VCC70_MSVCRT)=>testcase/msvcrt.dll
    194   endif
    195  endif
    196 endif
    197 
     111endif
    198112
    199113#

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

    r42243 r42288  
    2828VBoxDisp_SYSSUFF       = .dll
    2929VBoxDisp_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
    30 VBoxDisp_DEFS.x86     = _WIN32_WINNT=0x0501
    31 ifndef VBOX_USE_VCC100
    32  VBoxDisp_DEFS.amd64  = _WIN32_WINNT=0x0500 # <- otherwise the build will fail due to DDK header inconsistencies
    33 endif
     30VBoxDisp_DEFS.x86      = _WIN32_WINNT=0x0501
    3431VBoxDisp_DEFS          = VBOX_WITH_DDRAW
    3532VBoxDisp_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED

  • trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk

    r42220 r42288  
    2222VBoxCredProv_TEMPLATE    = VBOXGUESTR3DLL
    2323VBoxCredProv_DEFS        = VBGL_VBOXGUEST VBOX_WITH_HGCM VBOX_WITH_SENS UNICODE
    24 ifdef VBOX_USE_VCC100
    2524VBoxCredProv_SDKS        = ReorderCompilerIncs $(VBOX_WINPSDK_GST_WLH)
    26 else
    27 VBoxCredProv_SDKS.x86    = WINDDK
    28 endif
    2925VBoxCredProv_SOURCES  = \
    3026        VBoxCredentialProvider.cpp \
    … …  
    3733        VBoxCredProvUtils.cpp
    3834
    39 ifndef VBOX_USE_VCC100
    40 #
    41 # Since this is not the default SDK we have to navigate manually to it.
    42 #
    43 VBOX_PATH_PSDK_200702    := \
    44         $(PATH_DEVTOOLS)/win.x86/sdk/x200702/
    45 
    46 VBoxCredProv_INCS        := \
    47         $(VBOX_PATH_PSDK_200702)/Include
    48 VBoxCredProv_LIBS.x86  := \
    49         $(VBOX_PATH_PSDK_200702)/Lib/Uuid.Lib \
    50         $(VBOX_PATH_PSDK_200702)/Lib/credui.lib \
    51         $(VBOX_PATH_PSDK_200702)/Lib/Secur32.Lib \
    52         $(VBOX_PATH_PSDK_200702)/Lib/ShLwApi.Lib \
    53         $(VBOX_PATH_PSDK_200702)/Lib/NetAPI32.Lib
    54 VBoxCredProv_LIBS.amd64  := \
    55         $(VBOX_PATH_PSDK_200702)/Lib/x64/Uuid.Lib \
    56         $(VBOX_PATH_PSDK_200702)/Lib/x64/credui.lib \
    57         $(VBOX_PATH_PSDK_200702)/Lib/x64/Secur32.Lib \
    58         $(VBOX_PATH_PSDK_200702)/Lib/x64/ShLwApi.Lib \
    59         $(VBOX_PATH_PSDK_200702)/Lib/x64/NetAPI32.Lib
    60 endif
    61 
    6235VBoxCredProv_LIBS     = \
    6336        $(VBOX_LIB_IPRT_GUEST_R3) \
    6437        $(VBOX_LIB_VBGL_R3)
    65 ifdef VBOX_USE_VCC100
    6638VBoxCredProv_LIBS    += \
    6739        $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/credui.lib \
    6840        $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/Secur32.Lib \
    6941        $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/NetAPI32.Lib
    70 endif
    7142
    7243include $(FILE_KBUILD_SUB_FOOTER)

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r42239 r42288  
    2525 VBoxTray_DEBUG_INSTTYPE = both
    2626endif
    27 if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
    28  VBoxTray_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST)
    29 endif
     27VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)
    3028VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR
    3129VBoxTray_INCS     = ../include
    32 if !defined(VBOX_USE_VCC100) && !defined(VBOX_USE_VCC110)
    33  include $(KBUILD_PATH)/sdks/WINDDK.kmk # WTF is this about?
    34  VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
    35 endif
    3630VBoxTray_SOURCES  = \
    3731        VBoxTray.cpp \

  • trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

    r42154 r42288  
    3535endif
    3636VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    37 if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
    38  VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
    39 else
    40  VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
    41 endif
     37VBoxInstallHelper_LIBS     = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
    4238ifdef VBOX_WITH_NETFLT
    4339 VBoxInstallHelper_LIBS   += \
    … …  
    4945endif
    5046
    51 ifeq ($(KBUILD_TARGET),win)
    52  ifdef VBOX_WITH_TESTCASES
    53   ifndef VBOX_OSE
    54    include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
    55   endif
    56  endif
     47if "$(KBUILD_TARGET)" == "win" && defined(VBOX_WITH_TESTCASES) && !defined(VBOX_OSE)
     48 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
    5749endif
    5850

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r42243 r42288  
    324324 VBOX_MSI_DEPENDENCIES := $(filer-out %.cat, $(VBOX_MSI_DEPENDENCIES))
    325325endif
    326 if !defined(VBOX_USE_VCC70) && !defined(VBOX_USE_VCC80) && !defined(VBOX_USE_VCC100)
    327 $(error One VBOX_USE_VCC* must be defined)
    328 endif
    329 ifndef VBOX_USE_VCC100
     326ifdef VBOX_USE_VCC110
    330327 VBOX_MSI_DEPENDENCIES := $(filter-out \
    331328        $(PATH_OUT)/bin/msvcr100.dll \
    332329        $(PATH_OUT)/bin/msvcp100.dll \
    333330        , $(VBOX_MSI_DEPENDENCIES))
    334 endif
    335 ifndef VBOX_USE_VCC80
     331else
    336332 VBOX_MSI_DEPENDENCIES := $(filter-out \
    337         $(PATH_OUT)/bin/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
    338         $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcr80.dll \
    339         $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcp80.dll \
    340         $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcm80.dll \
    341         , $(VBOX_MSI_DEPENDENCIES))
    342 endif
    343 ifndef VBOX_USE_VCC70
    344  VBOX_MSI_DEPENDENCIES := $(filter-out \
    345         $(PATH_OUT)/bin/msvcrt.dll \
    346         $(PATH_OUT)/bin/msvcr71.dll \
    347         $(PATH_OUT)/bin/msvcp71.dll \
    348         $(PATH_OUT)/bin/SDL_ttf.dll \
     333        $(PATH_OUT)/bin/msvcr110.dll \
     334        $(PATH_OUT)/bin/msvcp110.dll \
    349335        , $(VBOX_MSI_DEPENDENCIES))
    350336endif
    … …  
    465451                -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
    466452                -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
    467                 -E 'VBOX_USE_VCC100=$(if $(VBOX_USE_VCC100),yes,no)' \
    468                 -E 'VBOX_USE_VCC80=$(if $(VBOX_USE_VCC80),yes,no)' \
    469                 -E 'VBOX_USE_VCC70=$(if $(VBOX_USE_VCC70),yes,no)' \
     453                -E 'VBOX_USE_$(VBOX_VCC_TOOL_STEM)=yes' \
    470454                -- \
    471455                $(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \

  • trunk/src/VBox/Installer/win/Stub/Makefile.kmk

    r42154 r42288  
    3434VBoxStub_SDKS += \
    3535        VBOX_NTDLL
    36 if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
    3736VBoxStub_LIBS = \
    3837        $(VBOX_LIB_RUNTIME_STATIC) \
    3938        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
    40 else
    41 VBoxStub_LIBS = \
    42         $(VBOX_LIB_RUNTIME_STATIC) \
    43         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
    44 endif
    4539
    4640VBoxStub.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)

  • trunk/src/VBox/Installer/win/VirtualBox.wxs

    r42243 r42288  
    527527<?endif?>
    528528
    529 <?if $(env.VBOX_USE_VCC100) = "yes" ?>
     529<?if $(env.VBOX_USE_VCC100) == "yes" ?>
    530530                        <!-- MS C/C++ v10.0 Runtime DLL files. -->
    531531                        <File Id="file_msvcr100.dll" Name="msvcr100.dll"
    … …  
    534534                              Source="$(env.PATH_OUT)\bin\msvcp100.dll" />
    535535<?endif?>
    536 
    537 <?if $(env.VBOX_USE_VCC80) = "yes" ?>
    538                         <!-- MS C/C++ v8 Runtime DLL files (private assembly). -->
    539                         <File Id="file_Microsoft.VC80.CRT.manifest" Name="Microsoft.VC80.CRT.manifest"
    540                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" />
    541                         <File Id="file_msvcr80.dll" Name="msvcr80.dll"
    542                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcr80.dll" />
    543                         <File Id="file_msvcp80.dll" Name="msvcp80.dll"
    544                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcp80.dll" />
    545 <?endif?>
    546 
    547 <?if $(env.VBOX_USE_VCC70) = "yes" ?>
    548                         <!-- MS C/C++ v7 Runtime DLL files. -->
    549                         <File Id="file_msvcp71.dll" Name="msvcp71.dll"
    550                               Source="$(env.PATH_OUT)\bin\msvcp71.dll" />
    551                         <File Id="file_msvcrt.dll" Name="msvcrt.dll"
    552                               Source="$(env.PATH_OUT)\bin\msvcrt.dll" />
    553 <?endif?>
    554 <?if $(env.VBOX_USE_VCC100) != "yes" ?>
    555     <?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
    556                         <File Id="msvcrdll" Name="msvcr71.dll"
    557                               Source="$(env.PATH_OUT)\bin\msvcr71.dll" />
    558     <?endif?>
     536<?if $(env.VBOX_USE_VCC110) == "yes" ?>
     537                        <!-- MS C/C++ v11.0 Runtime DLL files. -->
     538                        <File Id="file_msvcr110.dll" Name="msvcr110.dll"
     539                              Source="$(env.PATH_OUT)\bin\msvcr110.dll" />
     540                        <File Id="file_msvcp110.dll" Name="msvcp110.dll"
     541                              Source="$(env.PATH_OUT)\bin\msvcp110.dll" />
    559542<?endif?>
    560543

  • trunk/src/VBox/Main/Makefile.kmk

    r42261 r42288  
    560560        -exported_symbols_list $(VBoxC_0_OUTDIR)/VBoxC.def \
    561561        -framework IOKit
    562 VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll
    563 ifndef VBOX_USE_VCC70
    564  VBoxC_LDFLAGS.win += /MANIFEST
    565 endif
     562VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll /MANIFEST
    566563
    567564VBoxC_LIBS += \

  • trunk/src/VBox/Main/webservice/Makefile.kmk

    r42154 r42288  
    207207 LIBRARIES += vboxsoap
    208208 vboxsoap_TEMPLATE = VBOXWEBR3EXE
    209  ifndef VBOX_USE_VCC70
    210   vboxsoap_CXXFLAGS.win += -bigobj
    211  endif
     209 vboxsoap_CXXFLAGS.win += -bigobj
    212210 ifn1of ($(KBUILD_TARGET), win)
    213211  vboxsoap_CXXFLAGS += -Wno-shadow
    … …  
    292290        $(VBOXWEB_OUT_DIR) \
    293291        .
    294  ifndef VBOX_USE_VCC70
    295   vboxwebsrv_CXXFLAGS.win += -bigobj
    296  endif
     292 vboxwebsrv_CXXFLAGS.win += -bigobj
    297293 ifn1of ($(KBUILD_TARGET), win)
    298294  vboxwebsrv_CXXFLAGS += -Wno-shadow
    … …  
    435431 PROGRAMS += webtest
    436432 webtest_TEMPLATE = VBOXWEBR3EXE
    437  ifndef VBOX_USE_VCC70
    438   webtest_CXXFLAGS.win += -bigobj
    439  endif
     433 webtest_CXXFLAGS.win += -bigobj
    440434 ifn1of ($(KBUILD_TARGET), win)
    441435  webtest_CXXFLAGS += -Wno-shadow

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

    r42247 r42288  
    10661066RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).amd64:= $(RuntimeR3_SOURCES.$(KBUILD_TARGET).amd64)
    10671067RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
    1068 ifdef VBOX_USE_VCC100
    1069  RuntimeGuestR3_SOURCES.win.x86              += \
     1068RuntimeGuestR3_SOURCES.win.x86               += \
    10701069        r3/win/vcc100-kernel32-fakes.cpp \
    10711070        r3/win/vcc100-kernel32-fakesA.asm
    1072 endif
    10731071
    10741072#
    … …  
    13301328        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/wbemuuid.lib
    13311329VBoxRT_LDFLAGS.darwin          = -framework IOKit -framework CoreFoundation -framework CoreServices -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
    1332 ifdef VBOX_USE_VCC80
    13331330VBoxRT_LDFLAGS.win             = /MANIFEST
    1334 endif
    13351331VBoxRT_LDFLAGS.l4              = \
    13361332        -Wl,-whole-archive \
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