Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk	(revision 19981)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk	(revision 19982)
@@ -172,17 +172,17 @@
     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
 
-DLLS += d3d8
-
-d3d8_TEMPLATE     = VBOXGUESTR3NPDLL
-d3d8_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
-    DLLDIR=\"\" \
-    BINDIR=\"\" \
-    LIB_TO_BINDIR=\"\" \
-    LIB_TO_DLLDIR=\"\" \
-    BIN_TO_DLLDIR=\"\" \
-    LIB_TO_DATADIR=\"\" \
-    BIN_TO_DATADIR=\"\"
-d3d8_INCS         := $(PATH_SUB_CURRENT)/include
-d3d8_SOURCES      := \
+DLLS += VBoxD3D8
+
+VBoxD3D8_TEMPLATE     = VBOXGUESTR3NPDLL
+VBoxD3D8_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
+    DLLDIR=\"\" \
+    BINDIR=\"\" \
+    LIB_TO_BINDIR=\"\" \
+    LIB_TO_DLLDIR=\"\" \
+    BIN_TO_DLLDIR=\"\" \
+    LIB_TO_DATADIR=\"\" \
+    BIN_TO_DATADIR=\"\"
+VBoxD3D8_INCS         := $(PATH_SUB_CURRENT)/include
+VBoxD3D8_SOURCES      := \
     d3d8/cubetexture.c \
     d3d8/d3d8_main.c \
@@ -202,21 +202,21 @@
     d3d8/volumetexture.c \
     d3d8/d3d8.def
-d3d8_LIBS = \
+VBoxD3D8_LIBS = \
     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) \
     $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
 
-DLLS += d3d9
-
-d3d9_TEMPLATE     = VBOXGUESTR3NPDLL
-d3d9_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
-    DLLDIR=\"\" \
-    BINDIR=\"\" \
-    LIB_TO_BINDIR=\"\" \
-    LIB_TO_DLLDIR=\"\" \
-    BIN_TO_DLLDIR=\"\" \
-    LIB_TO_DATADIR=\"\" \
-    BIN_TO_DATADIR=\"\"
-d3d9_INCS         := $(PATH_SUB_CURRENT)/include
-d3d9_SOURCES      := \
+DLLS += VBoxD3D9
+
+VBoxD3D9_TEMPLATE     = VBOXGUESTR3NPDLL
+VBoxD3D9_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
+    DLLDIR=\"\" \
+    BINDIR=\"\" \
+    LIB_TO_BINDIR=\"\" \
+    LIB_TO_DLLDIR=\"\" \
+    BIN_TO_DLLDIR=\"\" \
+    LIB_TO_DATADIR=\"\" \
+    BIN_TO_DATADIR=\"\"
+VBoxD3D9_INCS         := $(PATH_SUB_CURRENT)/include
+VBoxD3D9_SOURCES      := \
     d3d9/cubetexture.c \
     d3d9/d3d9_main.c \
@@ -236,7 +236,25 @@
     d3d9/volumetexture.c \
     d3d9/d3d9.def
-d3d9_LIBS = \
+VBoxD3D9_LIBS = \
     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) \
     $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
 
+DLLS += d3d8
+d3d8_TEMPLATE      = VBOXGUESTR3NPDLL
+d3d8_DEFS          = __i386__
+d3d8_INCS         := $(PATH_SUB_CURRENT)/include
+d3d8_SOURCES       =  \
+    switcher/d3d8_main.c \
+    switcher/sw_common.c \
+    switcher/sw_d3d8.def
+
+DLLS += d3d9
+d3d9_TEMPLATE      = VBOXGUESTR3NPDLL
+d3d9_DEFS          = __i386__
+d3d9_INCS         := $(PATH_SUB_CURRENT)/include
+d3d9_SOURCES       =  \
+    switcher/d3d9_main.c \
+    switcher/sw_common.c \
+    switcher/sw_d3d9.def
+
 include $(KBUILD_PATH)/subfooter.kmk