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

Timestamp:

Mar 5, 2018 11:49:28 AM (7 years ago)

Author:

vboxsync

Message:

WDDM, Config.kmk: removed VBOX_WITH_WDDM_W8, it is always enabled now.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

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

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

@@ -134 +134 @@
         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
         $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
- ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.inf
- endif
  ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
@@ -147 +145 @@
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
-  ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
-  endif
  endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -193 +189 @@
         -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_W8=$(if $(VBOX_WITH_WDDM_W8),1,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
         -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

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

@@ -138 +138 @@
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
 
-  !if $%VBOX_WITH_WDDM_W8% == "1"
   ; WDDM Video driver for Win8
   SetOutPath "$0\VBoxVideoW8"
@@ -178 +177 @@
       !endif ; $%VBOX_WITH_CROGL% == "1"
     !endif ; $%BUILD_TARGET_ARCH% == "amd64"
-  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 !endif ; $%VBOX_WITH_WDDM% == "1"
 

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

@@ -233 +233 @@
     SetOutPath "$INSTDIR"
 
-  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${If} $g_strWinVersion == "8"
     ${OrIf} $g_strWinVersion == "8_1"
@@ -243 +242 @@
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
     ${Else}
-  !endif
       !ifdef VBOX_SIGN_ADDITIONS
         FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
@@ -249 +247 @@
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${EndIf}
-  !endif
 
     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
@@ -395 +391 @@
   ${If} $g_bNoVideoDrv == "false"
     ${If} $g_bWithWDDM == "true"
-  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${If} $g_strWinVersion == "8"
       ${OrIf} $g_strWinVersion == "8_1"
@@ -402 +397 @@
         ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoW8.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
       ${Else}
-  !endif
         ${LogVerbose} "Installing WDDM video driver for Windows Vista and 7..."
         ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
-  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${EndIf}
-  !endif
     ${Else}
       ${LogVerbose} "Installing video driver ..."
@@ -541 +533 @@
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WITH_WDDM_W8% == "1"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
-  !endif
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
 
@@ -606 +596 @@
 !if $%VBOX_WITH_WDDM% == "1"
 
-  !if $%VBOX_WITH_WDDM_W8% == "1"
   ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\"" "true"
@@ -613 +602 @@
   ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
   Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoW8.sys"
-  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 
   ${LogVerbose} "Uninstalling WDDM video driver for Windows Vista and 7..."