Changeset 94485 in vbox for trunk/src/VBox/Additions/WINNT/Installer

Timestamp:

Apr 6, 2022 7:00:56 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150822

Message:

WDDM: added VBOX_WITH_WDDM_DX (not enabled yet) to include the new driver into the additions installer. bugref:9845

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (5 diffs)

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

@@ -113 +113 @@
         $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
         $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
+ ifdef VBOX_WITH_WDDM_DX
+DRIVER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxDX.dll
+ endif
  ifdef VBOX_WITH_MESA3D
 DRIVER_FILES += \
@@ -128 +132 @@
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
+  ifdef VBOX_WITH_WDDM_DX
+DRIVER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
+  endif
   ifdef VBOX_WITH_MESA3D
 DRIVER_FILES += \
@@ -166 +174 @@
         -E 'VBOX_WITH_LICENSE_INSTALL_RTF=$(if $(VBOX_BRAND_LICENSE_RTF),1,0)' \
         -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
+        -E 'VBOX_WITH_WDDM_DX=$(if $(VBOX_WITH_WDDM_DX),1,0)' \
         -E 'VBOX_WITH_MESA3D=$(if $(VBOX_WITH_MESA3D),1,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -84 +84 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
   FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
+  !if $%VBOX_WITH_WDDM_DX% == "1"
+    FILE "$%PATH_OUT%\bin\additions\VBoxDX.dll"
+  !endif
   !if $%VBOX_WITH_MESA3D% == "1"
     FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll"
@@ -93 +96 @@
   !if $%KBUILD_TARGET_ARCH% == "amd64"
     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
+    !if $%VBOX_WITH_WDDM_DX% == "1"
+      FILE "$%PATH_OUT%\bin\additions\VBoxDX-x86.dll"
+    !endif
     !if $%VBOX_WITH_MESA3D% == "1"
       FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -256 +256 @@
 
     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
+    !if $%VBOX_WITH_WDDM_DX% == "1"
+      FILE "$%PATH_OUT%\bin\additions\VBoxDX.dll"
+    !endif
     !if $%VBOX_WITH_MESA3D% == "1"
       FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll"
@@ -265 +268 @@
     !if $%KBUILD_TARGET_ARCH% == "amd64"
       FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
+      !if $%VBOX_WITH_WDDM_DX% == "1"
+        FILE "$%PATH_OUT%\bin\additions\VBoxDX-x86.dll"
+      !endif
       !if $%VBOX_WITH_MESA3D% == "1"
         FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll"
@@ -475 +481 @@
   ; Obsolete files end
   Delete /REBOOTOK "$INSTDIR\VBoxDispD3D.dll"
+  !if $%VBOX_WITH_WDDM_DX% == "1"
+    Delete /REBOOTOK "$INSTDIR\VBoxDX.dll"
+  !endif
   !if $%VBOX_WITH_MESA3D% == "1"
     Delete /REBOOTOK "$INSTDIR\VBoxNine.dll"
@@ -489 +498 @@
   !if $%KBUILD_TARGET_ARCH% == "amd64"
     Delete /REBOOTOK "$INSTDIR\VBoxDispD3D-x86.dll"
+    !if $%VBOX_WITH_WDDM_DX% == "1"
+      Delete /REBOOTOK "$INSTDIR\VBoxDX-x86.dll"
+    !endif
     !if $%VBOX_WITH_MESA3D% == "1"
       Delete /REBOOTOK "$INSTDIR\VBoxNine-x86.dll"
@@ -557 +569 @@
   !if $%KBUILD_TARGET_ARCH% == "amd64"
     Delete /REBOOTOK "$g_strSysWow64\VBoxDispD3D-x86.dll"
+  !endif
+
+  !if $%VBOX_WITH_WDDM_DX% == "1"
+    Delete /REBOOTOK "$g_strSystemDir\VBoxDX.dll"
+    !if $%KBUILD_TARGET_ARCH% == "amd64"
+      Delete /REBOOTOK "$g_strSysWow64\VBoxDX-x86.dll"
+    !endif
   !endif