Changeset 26846 in vbox for trunk/src

Timestamp:

Feb 26, 2010 1:13:45 PM (15 years ago)

Author:

vboxsync

Message:

wddm: install & sign

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Makefile.kmk (modified) (1 diff)
• Miniport/Makefile.kmk (modified) (1 diff)

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

@@ -68 +68 @@
         $(call MSG_TOOL,Inf2Cat,VBoxVideo-inf,$@,$<)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+        
+ifdef VBOXWDDM
+#
+# Install the inf & cat.
+# This has to be done here since it depends on both the
+# miniport driver and the display dll.
+#
+INSTALLS += VBoxVideoWddm-inf
+VBoxVideoWddm-inf_INST = $(INST_ADDITIONS)
+VBoxVideoWddm-inf_MODE = a+r,u+w
+VBoxVideoWddm-inf_SOURCES = \
+    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf
+ifdef VBOX_SIGN_ADDITIONS
+VBoxVideoWddm-inf_SOURCES += \
+    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
+    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat
+
+ifdef VBOXWDDM_WITH_D3DUM
+VBoxVideoWddm-inf_SOURCES += \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
+VBoxVideoWddm-inf_SOURCES.amd64 += \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll
+endif
+    
+endif # signing
+VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
+VBoxVideoWddm-inf_BLDDIRS = \
+    $(PATH_TARGET)/VBoxVideoWddmCat.dir
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: $(PATH_SUB_CURRENT)/Miniport/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
+        $(call MSG_GENERATE,VBoxVideoWddm-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(TARGET_VBoxVideoWddm) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+ifdef VBOXWDDM_WITH_D3DUM
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(TARGET_VBoxDispD3D) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+ ifeq ($(KBUILD_TARGET_ARCH), amd64)
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll: $$(TARGET_VBoxDispD3D64) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+ endif
+endif
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat: \
+        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf \
+        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
+        $(if $(VBOXWDDM_WITH_D3DUM), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \
+        $(if $(VBOXWDDM_WITH_D3DUM), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), )
+        $(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
+        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk

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

@@ -77 +77 @@
  VBoxVideoWddm_TEMPLATE    = VBOXGUESTR0
  ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
-  # driver signing rules will be written once there are all files necessary for that are available,
-  # i.e. a u/m display driver miniport inf
-  $(warning FIXME: !!!define wddm driver signing & install rules !!!)
   VBoxVideoWddm_NOINST     = true
  endif