Changeset 70162 in vbox for trunk/src/VBox

Timestamp:

Dec 15, 2017 5:05:06 PM (7 years ago)

Author:

vboxsync

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

119724

Message:

IPRT,VBoxGuest: Dropped NT4 specific ring-0 library. VBoxGuestNT.sys is now identical to VBoxGuest.sys.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (2 diffs)
• Runtime/Makefile.kmk (modified) (4 diffs)

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

@@ -50 +50 @@
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
  VBoxGuest_DEFS.win      = VBOX_GUESTDRV_WITH_RELEASE_LOGGER
+ VBoxGuest_DEFS.win.x86  = TARGET_NT4
  VBoxGuest_DEFS.darwin   = VBOX_GUESTDRV_WITH_RELEASE_LOGGER
  ifeq ($(KBUILD_TYPE),release)
@@ -81 +82 @@
    VBoxGuest_LDFLAGS.x86 = -Entry:DriverEntry@8
    VBoxGuest_LDFLAGS.amd64 = -Entry:DriverEntry
-   VBoxGuest_LIBS        = \
-        $(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_$(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)
+   ifeq ($(KBUILD_TARGET_ARCH),x86)
+    VBoxGuest_SDKS       = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
+    VBoxGuest_LIBS       = \
+        $(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
+   else
+    VBoxGuest_LIBS        = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/hal.lib
    endif
   endif # win

trunk/src/VBox/Runtime/Makefile.kmk

@@ -37 +37 @@
   LIBRARIES += RuntimeGuestR0
   #LIBRARIES.os2 += RuntimeGuestR0OS2Warp3
-  LIBRARIES.win.x86 += RuntimeGuestR0NT4
  endif
  ifndef VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER
@@ -99 +98 @@
   endif
   #LIBRARIES.os2 += RuntimeGuestR0OS2Warp3
-  LIBRARIES.win.x86 += RuntimeGuestR0NT4
  endif # VBOX_WITH_ADDITIONS
  LIBRARIES.win.x86 += RuntimeR3VccTricks
@@ -2689 +2687 @@
 RuntimeGuestR0_TEMPLATE  := VBOXGUESTR0LIB
 RuntimeGuestR0_EXTENDS    = RuntimeR0Drv
+RuntimeGuestR0_DEFS.win.x86 = $(RuntimeR0Drv_DEFS.win.x86) IPRT_TARGET_NT4 # The 32-bit version needs to work on NT4 too.
 RuntimeGuestR0_SOURCES   := $(filter-out generic/RTLogWriteUser-generic.cpp, $(RuntimeR0Drv_SOURCES))
 RuntimeGuestR0_SOURCES   += \
@@ -2694 +2693 @@
 RuntimeGuestR0_SOURCES.win := \
         $(filter-out common/checksum/md% common/checksum/sha%, $(RuntimeR0Drv_SOURCES.win))
-
-
-#
-# RuntimeGuestR0NT4 - Win32 NT4 guest driver runtime.
-#
-RuntimeGuestR0NT4_EXTENDS = RuntimeGuestR0
-RuntimeGuestR0NT4_EXTENDS_BY = appending
-RuntimeGuestR0NT4_DEFS = IPRT_TARGET_NT4