Changeset 93265 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp

Timestamp:

Jan 17, 2022 10:51:43 AM (3 years ago)

Author:

vboxsync

Message:

Add,SUP: x86 build adjustments for /guard:cf. bugref:10162

File:

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

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

@@ -39 +39 @@
  VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
 endif
-VBoxVideo_INCS          = ../../../include .. . $(VBOX_GRAPHICS_INCS)
+VBoxVideo_INCS          = \
+        ../../../include \
+        .. \
+        . \
+        $(VBOX_GRAPHICS_INCS)
 VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
 VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
@@ -59 +63 @@
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
 VBoxVideo_LIBS          = \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/videoprt.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/ntoskrnl.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/hal.lib \
+        $(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)
-VBoxVideo_LIBS.x86      = \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_NT4)_LIB)/exsup.lib
-if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142" && !defined(VBOX_WITHOUT_CONTROL_FLOW_GUARD)
- VBoxVideo_LIBS += \
-        $(PATH_SDK_$(VBOX_WINDDK)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.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