Changeset 9521 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 8, 2008 4:59:21 AM (17 years ago)

Author:

vboxsync

Message:

x86 fixes (when VBOX_WITH_64BIT_ADDITIONS=1).

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Miniport/Makefile.kmk (modified) (1 diff)
• VBoxGuest/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

@@ -57 +57 @@
 ifdef VBOX_WITH_64BIT_ADDITIONS
 VBoxVideo_LIBS.x86    = \
-        $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib
+        $(PATH_SDK_W2K3DDK_LIB)/exsup.lib
 VBoxVideo_LIBS        = \
         $(PATH_SDK_W2K3DDK_LIB)/videoprt.lib \

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

@@ -74 +74 @@
 ifdef VBOX_WITH_64BIT_ADDITIONS
 SYSMODS.x86 += VBoxGuestNT
+VBoxGuestNT_EXTENDS   = VBoxGuest
 VBoxGuestNT_TEMPLATE  = VBOXGUESTR0
 else
@@ -79 +80 @@
 VBoxGuestNT_TEMPLATE  = VBOXW32GUESTR0
 VBoxGuestNT_SDKS      = W2K3DDKX86 WINPSDKINCS
+VBoxGuestNT_INCS      = $(VBoxGuest_INCS)
+VBoxGuestNT_LDFLAGS   = $(VBoxGuest_LDFLAGS)
 endif
 VBoxGuestNT_DEFS      = $(VBoxGuest_DEFS) TARGET_NT4
-VBoxGuestNT_INCS      = $(VBoxGuest_INCS)
-VBoxGuestNT_LDFLAGS   = $(VBoxGuest_LDFLAGS)
 VBoxGuestNT_SOURCES   = \
         VBoxGuest.cpp \
@@ -90 +91 @@
 ifdef VBOX_WITH_64BIT_ADDITIONS
 VBoxGuestNT_LIBS      = \
-        $(PATH_SDK_W2K3DDKX86_LIB)/exsup.lib \
-        $(PATH_SDK_W2K3DDKX86_LIB)/int64.lib \
-        $(PATH_SDK_W2K3DDKX86_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_W2K3DDKX86_LIB)/hal.lib \
+        $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \
+        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
         $(VBOX_LIB_VBGL_R0BASE) \
         $(VBOX_LIB_IPRT_GUEST_R0_NT4)