Index: trunk/src/VBox/Additions/3D/Config.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/Config.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/Config.kmk	(revision 75635)
@@ -20,5 +20,5 @@
 # Include the top-level configure file.
 ifndef VBOX_ROOT_CONFIG_KMK_INCLUDED
- include $(PATH_ROOT)/Config.kmk
+include $(PATH_ROOT)/Config.kmk
 endif
 
@@ -32,12 +32,11 @@
 # Base template for Mesa3D code and code which uses Mesa3D libraries.
 #
-TEMPLATE_VBOXMESA3DGUESTR3DLL             = VBox Mesa 3D Guest User Mode DLL
-TEMPLATE_VBOXMESA3DGUESTR3DLL_EXTENDS     = NewerVccVBoxGuestR3Dll
-TEMPLATE_VBOXMESA3DGUESTR3DLL_INST        = $(INST_ADDITIONS)
-TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS        = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
+TEMPLATE_VBoxMesa3DGuestR3Dll          = VBox Mesa 3D Guest User Mode DLL
+TEMPLATE_VBoxMesa3DGuestR3Dll_EXTENDS  = NewerVccVBoxGuestR3Dll
+TEMPLATE_VBoxMesa3DGuestR3Dll_INST     = $(INST_ADDITIONS)
+TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \
 	VBOX_WITH_MESA3D
-TEMPLATE_VBOXMESA3DGUESTR3DLL_SDKS.win    = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \
+TEMPLATE_VBoxMesa3DGuestR3Dll_SDKS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \
 	$(VBOX_WINDDK_GST_W8)
-
 # VirtualBox specific modifications of the Mesa3D code.
 # All modified places can be found by searching for VBOX
@@ -60,5 +59,5 @@
 #  VBOX_WITH_MESA3D_SVGA_INSTANCING    Instancing for DrawPrimitives in the Gallium SVGA driver
 #                                      (VGPU9 only, VGPU10 has it).
-TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS      += \
+TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS    += \
 	VBOX_WITH_MESA3D_COMPILE \
 	VBOX_WITH_MESA3D_D3D_FROM_SYSTEMMEM \
@@ -71,11 +70,9 @@
 	VBOX_WITH_MESA3D_SVGA_HALFZ \
 	VBOX_WITH_MESA3D_SVGA_INSTANCING
-
-TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS.win   = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \
+TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \
 	_USE_MATH_DEFINES \
 	WINAPI=__stdcall \
 	_WIN32
-
-TEMPLATE_VBOXMESA3DGUESTR3DLL_INCS       = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \
+TEMPLATE_VBoxMesa3DGuestR3Dll_INCS     = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \
 	$(VBOX_PATH_MESA)/include \
 	$(VBOX_PATH_MESA)/include/c99 \
@@ -87,12 +84,13 @@
 
 #
-# Variant of VBOXMESA3DGUESTR3DLL that requires Windows Vista or later.
+# Variant of VBoxMesa3DGuestR3Dll that requires Windows Vista or later.
 #
-TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista = VBox Mesa 3D Guest User Mode DLL (Windows Vista or newer)
-TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_EXTENDS  = VBOXMESA3DGUESTR3DLL
+TEMPLATE_VBoxMesa3DGuestR3DllMinVista                     = VBox Mesa 3D Guest User Mode DLL (Windows Vista or newer)
+TEMPLATE_VBoxMesa3DGuestR3DllMinVista_EXTENDS             = VBoxMesa3DGuestR3Dll
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_LDFLAGS.win.x86 = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_LDFLAGS.win.x86))
- TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_POST_CMDS.win.x86))
- TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBOXMESA3DGUESTR3DLL_POST_CMDS.win.amd64))
- TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_LNK_DEPS.win.amd64  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBOXMESA3DGUESTR3DLL_LNK_DEPS.win.amd64)
+TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LDFLAGS.win.x86     = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win.x86))
+TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.x86   = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.x86))
+TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.amd64))
+TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LNK_DEPS.win.amd64  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBoxMesa3DGuestR3Dll_LNK_DEPS.win.amd64)
 endif
+
Index: trunk/src/VBox/Additions/3D/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/Makefile.kmk	(revision 75635)
@@ -23,5 +23,5 @@
 #
 ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED
- include $(PATH_SUB_CURRENT)/Config.kmk
+include $(PATH_SUB_CURRENT)/Config.kmk
 endif
 
@@ -31,5 +31,5 @@
 include $(PATH_SUB_CURRENT)/mesa/Makefile.kmk
 if1of ($(KBUILD_TARGET), win)
- include $(PATH_SUB_CURRENT)/win/Makefile.kmk
+include $(PATH_SUB_CURRENT)/win/Makefile.kmk
 endif
 
Index: trunk/src/VBox/Additions/3D/mesa/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/mesa/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/mesa/Makefile.kmk	(revision 75635)
@@ -22,10 +22,5 @@
 # Target lists.
 #
-#VBOX_PATH_MESA_GENFILES = $(PATH_OBJ)/VBoxMesaGen
-#BLDDIRS   += \
-#	$(VBOX_PATH_MESA_GENFILES)/
-
-if1of ($(KBUILD_TARGET), win)
- LIBRARIES += \
+LIBRARIES.win += \
 	VBoxMesaUtilLib \
 	VBoxMesaLib \
@@ -35,5 +30,5 @@
 	VBoxMesaSVGALib \
 	VBoxMesaSVGAWinsysLib
- LIBRARIES.win.amd64 += \
+LIBRARIES.win.amd64 += \
 	VBoxMesaUtilLib-x86 \
 	VBoxMesaLib-x86 \
@@ -43,14 +38,13 @@
 	VBoxMesaSVGALib-x86 \
 	VBoxMesaSVGAWinsysLib-x86
-endif
-
-
-TEMPLATE_VBOXMESA3DGUESTR3LIB             = VBox Mesa 3D Guest User Mode Library
-TEMPLATE_VBOXMESA3DGUESTR3LIB_EXTENDS     = VBOXMESA3DGUESTR3DLL
-TEMPLATE_VBOXMESA3DGUESTR3LIB_INST        = $(INST_ADDITIONS_LIB)
+
+
+TEMPLATE_VBoxMesa3DGuestR3Lib               = VBox Mesa 3D Guest User Mode Library
+TEMPLATE_VBoxMesa3DGuestR3Lib_EXTENDS       = VBoxMesa3DGuestR3Dll
+TEMPLATE_VBoxMesa3DGuestR3Lib_INST          = $(INST_ADDITIONS_LIB)
 ifeq ($(KBUILD_TARGET),win)
 # Do not treat warnings as errors, because Mesa code produces too many warnings with MSC.
- TEMPLATE_VBOXMESA3DGUESTR3LIB_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_CFLAGS))
- TEMPLATE_VBOXMESA3DGUESTR3LIB_CXXFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_CXXFLAGS))
+TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS        = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS))
+TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS      = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS))
 #  -wd4005: vcc120: '__useHeader' : macro redefinition
 #  -wd4013: undefined; assuming extern returning int
@@ -99,12 +93,14 @@
 #  -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation
 #  -wd4918: 'y' : invalid character in pragma optimization list
- VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS = \
-	-wd4005 -wd4013 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 -wd4152 -wd4189 \
-	-wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 \
-	-wd4389 -wd4640 -wd4668 -wd4700 -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
- TEMPLATE_VBOXMESA3DGUESTR3LIB_CFLAGS.win += $(VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS)
- TEMPLATE_VBOXMESA3DGUESTR3LIB_CXXFLAGS.win += $(VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS)
+VBOX_MESA3D_VCC_DISABLED_WARNINGS           = \
+	-wd4005 -wd4013 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \
+	-wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \
+	-wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \
+	-wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918
+TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win   += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
+TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS)
 endif
-TEMPLATE_VBOXMESA3DGUESTR3LIB_INCS       = include \
+TEMPLATE_VBoxMesa3DGuestR3Lib_INCS          = \
+	include \
 	$(VBOX_MESA)/include/GL \
 	$(VBOX_MESA)/src/mapi \
@@ -114,12 +110,14 @@
 	$(VBOX_MESA)/src/compiler/nir \
 	$(VBOX_MESA)/src/gallium/state_trackers/wgl \
-	$(TEMPLATE_VBOXMESA3DGUESTR3DLL_INCS)
-TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS       = $(TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS) \
+	$(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
+TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
+	$(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \
 	PACKAGE_VERSION=\"$(VBOX_MESA)\" \
 	PACKAGE_BUGREPORT=\"$(VBOX_MESA)\"
 # For wgl, glapi and mesa
-TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS      += \
+TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS         += \
 	MAPI_MODE_UTIL _GDI32_ BUILD_GL32 KHRONOS_DLL_EXPORTS GL_API=GLAPI GL_APIENTRY=GLAPIENTRY _GLAPI_NO_EXPORTS
-TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS.release = $(TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS.release) \
+TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS.release  = \
+	$(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.release) \
 	NDEBUG
 
@@ -128,6 +126,6 @@
 # VBoxMesaUtilLib
 #
-VBoxMesaUtilLib_TEMPLATE       = VBOXMESA3DGUESTR3LIB
-VBoxMesaUtilLib_SOURCES        = \
+VBoxMesaUtilLib_TEMPLATE = VBoxMesa3DGuestR3Lib
+VBoxMesaUtilLib_SOURCES  = \
 	$(VBOX_MESA)/src/util/bitscan.c \
 	$(VBOX_MESA)/src/util/build_id.c \
@@ -150,11 +148,10 @@
 	$(VBOX_MESA)/src/util/u_queue.c \
 	$(VBOX_MESA)/src/util/u_vector.c
-
 # Auto-generated
-VBoxMesaUtilLib_SOURCES       += \
+VBoxMesaUtilLib_SOURCES += \
 	$(VBOX_MESA)/src/util/format_srgb.c
 
 # 32 bit lib for 64 bit build
-VBoxMesaUtilLib-x86_EXTENDS = VBoxMesaUtilLib
+VBoxMesaUtilLib-x86_EXTENDS      = VBoxMesaUtilLib
 VBoxMesaUtilLib-x86_BLD_TRG_ARCH = x86
 
@@ -163,6 +160,6 @@
 # VBoxMesaLib
 #
-VBoxMesaLib_TEMPLATE       = VBOXMESA3DGUESTR3LIB
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_TEMPLATE = VBoxMesa3DGuestR3Lib
+VBoxMesaLib_SOURCES  = \
 	$(VBOX_MESA)/src/mesa/state_tracker/st_atifs_to_tgsi.c \
 	$(VBOX_MESA)/src/mesa/state_tracker/st_atom_array.c \
@@ -239,5 +236,5 @@
 	$(VBOX_MESA)/src/mesa/state_tracker/st_tgsi_lower_yuv.c \
 	$(VBOX_MESA)/src/mesa/state_tracker/st_vdpau.c
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_SOURCES += \
 	$(VBOX_MESA)/src/mesa/program/arbprogparse.c \
 	$(VBOX_MESA)/src/mesa/program/ir_to_mesa.cpp \
@@ -258,5 +255,5 @@
 	$(VBOX_MESA)/src/mesa/program/prog_statevars.c \
 	$(VBOX_MESA)/src/mesa/program/symbol_table.c
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_SOURCES += \
 	$(VBOX_MESA)/src/mesa/main/accum.c \
 	$(VBOX_MESA)/src/mesa/main/api_arrayelt.c \
@@ -385,5 +382,5 @@
 	$(VBOX_MESA)/src/mesa/main/vtxfmt.c \
 	$(VBOX_MESA)/src/mesa/main/es1_conversion.c
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_SOURCES += \
 	$(VBOX_MESA)/src/mesa/math/m_debug_clip.c \
 	$(VBOX_MESA)/src/mesa/math/m_debug_norm.c \
@@ -393,5 +390,5 @@
 	$(VBOX_MESA)/src/mesa/math/m_translate.c \
 	$(VBOX_MESA)/src/mesa/math/m_vector.c
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_SOURCES += \
 	$(VBOX_MESA)/src/mesa/vbo/vbo_context.c \
 	$(VBOX_MESA)/src/mesa/vbo/vbo_exec_api.c \
@@ -411,5 +408,5 @@
 	$(VBOX_MESA)/src/mesa/vbo/vbo_split_copy.c \
 	$(VBOX_MESA)/src/mesa/vbo/vbo_split_inplace.c
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_SOURCES += \
 	$(VBOX_MESA)/src/compiler/blob.c \
 	$(VBOX_MESA)/src/compiler/glsl_types.cpp \
@@ -612,5 +609,5 @@
 	$(VBOX_MESA)/src/compiler/nir/nir_validate.c \
 	$(VBOX_MESA)/src/compiler/nir/nir_worklist.c
-VBoxMesaLib_SOURCES    += \
+VBoxMesaLib_SOURCES += \
 	$(VBOX_MESA)/src/mapi/glapi/glapi_dispatch.c \
 	$(VBOX_MESA)/src/mapi/glapi/glapi_entrypoint.c \
@@ -620,4 +617,7 @@
 	$(VBOX_MESA)/src/mapi/u_current.c \
 	$(VBOX_MESA)/src/mapi/u_execmem.c
+# Not used
+#	$(VBOX_MESA)/src/compiler/glsl/standalone_scaffolding.cpp
+#	$(VBOX_MESA)/src/compiler/glsl/standalone.cpp
 
 # Disable optimization for some files, because it takes over 2 minutes to compile them with MSC otherwise.
@@ -626,10 +626,6 @@
 $(VBOX_MESA)/src/mesa/main/mipmap.c_CFLAGS.release        += -Od
 
-# Not used
-#	$(VBOX_MESA)/src/compiler/glsl/standalone_scaffolding.cpp
-#	$(VBOX_MESA)/src/compiler/glsl/standalone.cpp
-
 # 32 bit lib for 64 bit build
-VBoxMesaLib-x86_EXTENDS = VBoxMesaLib
+VBoxMesaLib-x86_EXTENDS      = VBoxMesaLib
 VBoxMesaLib-x86_BLD_TRG_ARCH = x86
 
@@ -638,6 +634,6 @@
 # VBoxMesaWglLib
 #
-VBoxMesaWglLib_TEMPLATE       = VBOXMESA3DGUESTR3LIB
-VBoxMesaWglLib_SOURCES        = \
+VBoxMesaWglLib_TEMPLATE = VBoxMesa3DGuestR3Lib
+VBoxMesaWglLib_SOURCES  = \
 	$(VBOX_MESA)/src/gallium/state_trackers/wgl/stw_context.c \
 	$(VBOX_MESA)/src/gallium/state_trackers/wgl/stw_device.c \
@@ -657,5 +653,5 @@
 
 # 32 bit lib for 64 bit build
-VBoxMesaWglLib-x86_EXTENDS = VBoxMesaWglLib
+VBoxMesaWglLib-x86_EXTENDS      = VBoxMesaWglLib
 VBoxMesaWglLib-x86_BLD_TRG_ARCH = x86
 
@@ -664,6 +660,6 @@
 # VBoxMesaGalliumAuxLib
 #
-VBoxMesaGalliumAuxLib_TEMPLATE     = VBOXMESA3DGUESTR3LIB
-VBoxMesaGalliumAuxLib_SOURCES      = \
+VBoxMesaGalliumAuxLib_TEMPLATE = VBoxMesa3DGuestR3Lib
+VBoxMesaGalliumAuxLib_SOURCES  = \
 	$(VBOX_MESA)/src/gallium/auxiliary/cso_cache/cso_cache.c \
 	$(VBOX_MESA)/src/gallium/auxiliary/cso_cache/cso_context.c \
@@ -818,7 +814,6 @@
 	$(VBOX_MESA)/src/gallium/auxiliary/util/u_upload_mgr.c \
 	$(VBOX_MESA)/src/gallium/auxiliary/util/u_vbuf.c
-
 # Auto-generated
-VBoxMesaGalliumAuxLib_SOURCES     += \
+VBoxMesaGalliumAuxLib_SOURCES += \
 	$(VBOX_MESA)/src/gallium/auxiliary/indices/u_indices_gen.c \
 	$(VBOX_MESA)/src/gallium/auxiliary/indices/u_unfilled_gen.c \
@@ -826,5 +821,5 @@
 
 # 32 bit lib for 64 bit build
-VBoxMesaGalliumAuxLib-x86_EXTENDS = VBoxMesaGalliumAuxLib
+VBoxMesaGalliumAuxLib-x86_EXTENDS      = VBoxMesaGalliumAuxLib
 VBoxMesaGalliumAuxLib-x86_BLD_TRG_ARCH = x86
 
@@ -833,12 +828,13 @@
 # VBoxMesaNineLib
 #
-VBoxMesaNineLib_TEMPLATE           = VBOXMESA3DGUESTR3LIB
-VBoxMesaNineLib_INCS              += $(VBOX_MESA)/include/D3D9
-VBoxMesaNineLib_DEFS.win          += COBJMACROS INC_OLE2
+VBoxMesaNineLib_TEMPLATE   = VBoxMesa3DGuestR3Lib
+VBoxMesaNineLib_INCS       = \
+	$(VBOX_MESA)/include/D3D9
+VBoxMesaNineLib_DEFS.win   = COBJMACROS INC_OLE2
 # -wd4028: formal parameter 4 different from declaration
 #    'nine_context_set_vertex_shader_constant_f' parameter is declared 'const unsigned pConstantData_size'
 #    but autogenerated code produces 'unsigned pConstantData_size'.
-VBoxMesaNineLib_CFLAGS.win += -wd4028
-VBoxMesaNineLib_SOURCES            = \
+VBoxMesaNineLib_CFLAGS.win = -wd4028
+VBoxMesaNineLib_SOURCES    = \
 	$(VBOX_MESA)/src/gallium/state_trackers/nine/adapter9.c \
 	$(VBOX_MESA)/src/gallium/state_trackers/nine/authenticatedchannel9.c \
@@ -880,34 +876,6 @@
 	$(VBOX_MESA)/src/gallium/state_trackers/nine/volumetexture9.c
 
-#VBOX_MESA_PYTHON_ENV = $(REDIRECT) $(if $1,-E 'PYTHONPATH=$1',) $(if $2,-o $2,) -0 $(if $3,$3,/dev/null) --
-#
-## for u_format.h
-#VBoxMesaNineLib_INCS          += ./$(VBOX_MESA)/src/gallium/auxiliary/util
-#
-#VBoxMesaNineLib_SOURCES       += \
-#	$(VBOX_PATH_MESA_GENFILES)/u_indices_gen.c \
-#	$(VBOX_PATH_MESA_GENFILES)/u_format_table.c \
-#	$(VBOX_PATH_MESA_GENFILES)/u_unfilled_gen.c
-#
-#$(VBOX_PATH_MESA_GENFILES)/u_indices_gen.c: \
-#		$(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/indices/, u_indices_gen.py) \
-#		| $$(dir $$@)
-#	$(call MSG_GENERATE,python,$@,$<)
-#	$(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
-#
-#$(VBOX_PATH_MESA_GENFILES)/u_unfilled_gen.c: \
-#		$(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/indices/, u_unfilled_gen.py) \
-#		| $$(dir $$@)
-#	$(call MSG_GENERATE,python,$@,$<)
-#	$(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
-#
-#$(VBOX_PATH_MESA_GENFILES)/u_format_table.c: \
-#		$(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/util/, u_format_table.py u_format.csv) \
-#		| $$(dir $$@)
-#	$(call MSG_GENERATE,python,$@,$<)
-#	$(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/util/u_format.csv
-
 # 32 bit lib for 64 bit build
-VBoxMesaNineLib-x86_EXTENDS = VBoxMesaNineLib
+VBoxMesaNineLib-x86_EXTENDS      = VBoxMesaNineLib
 VBoxMesaNineLib-x86_BLD_TRG_ARCH = x86
 
@@ -916,7 +884,8 @@
 # VBoxMesaSVGALib
 #
-VBoxMesaSVGALib_TEMPLATE           = VBOXMESA3DGUESTR3LIB
-VBoxMesaSVGALib_INCS              += $(VBOX_MESA)/src/gallium/drivers/svga/include
-VBoxMesaSVGALib_SOURCES            = \
+VBoxMesaSVGALib_TEMPLATE = VBoxMesa3DGuestR3Lib
+VBoxMesaSVGALib_INCS     = \
+	$(VBOX_MESA)/src/gallium/drivers/svga/include
+VBoxMesaSVGALib_SOURCES  = \
 	$(VBOX_MESA)/src/gallium/drivers/svga/svga_cmd.c \
 	$(VBOX_MESA)/src/gallium/drivers/svga/svga_cmd_vgpu10.c \
@@ -977,5 +946,5 @@
 
 # 32 bit lib for 64 bit build
-VBoxMesaSVGALib-x86_EXTENDS = VBoxMesaSVGALib
+VBoxMesaSVGALib-x86_EXTENDS      = VBoxMesaSVGALib
 VBoxMesaSVGALib-x86_BLD_TRG_ARCH = x86
 
@@ -984,9 +953,9 @@
 # VBoxMesaSVGAWinsysLib
 #
-VBoxMesaSVGAWinsysLib_TEMPLATE           = VBOXMESA3DGUESTR3LIB
-VBoxMesaSVGAWinsysLib_INCS              += \
+VBoxMesaSVGAWinsysLib_TEMPLATE = VBoxMesa3DGuestR3Lib
+VBoxMesaSVGAWinsysLib_INCS    += \
 	$(VBOX_MESA)/src/gallium/drivers/svga/include \
 	$(VBOX_MESA)/src/gallium/drivers/svga
-VBoxMesaSVGAWinsysLib_SOURCES            = \
+VBoxMesaSVGAWinsysLib_SOURCES  = \
 	$(VBOX_MESA)/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c \
 	$(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_buffer.c \
@@ -1000,5 +969,5 @@
 
 # These will be reimplemented for WDDM
-#VBoxMesaSVGAWinsysLib_SOURCES            += \
+#VBoxMesaSVGAWinsysLib_SOURCES += \
 #	$(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_screen.c \
 #	$(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_screen_dri.c \
@@ -1006,7 +975,8 @@
 
 # 32 bit lib for 64 bit build
-VBoxMesaSVGAWinsysLib-x86_EXTENDS = VBoxMesaSVGAWinsysLib
+VBoxMesaSVGAWinsysLib-x86_EXTENDS      = VBoxMesaSVGAWinsysLib
 VBoxMesaSVGAWinsysLib-x86_BLD_TRG_ARCH = x86
 
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
Index: trunk/src/VBox/Additions/3D/win/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/win/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/win/Makefile.kmk	(revision 75635)
@@ -5,5 +5,5 @@
 
 #
-# Copyright (C) 2016-2017 Oracle Corporation
+# Copyright (C) 2016-2018 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27,2 +27,3 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
Index: trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk	(revision 75635)
@@ -22,10 +22,11 @@
 #VBOX_WITH_MESA3D_GL_SOFTWARE = 1
 
-DLLS += VBoxGL
-VBoxGL_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
-#  -wd4005: '__useHeader' : redefinition
-VBoxGL_CFLAGS      = -wd4005
+DLLS       += VBoxGL
+DLLS.amd64 += VBoxGL-x86
 
-VBoxGL_INCS       += \
+VBoxGL_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
+# -wd4005: '__useHeader' : redefinition
+VBoxGL_CFLAGS   = -wd4005
+VBoxGL_INCS     = \
 	$(VBOX_PATH_3D)/win/include \
 	$(VBOX_PATH_MESA)/include/GL \
@@ -37,19 +38,17 @@
 	$(VBOX_PATH_VMSVGA_INC) \
 	$(VBOX_GRAPHICS_INCS)
-
-VBoxGL_SOURCES     = \
+VBoxGL_SOURCES  = \
 	$(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.def \
 	VBoxGL.rc
-
 ifndef VBOX_WITH_MESA3D_GL_SOFTWARE
-VBoxGL_SOURCES     += \
+VBoxGL_SOURCES += \
 	GaDrvEnvKMT.cpp \
 	VBoxGL.c
 else
-VBoxGL_SOURCES    += \
+VBoxGL_SOURCES += \
 	$(VBOX_PATH_MESA)/src/gallium/targets/libgl-gdi/libgl_gdi.c
-VBoxGL_SOURCES    += \
+VBoxGL_SOURCES += \
 	$(VBOX_PATH_MESA)/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
-VBoxGL_SOURCES    += \
+VBoxGL_SOURCES += \
 	$(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_buffer.c \
 	$(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_clear.c \
@@ -86,6 +85,5 @@
 	$(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_tile_cache.c
 endif
-
-VBoxGL_LIBS        = \
+VBoxGL_LIBS     = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \
@@ -102,8 +100,7 @@
 # VBoxGL-x86 - x86 version of VBoxGL built for amd64 build
 #
-DLLS.win.amd64 += VBoxGL-x86
-VBoxGL-x86_EXTENDS = VBoxGL
+VBoxGL-x86_EXTENDS      = VBoxGL
 VBoxGL-x86_BLD_TRG_ARCH = x86
-VBoxGL-x86_LIBS        = \
+VBoxGL-x86_LIBS         = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \
@@ -111,5 +108,6 @@
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaLib-x86$(VBOX_SUFF_LIB)
-VBoxGL-x86_DEFS = $(VBoxGL_DEFS) VBOX_WOW64
+VBoxGL-x86_DEFS         = $(VBoxGL_DEFS) VBOX_WOW64
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
Index: trunk/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk	(revision 75635)
@@ -19,47 +19,36 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-VBOX_PATH_GL_GEN = $(PATH_OBJ)/VBoxGLgen
 VBOX_GL_ICD_DEF_FILE = $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.mingw.def
 
-BLDDIRS += $(VBOX_PATH_GL_GEN)/
+DLLS       += VBoxICD
+DLLS.amd64 += VBoxICD-x86
 
-DLLS += VBoxICD
-VBoxICD_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
-#  -wd4005: '__useHeader' : redefinition
-VBoxICD_CFLAGS      = -wd4005
-
-VBoxICD_INCS       += \
+VBoxICD_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
+# -wd4005: '__useHeader' : redefinition
+VBoxICD_CFLAGS   = -wd4005
+VBoxICD_INCS     = \
 	$(VBOX_PATH_3D)/win/include \
 	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video \
 	$(VBOX_GRAPHICS_INCS)
-
-VBoxICD_SOURCES     = \
+VBoxICD_SOURCES  = \
 	$(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.def \
-	$(VBOX_PATH_GL_GEN)/forwarders.asm \
-	$(VBOX_PATH_GL_GEN)/pfns.c \
+	$(VBoxICD_0_OUTDIR)/forwarders.asm \
+	$(VBoxICD_0_OUTDIR)/pfns.c \
 	VBoxICD.c \
 	VBoxICD.rc
-
-VBoxICD_LIBS        = \
+VBoxICD_CLEAN    = \
+	$(VBoxICD_0_OUTDIR)/forwarders.asm \
+	$(VBoxICD_0_OUTDIR)/pfns.c
+VBoxICD_LIBS     = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB)
 
-$(VBOX_PATH_GL_GEN)/forwarders.asm: \
-		$(PATH_SUB_CURRENT)/icd_forwarders.py \
-		$(VBOX_GL_ICD_DEF_FILE) \
-		Makefile.kmk \
-		| $$(dir $$@)
+$$(VBoxICD_0_OUTDIR)/forwarders.asm: \
+		$(PATH_SUB_CURRENT)/icd_forwarders.py $(VBOX_GL_ICD_DEF_FILE) | $$(dir $$@)
 	$(call MSG_GENERATE,python,$@,$(VBOX_GL_ICD_DEF_FILE))
 	$(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@
-$(VBOX_PATH_GL_GEN)/pfns.c: \
-		$(PATH_SUB_CURRENT)/icd_pfns.py \
-		$(VBOX_GL_ICD_DEF_FILE) \
-		Makefile.kmk \
-		| $$(dir $$@)
+$$(VBoxICD_0_OUTDIR)/pfns.c: \
+		$(PATH_SUB_CURRENT)/icd_pfns.py $(VBOX_GL_ICD_DEF_FILE) | $$(dir $$@)
 	$(call MSG_GENERATE,python,$@,$(VBOX_GL_ICD_DEF_FILE))
 	$(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@
-
-VBoxICD_CLEAN      = \
-	$(VBOX_PATH_GL_GEN)/forwarders.asm \
-	$(VBOX_PATH_GL_GEN)/pfns.c
 
 ifdef VBOX_SIGN_ADDITIONS
@@ -71,10 +60,10 @@
 # x86 version built for amd64 build
 #
-DLLS.win.amd64 += VBoxICD-x86
-VBoxICD-x86_EXTENDS = VBoxICD
+VBoxICD-x86_EXTENDS      = VBoxICD
 VBoxICD-x86_BLD_TRG_ARCH = x86
-VBoxICD-x86_LIBS        = \
+VBoxICD-x86_LIBS         = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB)
-VBoxICD-x86_DEFS = $(VBoxICD_DEFS) VBOX_WOW64
+VBoxICD-x86_DEFS         = $(VBoxICD_DEFS) VBOX_WOW64
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
Index: trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk	(revision 75635)
@@ -19,6 +19,8 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-DLLS += VBoxNine
-VBoxNine_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
+DLLS       += VBoxNine
+DLLS.amd64 += VBoxNine-x86
+
+VBoxNine_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
 #  -wd4100: unreferenced formal parameter
 #  -wd4200: nonstandard extension used : zero-sized array in struct/union
@@ -26,14 +28,12 @@
 #  -wd4255: no function prototype given
 #  -wd4668: 'something' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-VBoxNine_CFLAGS     += -wd4100 -wd4200 -wd4245 -wd4255 -wd4668
-VBoxNine_INCS       += \
+VBoxNine_CFLAGS   = -wd4100 -wd4200 -wd4245 -wd4255 -wd4668
+VBoxNine_INCS     = \
 	$(VBOX_PATH_MESA)/src/gallium/state_trackers/nine
-
-VBoxNine_SOURCES     = \
+VBoxNine_SOURCES  = \
 	VBoxNine.c \
 	VBoxNine.rc \
 	VBoxNine.def
-
-VBoxNine_LIBS        = \
+VBoxNine_LIBS     = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \
@@ -49,13 +49,13 @@
 # VBoxNine-x86 - x86 version of VBoxNine built for amd64 build
 #
-DLLS.win.amd64 += VBoxNine-x86
-VBoxNine-x86_EXTENDS = VBoxNine
+VBoxNine-x86_EXTENDS      = VBoxNine
 VBoxNine-x86_BLD_TRG_ARCH = x86
-VBoxNine-x86_LIBS        = \
+VBoxNine-x86_LIBS         = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaNineLib-x86$(VBOX_SUFF_LIB)
-VBoxNine-x86_DEFS = $(VBoxNine_DEFS) VBOX_WOW64
+VBoxNine-x86_DEFS         = $(VBoxNine_DEFS) VBOX_WOW64
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
Index: trunk/src/VBox/Additions/3D/win/VBoxSVGA/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/win/VBoxSVGA/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/win/VBoxSVGA/Makefile.kmk	(revision 75635)
@@ -19,6 +19,8 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-DLLS += VBoxSVGA
-VBoxSVGA_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
+DLLS       += VBoxSVGA
+DLLS.amd64 += VBoxSVGA-x86
+
+VBoxSVGA_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
 #  -wd4005: vcc120: '__useHeader' : macro redefinition
 #  -wd4100: unreferenced formal parameter
@@ -28,13 +30,11 @@
 #  -wd4255: no function prototype given
 #  -wd4668: 'something' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
-VBoxSVGA_CFLAGS     += -wd4005 -wd4100 -wd4200 -wd4211 -wd4245 -wd4255 -wd4668
-
-VBoxSVGA_INCS       += \
+VBoxSVGA_CFLAGS   = -wd4005 -wd4100 -wd4200 -wd4211 -wd4245 -wd4255 -wd4668
+VBoxSVGA_INCS     = \
 	$(VBOX_PATH_3D)/win/include \
 	$(VBOX_PATH_MESA)/src/gallium/drivers/svga \
 	$(VBOX_PATH_MESA)/src/gallium/drivers/svga/include \
 	$(VBOX_PATH_MESA)/src/gallium/winsys/svga/drm
-
-VBoxSVGA_SOURCES     = \
+VBoxSVGA_SOURCES  = \
 	winsys/vmw_screen_ioctl.c \
 	winsys/vmw_screen_wddm.c \
@@ -43,6 +43,5 @@
 	VBoxSVGA.rc \
 	VBoxSVGA.def
-
-VBoxSVGA_LIBS        = \
+VBoxSVGA_LIBS     = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \
@@ -59,8 +58,7 @@
 # VBoxSVGA-x86 - x86 version of VBoxSVGA built for amd64 build
 #
-DLLS.win.amd64 += VBoxSVGA-x86
-VBoxSVGA-x86_EXTENDS = VBoxSVGA
+VBoxSVGA-x86_EXTENDS      = VBoxSVGA
 VBoxSVGA-x86_BLD_TRG_ARCH = x86
-VBoxSVGA-x86_LIBS        = \
+VBoxSVGA-x86_LIBS         = \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \
@@ -68,5 +66,5 @@
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGAWinsysLib-x86$(VBOX_SUFF_LIB) \
 	$(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGALib-x86$(VBOX_SUFF_LIB)
-VBoxSVGA-x86_DEFS = $(VBoxSVGA_DEFS) VBOX_WOW64
+VBoxSVGA-x86_DEFS         = $(VBoxSVGA_DEFS) VBOX_WOW64
 
 include $(FILE_KBUILD_SUB_FOOTER)
Index: trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/Makefile.kmk	(revision 75630)
+++ trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/Makefile.kmk	(revision 75635)
@@ -19,5 +19,5 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-LIBRARIES += VBoxWddmUmHlp
+LIBRARIES       += VBoxWddmUmHlp
 LIBRARIES.amd64 += VBoxWddmUmHlp-x86
 
@@ -25,12 +25,12 @@
 # VBoxWddmUmHlp - logger and other helpers for user mode driver
 #
-VBoxWddmUmHlp_TEMPLATE    = VBOXMESA3DGUESTR3DLLMinVista
-VBoxWddmUmHlp_INST        = $(INST_ADDITIONS_LIB)
-VBoxWddmUmHlp_DEFS        = VBOX_WITH_WDDM
-VBoxWddmUmHlp_INCS        = \
+VBoxWddmUmHlp_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
+VBoxWddmUmHlp_INST     = $(INST_ADDITIONS_LIB)
+VBoxWddmUmHlp_DEFS     = VBOX_WITH_WDDM
+VBoxWddmUmHlp_INCS     = \
 	$(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
 	$(VBOX_PATH_3D)/win/include \
 	$(VBOX_GRAPHICS_INCS)
-VBoxWddmUmHlp_SOURCES     = \
+VBoxWddmUmHlp_SOURCES  = \
 	D3DKMT.cpp \
 	VBoxMpLogger.cpp
@@ -39,6 +39,7 @@
 # 64-bit version for 32-bit build.
 #
-VBoxWddmUmHlp-x86_EXTENDS = VBoxWddmUmHlp
+VBoxWddmUmHlp-x86_EXTENDS      = VBoxWddmUmHlp
 VBoxWddmUmHlp-x86_BLD_TRG_ARCH = x86
 
 include $(FILE_KBUILD_SUB_FOOTER)
+
