Changeset 42288 in vbox for trunk/src/VBox

Timestamp:

Jul 20, 2012 6:30:53 PM (13 years ago)

Author:

vboxsync

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

79346

Message:

Jettisoned the old compilers.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/disp/Makefile.kmk (modified) (1 diff)
• Additions/WINNT/VBoxCredProv/Makefile.kmk (modified) (2 diffs)
• Additions/WINNT/VBoxTray/Makefile.kmk (modified) (1 diff)
• Installer/win/InstallHelper/Makefile.kmk (modified) (2 diffs)
• Installer/win/Makefile.kmk (modified) (2 diffs)
• Installer/win/Stub/Makefile.kmk (modified) (1 diff)
• Installer/win/VirtualBox.wxs (modified) (2 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/webservice/Makefile.kmk (modified) (3 diffs)
• Runtime/Makefile.kmk (modified) (2 diffs)

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

@@ -28 +28 @@
 VBoxDisp_SYSSUFF       = .dll
 VBoxDisp_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
-VBoxDisp_DEFS.x86     = _WIN32_WINNT=0x0501
-ifndef VBOX_USE_VCC100
- VBoxDisp_DEFS.amd64  = _WIN32_WINNT=0x0500 # <- otherwise the build will fail due to DDK header inconsistencies
-endif
+VBoxDisp_DEFS.x86      = _WIN32_WINNT=0x0501
 VBoxDisp_DEFS          = VBOX_WITH_DDRAW
 VBoxDisp_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED

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

@@ -22 +22 @@
 VBoxCredProv_TEMPLATE    = VBOXGUESTR3DLL
 VBoxCredProv_DEFS        = VBGL_VBOXGUEST VBOX_WITH_HGCM VBOX_WITH_SENS UNICODE
-ifdef VBOX_USE_VCC100
 VBoxCredProv_SDKS        = ReorderCompilerIncs $(VBOX_WINPSDK_GST_WLH)
-else
-VBoxCredProv_SDKS.x86    = WINDDK
-endif
 VBoxCredProv_SOURCES  = \
         VBoxCredentialProvider.cpp \
@@ -37 +33 @@
         VBoxCredProvUtils.cpp
 
-ifndef VBOX_USE_VCC100
-#
-# Since this is not the default SDK we have to navigate manually to it.
-#
-VBOX_PATH_PSDK_200702    := \
-        $(PATH_DEVTOOLS)/win.x86/sdk/x200702/
-
-VBoxCredProv_INCS        := \
-        $(VBOX_PATH_PSDK_200702)/Include
-VBoxCredProv_LIBS.x86  := \
-        $(VBOX_PATH_PSDK_200702)/Lib/Uuid.Lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/credui.lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/Secur32.Lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/ShLwApi.Lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/NetAPI32.Lib
-VBoxCredProv_LIBS.amd64  := \
-        $(VBOX_PATH_PSDK_200702)/Lib/x64/Uuid.Lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/x64/credui.lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/x64/Secur32.Lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/x64/ShLwApi.Lib \
-        $(VBOX_PATH_PSDK_200702)/Lib/x64/NetAPI32.Lib
-endif
-
 VBoxCredProv_LIBS     = \
         $(VBOX_LIB_IPRT_GUEST_R3) \
         $(VBOX_LIB_VBGL_R3)
-ifdef VBOX_USE_VCC100
 VBoxCredProv_LIBS    += \
         $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/credui.lib \
         $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/Secur32.Lib \
         $(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/NetAPI32.Lib
-endif
 
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -25 +25 @@
  VBoxTray_DEBUG_INSTTYPE = both
 endif
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
- VBoxTray_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST)
-endif
+VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)
 VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR
 VBoxTray_INCS     = ../include
-if !defined(VBOX_USE_VCC100) && !defined(VBOX_USE_VCC110)
- include $(KBUILD_PATH)/sdks/WINDDK.kmk # WTF is this about?
- VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
-endif
 VBoxTray_SOURCES  = \
         VBoxTray.cpp \

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

@@ -35 +35 @@
 endif
 VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
- VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
-else
- VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
-endif
+VBoxInstallHelper_LIBS     = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
 ifdef VBOX_WITH_NETFLT
  VBoxInstallHelper_LIBS   += \
@@ -49 +45 @@
 endif
 
-ifeq ($(KBUILD_TARGET),win)
- ifdef VBOX_WITH_TESTCASES
-  ifndef VBOX_OSE
-   include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-  endif
- endif
+if "$(KBUILD_TARGET)" == "win" && defined(VBOX_WITH_TESTCASES) && !defined(VBOX_OSE)
+ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 endif
 

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

@@ -324 +324 @@
  VBOX_MSI_DEPENDENCIES := $(filer-out %.cat, $(VBOX_MSI_DEPENDENCIES))
 endif
-if !defined(VBOX_USE_VCC70) && !defined(VBOX_USE_VCC80) && !defined(VBOX_USE_VCC100)
-$(error One VBOX_USE_VCC* must be defined)
-endif
-ifndef VBOX_USE_VCC100
+ifdef VBOX_USE_VCC110
  VBOX_MSI_DEPENDENCIES := $(filter-out \
         $(PATH_OUT)/bin/msvcr100.dll \
         $(PATH_OUT)/bin/msvcp100.dll \
         , $(VBOX_MSI_DEPENDENCIES))
-endif
-ifndef VBOX_USE_VCC80
+else
  VBOX_MSI_DEPENDENCIES := $(filter-out \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcr80.dll \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcp80.dll \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcm80.dll \
-        , $(VBOX_MSI_DEPENDENCIES))
-endif
-ifndef VBOX_USE_VCC70
- VBOX_MSI_DEPENDENCIES := $(filter-out \
-        $(PATH_OUT)/bin/msvcrt.dll \
-        $(PATH_OUT)/bin/msvcr71.dll \
-        $(PATH_OUT)/bin/msvcp71.dll \
-        $(PATH_OUT)/bin/SDL_ttf.dll \
+        $(PATH_OUT)/bin/msvcr110.dll \
+        $(PATH_OUT)/bin/msvcp110.dll \
         , $(VBOX_MSI_DEPENDENCIES))
 endif
@@ -465 +451 @@
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
-                -E 'VBOX_USE_VCC100=$(if $(VBOX_USE_VCC100),yes,no)' \
-                -E 'VBOX_USE_VCC80=$(if $(VBOX_USE_VCC80),yes,no)' \
-                -E 'VBOX_USE_VCC70=$(if $(VBOX_USE_VCC70),yes,no)' \
+                -E 'VBOX_USE_$(VBOX_VCC_TOOL_STEM)=yes' \
                 -- \
                 $(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \

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

@@ -34 +34 @@
 VBoxStub_SDKS += \
         VBOX_NTDLL
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
 VBoxStub_LIBS = \
         $(VBOX_LIB_RUNTIME_STATIC) \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
-else
-VBoxStub_LIBS = \
-        $(VBOX_LIB_RUNTIME_STATIC) \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
-endif
 
 VBoxStub.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)

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

@@ -527 +527 @@
 <?endif?>
 
-<?if $(env.VBOX_USE_VCC100) = "yes" ?>
+<?if $(env.VBOX_USE_VCC100) == "yes" ?>
                         <!-- MS C/C++ v10.0 Runtime DLL files. -->
                         <File Id="file_msvcr100.dll" Name="msvcr100.dll"
@@ -534 +534 @@
                               Source="$(env.PATH_OUT)\bin\msvcp100.dll" />
 <?endif?>
-
-<?if $(env.VBOX_USE_VCC80) = "yes" ?>
-                        <!-- MS C/C++ v8 Runtime DLL files (private assembly). -->
-                        <File Id="file_Microsoft.VC80.CRT.manifest" Name="Microsoft.VC80.CRT.manifest"
-                              Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" />
-                        <File Id="file_msvcr80.dll" Name="msvcr80.dll"
-                              Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcr80.dll" />
-                        <File Id="file_msvcp80.dll" Name="msvcp80.dll"
-                              Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcp80.dll" />
-<?endif?>
-
-<?if $(env.VBOX_USE_VCC70) = "yes" ?>
-                        <!-- MS C/C++ v7 Runtime DLL files. -->
-                        <File Id="file_msvcp71.dll" Name="msvcp71.dll"
-                              Source="$(env.PATH_OUT)\bin\msvcp71.dll" />
-                        <File Id="file_msvcrt.dll" Name="msvcrt.dll"
-                              Source="$(env.PATH_OUT)\bin\msvcrt.dll" />
-<?endif?>
-<?if $(env.VBOX_USE_VCC100) != "yes" ?>
-    <?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
-                        <File Id="msvcrdll" Name="msvcr71.dll"
-                              Source="$(env.PATH_OUT)\bin\msvcr71.dll" />
-    <?endif?>
+<?if $(env.VBOX_USE_VCC110) == "yes" ?>
+                        <!-- MS C/C++ v11.0 Runtime DLL files. -->
+                        <File Id="file_msvcr110.dll" Name="msvcr110.dll"
+                              Source="$(env.PATH_OUT)\bin\msvcr110.dll" />
+                        <File Id="file_msvcp110.dll" Name="msvcp110.dll"
+                              Source="$(env.PATH_OUT)\bin\msvcp110.dll" />
 <?endif?>
 

trunk/src/VBox/Main/Makefile.kmk

@@ -560 +560 @@
         -exported_symbols_list $(VBoxC_0_OUTDIR)/VBoxC.def \
         -framework IOKit
-VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll
-ifndef VBOX_USE_VCC70
- VBoxC_LDFLAGS.win += /MANIFEST
-endif
+VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll /MANIFEST
 
 VBoxC_LIBS += \

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

@@ -207 +207 @@
  LIBRARIES += vboxsoap
  vboxsoap_TEMPLATE = VBOXWEBR3EXE
- ifndef VBOX_USE_VCC70
-  vboxsoap_CXXFLAGS.win += -bigobj
- endif
+ vboxsoap_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
   vboxsoap_CXXFLAGS += -Wno-shadow
@@ -292 +290 @@
         $(VBOXWEB_OUT_DIR) \
         .
- ifndef VBOX_USE_VCC70
-  vboxwebsrv_CXXFLAGS.win += -bigobj
- endif
+ vboxwebsrv_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
   vboxwebsrv_CXXFLAGS += -Wno-shadow
@@ -435 +431 @@
  PROGRAMS += webtest
  webtest_TEMPLATE = VBOXWEBR3EXE
- ifndef VBOX_USE_VCC70
-  webtest_CXXFLAGS.win += -bigobj
- endif
+ webtest_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
   webtest_CXXFLAGS += -Wno-shadow

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1066 +1066 @@
 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).amd64:= $(RuntimeR3_SOURCES.$(KBUILD_TARGET).amd64)
 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
-ifdef VBOX_USE_VCC100
- RuntimeGuestR3_SOURCES.win.x86              += \
+RuntimeGuestR3_SOURCES.win.x86               += \
         r3/win/vcc100-kernel32-fakes.cpp \
         r3/win/vcc100-kernel32-fakesA.asm
-endif
 
 #
@@ -1330 +1328 @@
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/wbemuuid.lib
 VBoxRT_LDFLAGS.darwin          = -framework IOKit -framework CoreFoundation -framework CoreServices -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
-ifdef VBOX_USE_VCC80
 VBoxRT_LDFLAGS.win             = /MANIFEST
-endif
 VBoxRT_LDFLAGS.l4              = \
         -Wl,-whole-archive \