Changeset 106454 in vbox for trunk/src/VBox/Additions/WINNT/Graphics
- Timestamp:
- Oct 17, 2024 1:59:36 PM (3 months ago)
- Location:
- trunk/src/VBox/Additions/WINNT/Graphics/Video
- Files:
-
- 3 edited
-
Makefile.kmk (modified) (1 diff)
-
disp/Makefile.kmk (modified) (1 diff)
-
mp/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
r106061 r106454 33 33 include $(PATH_SUB_CURRENT)/disp/Makefile.kmk 34 34 35 # 36 # Install the inf & cat. 37 # This has to be done here since it depends on both the 38 # miniport driver and the display dll. 39 # 40 INSTALLS += VBoxVideo-inf 41 VBoxVideo-inf_INST = $(INST_ADDITIONS) 42 VBoxVideo-inf_MODE = a+r,u+w 43 VBoxVideo-inf_SOURCES = \ 44 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf 45 VBoxVideo-inf_SOURCES.x86 = \ 46 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf 47 VBoxVideo-inf_CLEAN = $(VBoxVideo-inf_SOURCES) 48 VBoxVideo-inf_BLDDIRS = $(PATH_TARGET)/VBoxVideoCat.dir 49 VBoxVideo-inf_BLDDIRS.x86 = $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir 50 51 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideo.inf $(MAKEFILE_CURRENT) | $$(dir $$@) 52 $(call MSG_GENERATE,VBoxVideo-inf,$@,$<) 53 $(call VBOX_EDIT_INF_FN,$<,$@) 54 55 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideoEarlyNT.inf $(MAKEFILE_CURRENT) | $$(dir $$@) 56 $(call MSG_GENERATE,VBoxVideoEarlyNT-inf,$@,$<) 57 $(call VBOX_EDIT_INF_FN,$<,$@) 58 59 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 60 VBoxVideo-inf_SOURCES += \ 61 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat \ 62 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat=>VBoxVideo-PreW10.cat \ 63 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \ 64 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll 65 VBoxVideo-inf_SOURCES.x86 += \ 66 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.cat 67 68 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \ 69 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@) 70 $(INSTALL) -m 644 $< $(@D) 71 72 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \ 73 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@) 74 $(INSTALL) -m 644 $< $(@D) 75 76 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat: \ 77 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf \ 78 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \ 79 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll 80 $(call MSG_TOOL,Inf2Cat,VBoxVideo-inf,$@,$<) 81 $(call VBOX_MAKE_CAT_FN, $(@D),$@) 82 83 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.cat: \ 84 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf \ 85 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideo.sys \ 86 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxDisp.dll 87 $(call MSG_TOOL,Inf2Cat,VBoxVideoEarlyNT-inf,$@,$<) 88 $(call VBOX_MAKE_CAT_FN, $(@D),$@) 89 90 endif # signing 35 ifdef VBOX_WITH_XPDM 36 # 37 # Install the inf & cat. 38 # This has to be done here since it depends on both the 39 # miniport driver and the display dll. 40 # 41 INSTALLS += VBoxVideo-inf 42 VBoxVideo-inf_INST = $(INST_ADDITIONS) 43 VBoxVideo-inf_MODE = a+r,u+w 44 VBoxVideo-inf_SOURCES = \ 45 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf 46 VBoxVideo-inf_SOURCES.x86 = \ 47 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf 48 VBoxVideo-inf_CLEAN = $(VBoxVideo-inf_SOURCES) 49 VBoxVideo-inf_BLDDIRS = $(PATH_TARGET)/VBoxVideoCat.dir 50 VBoxVideo-inf_BLDDIRS.x86 = $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir 51 52 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideo.inf $(MAKEFILE_CURRENT) | $$(dir $$@) 53 $(call MSG_GENERATE,VBoxVideo-inf,$@,$<) 54 $(call VBOX_EDIT_INF_FN,$<,$@) 55 56 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf: $(PATH_SUB_CURRENT)/mp/xpdm/VBoxVideoEarlyNT.inf $(MAKEFILE_CURRENT) | $$(dir $$@) 57 $(call MSG_GENERATE,VBoxVideoEarlyNT-inf,$@,$<) 58 $(call VBOX_EDIT_INF_FN,$<,$@) 59 60 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 61 VBoxVideo-inf_SOURCES += \ 62 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat \ 63 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat=>VBoxVideo-PreW10.cat \ 64 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \ 65 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll 66 VBoxVideo-inf_SOURCES.x86 += \ 67 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.cat 68 69 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \ 70 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideo.sys: $$(VBoxVideo_1_TARGET) | $$(dir $$@) 71 $(INSTALL) -m 644 $< $(@D) 72 73 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \ 74 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxDisp.dll: $$(VBoxDisp_1_TARGET) | $$(dir $$@) 75 $(INSTALL) -m 644 $< $(@D) 76 77 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat: \ 78 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf \ 79 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \ 80 $(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll 81 $(call MSG_TOOL,Inf2Cat,VBoxVideo-inf,$@,$<) 82 $(call VBOX_MAKE_CAT_FN, $(@D),$@) 83 84 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.cat: \ 85 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideoEarlyNT.inf \ 86 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxVideo.sys \ 87 $(PATH_TARGET)/VBoxVideoEarlyNTCat.dir/VBoxDisp.dll 88 $(call MSG_TOOL,Inf2Cat,VBoxVideoEarlyNT-inf,$@,$<) 89 $(call VBOX_MAKE_CAT_FN, $(@D),$@) 90 91 endif # signing 92 endif 91 93 92 94 ifdef VBOX_WITH_WDDM -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
r106061 r106454 35 35 endif 36 36 37 # 38 # VBoxDisp - Windows Guest Additions XPDM Display Driver 39 # 40 # Note. This has to run on NT4! (*_NT4 => *_W2K3 when targeting 64-bit.) 41 # 42 SYSMODS += VBoxDisp 43 VBoxDisp_TEMPLATE = VBoxGuestR0Drv 44 VBoxDisp_SYSSUFF = .dll 45 VBoxDisp_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4) 46 VBoxDisp_DEFS.x86 = _WIN32_WINNT=0x0501 47 VBoxDisp_DEFS = VBOX_WITH_DDRAW 48 VBoxDisp_DEFS += LOG_TO_BACKDOOR #LOG_ENABLED 49 ifdef VBOX_WITH_VIDEOHWACCEL 50 VBoxDisp_DEFS += VBOX_WITH_VIDEOHWACCEL 51 endif 52 #VBoxDisp_DEFS += VBOX_VBVA_ADJUST_RECT 53 VBoxDisp_INCS = \ 54 ../../../include \ 55 .. \ 56 $(VBOX_GRAPHICS_INCS) 57 VBoxDisp_LDFLAGS.x86 = /Entry:DrvEnableDriver@12 58 VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver 59 VBoxDisp_SOURCES = \ 60 xpdm/VBoxDispDriver.cpp \ 61 xpdm/VBoxDispMini.cpp \ 62 xpdm/VBoxDispMouse.cpp \ 63 xpdm/VBoxDispPalette.cpp \ 64 xpdm/VBoxDispVBVA.cpp \ 65 xpdm/VBoxDispDrawCmd.cpp \ 66 xpdm/VBoxDispVRDP.cpp \ 67 xpdm/VBoxDispVrdpBmp.cpp \ 68 xpdm/VBoxDispVrdpTxt.cpp \ 69 xpdm/VBoxDispDriverDDraw.cpp \ 70 xpdm/VBoxDispDDraw.cpp \ 71 xpdm/VBoxDisp.def \ 72 xpdm/VBoxDisp.rc \ 73 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \ 74 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBuffers.cpp \ 75 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIHostCmd.cpp \ 76 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \ 77 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp 78 ifdef VBOX_WITH_VIDEOHWACCEL 79 VBoxDisp_SOURCES += \ 80 xpdm/VBoxDispVHWA.cpp \ 81 xpdm/VBoxDispDDrawVHWA.cpp 82 endif 83 84 85 VBoxDisp_LIBS = \ 86 $(VBOX_LIB_IPRT_GUEST_R0_NT4) \ 87 $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) \ 88 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/win32k.lib # Linker needs newer win32k.lib (for x86 at least); incompatible loadcfg.obj in the WDK 7.1 one. 89 ifneq ($(VBOX_VCC_CC_GUARD_CF),) 90 VBoxDisp_LIBS += \ 91 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowGDI.lib # for ___security_cookie 92 endif 93 VBoxDisp_USES.win += vboximportchecker 94 VBoxDisp_VBOX_IMPORT_CHECKER.win.x86 = nt4/r0 95 VBoxDisp_VBOX_IMPORT_CHECKER.win.amd64 = xp64/r0 96 97 # Signing requires both miniport and display drivers so it'll be dealt with in the parent makefile. 98 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 99 VBoxDisp_INSTTYPE := none 100 VBoxDisp_DEBUG_INSTTYPE := both 101 ifdef VBOX_WITH_WDDM 102 VBoxDispD3D_INSTTYPE := none 103 VBoxDispD3D_DEBUG_INSTTYPE := both 104 ifdef VBOX_WITH_WDDM_DX 105 VBoxDX_INSTTYPE := none 106 VBoxDX_DEBUG_INSTTYPE := both 37 ifdef VBOX_WITH_XPDM 38 # 39 # VBoxDisp - Windows Guest Additions XPDM Display Driver 40 # 41 # Note. This has to run on NT4! (*_NT4 => *_W2K3 when targeting 64-bit.) 42 # 43 SYSMODS += VBoxDisp 44 VBoxDisp_TEMPLATE = VBoxGuestR0Drv 45 VBoxDisp_SYSSUFF = .dll 46 VBoxDisp_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4) 47 VBoxDisp_DEFS.x86 = _WIN32_WINNT=0x0501 48 VBoxDisp_DEFS = VBOX_WITH_DDRAW 49 VBoxDisp_DEFS += LOG_TO_BACKDOOR #LOG_ENABLED 50 ifdef VBOX_WITH_VIDEOHWACCEL 51 VBoxDisp_DEFS += VBOX_WITH_VIDEOHWACCEL 52 endif 53 #VBoxDisp_DEFS += VBOX_VBVA_ADJUST_RECT 54 VBoxDisp_INCS = \ 55 ../../../include \ 56 .. \ 57 $(VBOX_GRAPHICS_INCS) 58 VBoxDisp_LDFLAGS.x86 = /Entry:DrvEnableDriver@12 59 VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver 60 VBoxDisp_SOURCES = \ 61 xpdm/VBoxDispDriver.cpp \ 62 xpdm/VBoxDispMini.cpp \ 63 xpdm/VBoxDispMouse.cpp \ 64 xpdm/VBoxDispPalette.cpp \ 65 xpdm/VBoxDispVBVA.cpp \ 66 xpdm/VBoxDispDrawCmd.cpp \ 67 xpdm/VBoxDispVRDP.cpp \ 68 xpdm/VBoxDispVrdpBmp.cpp \ 69 xpdm/VBoxDispVrdpTxt.cpp \ 70 xpdm/VBoxDispDriverDDraw.cpp \ 71 xpdm/VBoxDispDDraw.cpp \ 72 xpdm/VBoxDisp.def \ 73 xpdm/VBoxDisp.rc \ 74 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \ 75 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBuffers.cpp \ 76 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIHostCmd.cpp \ 77 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \ 78 $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp 79 ifdef VBOX_WITH_VIDEOHWACCEL 80 VBoxDisp_SOURCES += \ 81 xpdm/VBoxDispVHWA.cpp \ 82 xpdm/VBoxDispDDrawVHWA.cpp 83 endif 84 85 86 VBoxDisp_LIBS = \ 87 $(VBOX_LIB_IPRT_GUEST_R0_NT4) \ 88 $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB) \ 89 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/win32k.lib # Linker needs newer win32k.lib (for x86 at least); incompatible loadcfg.obj in the WDK 7.1 one. 90 ifneq ($(VBOX_VCC_CC_GUARD_CF),) 91 VBoxDisp_LIBS += \ 92 $(PATH_SDK_$(VBOX_WINDDK_GST)_LIB)/BufferOverflowGDI.lib # for ___security_cookie 93 endif 94 VBoxDisp_USES.win += vboximportchecker 95 VBoxDisp_VBOX_IMPORT_CHECKER.win.x86 = nt4/r0 96 VBoxDisp_VBOX_IMPORT_CHECKER.win.amd64 = xp64/r0 97 98 # Signing requires both miniport and display drivers so it'll be dealt with in the parent makefile. 99 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 100 VBoxDisp_INSTTYPE := none 101 VBoxDisp_DEBUG_INSTTYPE := both 102 ifdef VBOX_WITH_WDDM 103 VBoxDispD3D_INSTTYPE := none 104 VBoxDispD3D_DEBUG_INSTTYPE := both 105 ifdef VBOX_WITH_WDDM_DX 106 VBoxDX_INSTTYPE := none 107 VBoxDX_DEBUG_INSTTYPE := both 108 endif 107 109 endif 108 110 endif -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
r106441 r106454 194 194 # 195 195 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) 196 VBoxVideo_INSTTYPE = none 197 VBoxVideo_DEBUG_INSTTYPE = both 196 ifdef VBOX_WITH_XPDM 197 VBoxVideo_INSTTYPE = none 198 VBoxVideo_DEBUG_INSTTYPE = both 199 endif 198 200 ifdef VBOX_WITH_WDDM 199 201 VBoxWddm_INSTTYPE = none
Note:
See TracChangeset
for help on using the changeset viewer.
