Changeset 42154 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

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

Author:

vboxsync

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

79125

Message:

VS2010 preps.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuest-win.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -65 +65 @@
    VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry
    VBoxGuest_LIBS        = \
-        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/hal.lib
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/hal.lib
    ifdef VBOX_WITH_GUEST_BUGCHECK_DETECTION
     VBoxGuest_LIBS      += \
-        $(PATH_SDK_WINDDKWLH_LIB)/aux_klib.lib \
-        $(PATH_SDK_WINDDKWLH_LIB)/ksecdd.lib \
-        $(PATH_SDK_WINDDKWLH_LIB)/BufferOverflowK.lib
-    VBoxGuest.cpp_SDKS   = WINDDKWLH
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/aux_klib.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/ksecdd.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB)/BufferOverflowK.lib
+    VBoxGuest.cpp_SDKS   = $(VBOX_WINDDK_GST_WLH)
    endif
   endif # win
@@ -135 +135 @@
   VBoxGuestNT_EXTENDS = VBoxGuest
   VBoxGuestNT_INSTTYPE.win = both
+  VBoxGuestNT_SDKS    = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
   VBoxGuestNT_DEFS    = $(VBoxGuest_DEFS) TARGET_NT4
   VBoxGuestNT_SOURCES = \
@@ -143 +144 @@
         win/VBoxGuest.rc
   VBoxGuestNT_LIBS    = \
-        $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib \
         $(VBOX_LIB_VBGL_R0BASE) \
         $(VBOX_LIB_IPRT_GUEST_R0_NT4)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h

@@ -24 +24 @@
 
 RT_C_DECLS_BEGIN
+#ifdef RT_ARCH_X86
+# define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
+#endif
 #include <ntddk.h>
+#ifdef RT_ARCH_X86
+# undef _InterlockedAddLargeStatistic
+#endif
 RT_C_DECLS_END