Changeset 106441 in vbox

Timestamp:

Oct 17, 2024 11:57:19 AM (4 months ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: Only build the XPDM style video driver if VBOX_WITH_XPDM is set to avoid building it for arm64 where it is not supported, bugref:10734

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -34 +34 @@
 # Note. This has to run on NT4! (*_NT4 => *_W2K3 when targeting 64-bit.)
 #
-SYSMODS += VBoxVideo
-VBoxVideo_TEMPLATE      = VBoxGuestR0Drv
-VBoxVideo_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
-VBoxVideo_DEFS          = VBOX_XPDM_MINIPORT VBOX_WITH_8BPP_MODES VBOX_USING_$(VBOX_WINDDK_GST_NT4)
-VBoxVideo_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED
-VBoxVideo_DEFS         += VBOX_SVN_REV=$(VBOX_SVN_REV)
-ifdef VBOX_WITH_VIDEOHWACCEL
- VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
+ifdef VBOX_WITH_XPDM
+ SYSMODS += VBoxVideo
+ VBoxVideo_TEMPLATE      = VBoxGuestR0Drv
+ VBoxVideo_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
+ VBoxVideo_DEFS          = VBOX_XPDM_MINIPORT VBOX_WITH_8BPP_MODES VBOX_USING_$(VBOX_WINDDK_GST_NT4)
+ VBoxVideo_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED
+ VBoxVideo_DEFS         += VBOX_SVN_REV=$(VBOX_SVN_REV)
+ ifdef VBOX_WITH_VIDEOHWACCEL
+  VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
+ endif
+ VBoxVideo_INCS          = \
+        ../../../include \
+        .. \
+        . \
+        $(VBOX_GRAPHICS_INCS)
+ VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
+ VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
+ VBoxVideo_SOURCES       = \
+        xpdm/VBoxMPDriver.cpp \
+        xpdm/VBoxMP.def \
+        xpdm/VBoxMP.rc \
+        xpdm/VBoxMPVideoPortAPI.cpp \
+        xpdm/VBoxMPInternal.cpp \
+        xpdm/VBoxMPRegistry.cpp \
+        xpdm/VBoxMPIOCTL.cpp \
+        common/VBoxMPUtils.cpp \
+        common/VBoxMPCommon.cpp \
+        common/VBoxMPHGSMI.cpp \
+        common/VBoxMPVidModes.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBuffers.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIHostCmd.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
+ VBoxVideo_LIBS          = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/videoprt.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/hal.lib \
+        $(VBOX_LIB_VBGL_R0) \
+        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
+        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VBoxVideo_LIBS         += \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib # Needed for ___security_cookie.
+ endif
+ VBoxVideo_USES.win = vboximportchecker
+ VBoxVideo_VBOX_IMPORT_CHECKER.win.x86 = nt4/r0
+ VBoxVideo_VBOX_IMPORT_CHECKER.win.amd64 = xp64/r0
 endif
-VBoxVideo_INCS          = \
-        ../../../include \
-        .. \
-        . \
-        $(VBOX_GRAPHICS_INCS)
-VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
-VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
-VBoxVideo_SOURCES       = \
-        xpdm/VBoxMPDriver.cpp \
-        xpdm/VBoxMP.def \
-        xpdm/VBoxMP.rc \
-        xpdm/VBoxMPVideoPortAPI.cpp \
-        xpdm/VBoxMPInternal.cpp \
-        xpdm/VBoxMPRegistry.cpp \
-        xpdm/VBoxMPIOCTL.cpp \
-        common/VBoxMPUtils.cpp \
-        common/VBoxMPCommon.cpp \
-        common/VBoxMPHGSMI.cpp \
-        common/VBoxMPVidModes.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBuffers.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIHostCmd.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
-VBoxVideo_LIBS          = \
-        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/videoprt.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/hal.lib \
-        $(VBOX_LIB_VBGL_R0) \
-        $(VBOX_LIB_IPRT_GUEST_R0_NT4) \
-        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
-ifeq ($(KBUILD_TARGET_ARCH),x86)
- VBoxVideo_LIBS         += \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowK.lib # Needed for ___security_cookie.
-endif
-VBoxVideo_USES.win = vboximportchecker
-VBoxVideo_VBOX_IMPORT_CHECKER.win.x86 = nt4/r0
-VBoxVideo_VBOX_IMPORT_CHECKER.win.amd64 = xp64/r0
 
 ifdef VBOX_WITH_WDDM
@@ -113 +115 @@
  VBoxWddm_LDFLAGS.x86     += /Entry:DriverEntry@8
  VBoxWddm_LDFLAGS.amd64   += /Entry:DriverEntry
+ VBoxWddm_LDFLAGS.arm64   += /Entry:DriverEntry
 
  VBoxWddm_SOURCES          = \
@@ -145 +148 @@
 
  VBoxWddm_LIBS             = \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/ntoskrnl.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/hal.lib \
@@ -154 +156 @@
 
  VBoxWddm_LIBS.x86         = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/memcmp.lib
+ VBoxWddm_LIBS.amd64       = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib
+ VBoxWddm_LIBS.arm64       = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowFastFailK.lib
 
  ifdef VBOX_WITH_VMSVGA