Changeset 29448 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

May 13, 2010 2:15:08 PM (15 years ago)

Author:

vboxsync

Message:

wddm/d3d: add missing gl libs to driver package

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Makefile.kmk (modified) (6 diffs)
• Miniport/wddm/VBoxVideoWddm.inf (modified) (4 diffs)

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

@@ -96 +96 @@
 VBoxVideoWddm-inf_SOURCES += \
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine.dll \
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
@@ -104 +107 @@
 VBoxVideoWddm-inf_SOURCES.amd64 += \
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll \
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
@@ -141 +147 @@
         $(INSTALL) -m 644 $< $(@D)
 
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9.dll: $$(TARGET_VBoxD3D9) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d.dll: $$(TARGET_wined3d) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine.dll: $$(TARGET_libWine) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(TARGET_VBoxOGLarrayspu) | $$(call DIRDEP,$$(@D))
         $(INSTALL) -m 644 $< $(@D)
@@ -161 +176 @@
  ifeq ($(KBUILD_TARGET_ARCH), amd64)
 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll: $$(TARGET_VBoxOGL64) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll: $$(TARGET_VBoxD3D964) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll: $$(TARGET_wined3d64) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll: $$(TARGET_libWine64) | $$(call DIRDEP,$$(@D))
         $(INSTALL) -m 644 $< $(@D)
 
@@ -189 +213 @@
         $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), ) \
         $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
+                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9.dll \
+                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d.dll \
+                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine.dll \
                                    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
                                    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
@@ -197 +224 @@
         $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
                                    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
+                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll \
+                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll \
+                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll \
                                    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
                                    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf

@@ -59 +59 @@
 ;amd64 [VBoxVideo.GL_wow64]
 ;gl VBoxOGL.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;gl VBoxD3D9.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;gl wined3d.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;gl libWine.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;gl VBoxOGLarrayspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;gl VBoxOGLcrutil.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
@@ -68 +71 @@
 ;amd64 [VBoxVideo.GL]
 ;amd64 ;gl VBoxOGL64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxD3D964.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl wined3d64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl libWine64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;gl VBoxOGLarrayspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;gl VBoxOGLcrutil64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
@@ -95 +101 @@
 ;amd64 ;gl 11,,VBoxOGL64.dll,1
 ;gl 11,,VBoxOGL.dll,1
+;amd64 ;gl 11,,VBoxD3D964.dll,1
+;gl 11,,VBoxD3D9.dll,1
+;amd64 ;gl 11,,wined3d64.dll,1
+;gl 11,,wined3d.dll,1
+;amd64 ;gl 11,,libWine64.dll,1
+;gl 11,,libWine.dll,1
 ;amd64 ;gl 11,,VBoxOGLarrayspu64.dll,1
 ;gl 11,,VBoxOGLarrayspu.dll,1
@@ -135 +147 @@
 ;amd64 ;gl VBoxOGL64.dll = 1
 ;gl VBoxOGL.dll = 1
+;amd64 ;gl VBoxD3D964.dll = 1
+;gl VBoxD3D9.dll = 1
+;amd64 ;gl wined3d64.dll = 1
+;gl wined3d.dll = 1
+;amd64 ;gl libWine64.dll = 1
+;gl libWine.dll = 1
 ;amd64 ;gl VBoxOGLarrayspu64.dll = 1
 ;gl VBoxOGLarrayspu.dll = 1