Changeset 42154 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 13, 2012 11:00:53 PM (13 years ago)

Author:

vboxsync

Message:

VS2010 preps.

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -71 +71 @@
  ifdef VBOX_WITH_USB
   VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
-  VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
+  VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
    VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
@@ -79 +79 @@
   endif
  else
-  VBoxDDU_SDKS.win        = WINPSDK
+  VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK)
  endif
  VBoxDDU_SOURCES          = \
@@ -102 +102 @@
   VBoxDDU_LIBS.win       += \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
-        $(PATH_SDK_W2K3DDK_LIB)/Newdev.lib
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib
  endif
  ifeq ($(KBUILD_TARGET),l4)
@@ -132 +132 @@
  #
  VBoxDD_TEMPLATE         = VBoxR3DllWarnNoPic
- VBoxDD_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
- Storage/DrvHostDVD.cpp_SDKS.win = W2K3DDK
+ VBoxDD_SDKS.win         = ReorderCompilerIncs $(VBOX_WINPSDK) DXSDK $(VBOX_WINDDK) VBOX_NTDLL
+ Storage/DrvHostDVD.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK)
  VBoxDD_INCS             = \
         build \
@@ -940 +940 @@
  VBoxDDR0_DEFS.win    += VBOX_WITH_WIN_PARPORT_SUP
  VBoxDDR0_INCS           = build
- VBoxDDR0_SDKS.win       = WINPSDK W2K3DDK
+ VBoxDDR0_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  VBoxDDR0_SOURCES        = \
         build/VBoxDDR0.cpp \