Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 42279)
+++ /trunk/Config.kmk	(revision 42280)
@@ -383,11 +383,11 @@
 # Enable Pulse support for Linux.
 VBOX_WITH_PULSE = 1
-# Enable PCI passthrough support
+# Enable PCI passthrough support.
 VBOX_WITH_PCI_PASSTHROUGH = 1
-# Enable statically linked dbus support
+# Enable statically linked dbus support.
 if1of ($(KBUILD_TARGET), linux solaris)
  VBOX_WITH_DBUS = 1
 endif
-# Enable building PAM modules
+# Enable building PAM modules.
 if1of ($(KBUILD_TARGET), linux solaris)
  VBOX_WITH_PAM = 1
@@ -397,19 +397,23 @@
 # Enabled internal networking.
 VBOX_WITH_INTERNAL_NETWORKING = 1
-# Enable Host Guest Shared Memory Interface
+# Enable Host Guest Shared Memory Interface.
 VBOX_WITH_HGSMI = 1
-# Enable Video 2D Acceleration
+# Enable Video 2D Acceleration.
 if1of ($(KBUILD_TARGET), darwin linux win freebsd)
  VBOX_WITH_VIDEOHWACCEL = 1
 endif
-# Enable Wddm Video driver for Vista+ guests
+# Enable Wddm Video driver for Vista+ guests.
 VBOX_WITH_WDDM = 1
+# Enable Wddm Video driver for Windows 8 guests.
+ifdef VBOX_WITH_VCC100
+ VBOX_WITH_WDDM_W8 = 1
+endif
+# Lazy developer!!
 VBOXWDDM_WITH_VBVA = 1
+# Lazy developer!!
 ifdef VBOX_WITH_WDDM
  VBOX_WITH_VDMA = 1
-else
- ifdef VBOX_WITH_VDMA
+else ifdef VBOX_WITH_VDMA
   undef VBOX_WITH_VDMA
- endif
 endif
 # Disable the Intel PXE ROM (uses Etherboot).
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk	(revision 42279)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk	(revision 42280)
@@ -34,9 +34,9 @@
 	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.inf
 ifdef VBOX_SIGN_ADDITIONS
-VBoxVideo-inf_SOURCES += \
-	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
-	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \
-	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat
-endif # signing
+ VBoxVideo-inf_SOURCES += \
+ 	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.sys \
+ 	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxDisp.dll \
+ 	$(PATH_TARGET)/VBoxVideoCat.dir/VBoxVideo.cat
+endif
 VBoxVideo-inf_CLEAN = $(VBoxVideo-inf_SOURCES)
 VBoxVideo-inf_BLDDIRS = \
@@ -61,138 +61,139 @@
 
 ifdef VBOX_WITH_WDDM
-VBOXWDDM_WITH_DISPD3D = 1
+ VBOXWDDM_WITH_DISPD3D = 1
  ifdef VBOX_WITH_CROGL
   VBOXWDDM_WITH_GL = 1
  endif
 
-#
-# 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_DISPD3D
-VBoxVideoWddm-inf_SOURCES += \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
-VBoxVideoWddm-inf_SOURCES.amd64 += \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll
-endif # VBOXWDDM_WITH_DISPD3D
-
-ifdef VBOXWDDM_WITH_GL
- VBoxVideoWddm-inf_SOURCES += \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
- VBoxVideoWddm-inf_SOURCES.amd64 += \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
-endif # VBOXWDDM_WITH_GL
-
-endif # signing
-VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
-VBoxVideoWddm-inf_BLDDIRS = \
-    $(PATH_TARGET)/VBoxVideoWddmCat.dir
-
-VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
-VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+ #
+ # 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_DISPD3D
+   VBoxVideoWddm-inf_SOURCES += \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
+   VBoxVideoWddm-inf_SOURCES.amd64 += \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll
+  endif # VBOXWDDM_WITH_DISPD3D
+
+  ifdef VBOXWDDM_WITH_GL
+   VBoxVideoWddm-inf_SOURCES += \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
+   VBoxVideoWddm-inf_SOURCES.amd64 += \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
+  endif # VBOXWDDM_WITH_GL
+
+ endif # signing
+ VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
+ VBoxVideoWddm-inf_BLDDIRS = \
+ 	$(PATH_TARGET)/VBoxVideoWddmCat.dir
+
+ VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
+ VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
+
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: \
+		$(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxVideoWddm-inf,$@,$<)
 	$(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG))
 
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(VBoxVideoWddm_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-ifdef VBOXWDDM_WITH_DISPD3D
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
- ifeq ($(KBUILD_TARGET_ARCH),amd64)
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
- endif # ($(KBUILD_TARGET_ARCH), amd64)
-endif # VBOXWDDM_WITH_DISPD3D
-
-ifdef VBOXWDDM_WITH_GL
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
- ifeq ($(KBUILD_TARGET_ARCH), amd64)
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
- endif # ($(KBUILD_TARGET_ARCH), amd64)
-endif # VBOXWDDM_WITH_GL
-
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat: \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(VBoxVideoWddm_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+ ifdef VBOXWDDM_WITH_DISPD3D
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+  endif
+ endif # VBOXWDDM_WITH_DISPD3D
+
+ ifdef VBOXWDDM_WITH_GL
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+  endif # ($(KBUILD_TARGET_ARCH), amd64)
+ endif # VBOXWDDM_WITH_GL
+
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat: \
 		$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf \
 		$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
@@ -221,170 +222,168 @@
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
 	
- ifdef VBOX_WDDM_WIN8
+ ifdef VBOX_WITH_WDDM_W8
   VBOXWDDMW8_WITH_DISPD3D = 1
- ifdef VBOX_WITH_CROGL
-  VBOXWDDMW8_WITH_GL = 1
- endif
+  ifdef VBOX_WITH_CROGL
+   VBOXWDDMW8_WITH_GL = 1
+  endif
  
- 
-INSTALLS += VBoxVideoW8-inf
-VBoxVideoW8-inf_INST = $(INST_ADDITIONS)
-VBoxVideoW8-inf_MODE = a+r,u+w
-VBoxVideoW8-inf_SOURCES = \
-    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf
-ifdef VBOX_SIGN_ADDITIONS
-VBoxVideoW8-inf_SOURCES += \
-    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
-    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat
-
-if defined(VBOXWDDMW8_WITH_DISPD3D) && !defined(VBOXWDDM_WITH_DISPD3D)
-VBoxVideoW8-inf_SOURCES += \
- $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll
-VBoxVideoW8-inf_SOURCES.amd64 += \
- $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll
-endif # VBOXWDDMW8_WITH_DISPD3D
-
-if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
- VBoxVideoW8-inf_SOURCES += \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
- VBoxVideoW8-inf_SOURCES.amd64 += \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
-endif # VBOXWDDMW8_WITH_GL
-
-endif # signing
-VBoxVideoW8-inf_CLEAN = $(VBoxVideoW8-inf_SOURCES)
-if defined(VBOXWDDMW8_WITH_DISPD3D) && defined(VBOXWDDM_WITH_DISPD3D)
- VBoxVideoW8-inf_CLEAN += \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
-endif
-if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
- VBoxVideoW8-inf_CLEAN += \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
- VBoxVideoW8-inf_CLEAN.amd64 += \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
- 	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
-endif
-VBoxVideoW8-inf_BLDDIRS = \
-    $(PATH_TARGET)/VBoxVideoW8Cat.dir
-
-VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDMW8_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
-VBOXWDDMW8_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDMW8_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
-VBOXWDDMW8_EDIT_INF_ICD_FN_ARG      = $(if $(VBOXWDDMW8_WITH_ICD),-e 's/^;icd  *//', -e '/^;icd /d')
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoW8.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+  INSTALLS += VBoxVideoW8-inf
+  VBoxVideoW8-inf_INST = $(INST_ADDITIONS)
+  VBoxVideoW8-inf_MODE = a+r,u+w
+
+  VBoxVideoW8-inf_SOURCES = \
+  	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf
+  ifdef VBOX_SIGN_ADDITIONS
+   VBoxVideoW8-inf_SOURCES += \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat
+   if defined(VBOXWDDMW8_WITH_DISPD3D) && !defined(VBOXWDDM_WITH_DISPD3D)
+    VBoxVideoW8-inf_SOURCES += \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll
+    VBoxVideoW8-inf_SOURCES.amd64 += \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll
+   endif
+   if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
+    VBoxVideoW8-inf_SOURCES += \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
+    VBoxVideoW8-inf_SOURCES.amd64 += \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
+    	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
+   endif # VBOXWDDMW8_WITH_GL
+  endif # VBOX_SIGN_ADDITIONS
+
+  VBoxVideoW8-inf_CLEAN = $(VBoxVideoW8-inf_SOURCES)
+  if defined(VBOXWDDMW8_WITH_DISPD3D) && defined(VBOXWDDM_WITH_DISPD3D)
+   VBoxVideoW8-inf_CLEAN += \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
+  endif
+  if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
+   VBoxVideoW8-inf_CLEAN += \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
+   VBoxVideoW8-inf_CLEAN.amd64 += \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
+   	$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
+  endif
+  VBoxVideoW8-inf_BLDDIRS = \
+      $(PATH_TARGET)/VBoxVideoW8Cat.dir
+
+  VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDMW8_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
+  VBOXWDDMW8_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDMW8_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
+  VBOXWDDMW8_EDIT_INF_ICD_FN_ARG     = $(if $(VBOXWDDMW8_WITH_ICD),-e 's/^;icd  *//', -e '/^;icd /d')
+
+  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoW8.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
 	$(call MSG_GENERATE,VBoxVideoW8-inf,$@,$<)
 	$(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDMW8_EDIT_INF_GL_FN_ARG) $(VBOXWDDMW8_EDIT_INF_ICD_FN_ARG))
 
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys: $$(VBoxVideoW8_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-ifdef VBOXWDDMW8_WITH_DISPD3D
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
- ifeq ($(KBUILD_TARGET_ARCH),amd64)
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
- endif # ($(KBUILD_TARGET_ARCH), amd64)
-endif # VBOXWDDMW8_WITH_DISPD3D
-
-ifdef VBOXWDDMW8_WITH_GL
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
- ifeq ($(KBUILD_TARGET_ARCH), amd64)
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
-	$(INSTALL) -m 644 $< $(@D)
- endif # ($(KBUILD_TARGET_ARCH), amd64)
-endif # VBOXWDDMW8_WITH_GL
-
-$(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat: \
+  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys: $$(VBoxVideoW8_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+  ifdef VBOXWDDMW8_WITH_DISPD3D
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   ifeq ($(KBUILD_TARGET_ARCH),amd64)
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+   endif # ($(KBUILD_TARGET_ARCH), amd64)
+  endif # VBOXWDDMW8_WITH_DISPD3D
+
+  ifdef VBOXWDDMW8_WITH_GL
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll: $$(VBoxOGL_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll: $$(VBoxD3D9wddm_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll: $$(wined3dwddm_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll: $$(VBoxOGLarrayspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll: $$(VBoxOGLcrutil_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll: $$(VBoxOGLerrorspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll: $$(VBoxOGLfeedbackspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll: $$(VBoxOGLpackspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll: $$(VBoxOGLpassthroughspu_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+   ifeq ($(KBUILD_TARGET_ARCH), amd64)
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll: $$(VBoxOGL-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll: $$(VBoxD3D9wddm-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll: $$(wined3dwddm-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll: $$(VBoxOGLarrayspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll: $$(VBoxOGLcrutil-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll: $$(VBoxOGLerrorspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll: $$(VBoxOGLfeedbackspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll: $$(VBoxOGLpackspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+
+    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll: $$(VBoxOGLpassthroughspu-x86_1_TARGET) | $$(dir $$@)
+	$(INSTALL) -m 644 $< $(@D)
+   endif # ($(KBUILD_TARGET_ARCH), amd64)
+  endif # VBOXWDDMW8_WITH_GL
+
+  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat: \
         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf \
         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
@@ -412,5 +411,6 @@
 	$(call MSG_TOOL,Inf2Cat,VBoxVideoW8-inf,$@,$<)
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
- endif # VBOX_WDDM_WIN8
+
+ endif # VBOX_WITH_WDDM_W8
 endif # VBOX_WITH_WDDM
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk	(revision 42279)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk	(revision 42280)
@@ -152,5 +152,5 @@
  	$(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
 
- ifdef VBOX_WDDM_WIN8
+ ifdef VBOX_WITH_WDDM_W8
   #
   # VBoxVideoW8 - Windows Guest Additions WDDM 1.2 Miniport Video Driver for Win8
@@ -172,10 +172,12 @@
   	$(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/displib.lib \
   	$(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib
- endif # VBOX_WDDM_WIN8
+ endif # VBOX_WITH_WDDM_W8
  
 endif # VBOX_WITH_WDDM
 
+#
 # Signing requires both miniport and display drivers
 # so it'd be dealt with in the parent makefile.
+#
 ifdef VBOX_SIGN_ADDITIONS
  VBoxVideo_INSTTYPE            = none
@@ -184,7 +186,7 @@
   VBoxVideoWddm_INSTTYPE       = none
   VBoxVideoWddm_DEBUG_INSTTYPE = both
-  ifdef VBOX_WDDM_WIN8
-   VBoxVideoW8_INSTTYPE       = none
-   VBoxVideoW8_DEBUG_INSTTYPE = both
+  ifdef VBOX_WITH_WDDM_W8
+   VBoxVideoW8_INSTTYPE        = none
+   VBoxVideoW8_DEBUG_INSTTYPE  = both
   endif
  endif
Index: /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk	(revision 42279)
+++ /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk	(revision 42280)
@@ -135,5 +135,5 @@
 	$(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
 	$(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
- ifdef VBOX_WDDM_WIN8
+ ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
@@ -148,5 +148,5 @@
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
-  ifdef VBOX_WDDM_WIN8
+  ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
@@ -193,5 +193,5 @@
 	-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_WDDM_WIN8=$(if $(VBOX_WDDM_WIN8),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))' \
Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh	(revision 42279)
+++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh	(revision 42280)
@@ -138,5 +138,5 @@
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
   
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
   ; WDDM Video driver for Win8
   SetOutPath "$0\VBoxVideoW8"
@@ -178,5 +178,5 @@
       !endif ; $%VBOX_WITH_CROGL% == "1"
     !endif ; $%BUILD_TARGET_ARCH% == "amd64"
-  !endif ; $%VBOX_WDDM_WIN8% == "1"
+  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 !endif ; $%VBOX_WITH_WDDM% == "1"
 
Index: /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh	(revision 42279)
+++ /trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh	(revision 42280)
@@ -210,5 +210,5 @@
     SetOutPath "$INSTDIR"
 
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${If} $g_strWinVersion == "8"
       !ifdef VBOX_SIGN_ADDITIONS
@@ -224,5 +224,5 @@
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${EndIf}
   !endif
@@ -373,5 +373,5 @@
   ${If} $g_bNoVideoDrv == "false"
     ${If} $g_bWithWDDM == "true"
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${If} $g_strWinVersion == "8"
         DetailPrint "Installing WDDM video driver for Windows 8..."
@@ -381,5 +381,5 @@
         DetailPrint "Installing WDDM video driver for Windows Vista and 7..."
         nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf" "$INSTDIR\install_drivers.log"'
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${EndIf}
   !endif
@@ -529,5 +529,5 @@
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
@@ -596,5 +596,5 @@
 !if $%VBOX_WITH_WDDM% == "1"
 
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
   DetailPrint "Uninstalling WDDM video driver for Windows 8..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoW8.inf"'
@@ -606,5 +606,5 @@
   ;       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_WDDM_WIN8% == "1"
+  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 
   DetailPrint "Uninstalling WDDM video driver for Windows Vista and 7..."