Changeset 42288 in vbox for trunk/src/VBox/Additions/WINNT

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/Additions/WINNT

Files:

• Graphics/Video/disp/Makefile.kmk (modified) (1 diff)
• VBoxCredProv/Makefile.kmk (modified) (2 diffs)
• VBoxTray/Makefile.kmk (modified) (1 diff)

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 \