Index: win32.mak
===================================================================
--- win32.mak	(revision 2051)
+++ win32.mak	(working copy)
@@ -98,7 +98,7 @@
 
 #	ti_bit.obj ti_Abit.obj
 
-SRCS= std\math.d std\stdio.d std\dateparse.d std\date.d std\datetime.d \
+SRCS_1 = std\math.d std\stdio.d std\dateparse.d std\date.d std\datetime.d \
 	std\uni.d std\string.d std\base64.d std\md5.d std\xml.d std\bigint.d \
 	std\regexp.d std\compiler.d std\cpuid.d std\format.d std\demangle.d \
 	std\path.d std\file.d std\outbuffer.d std\utf.d std\uri.d \
@@ -114,7 +114,10 @@
 	std\intrinsic.d \
 	std\process.d \
 	std\system.d \
-	std\encoding.d std\variant.d \
+	std\encoding.d 
+	
+SRCS_2 = \
+	std\variant.d \
 	std\stream.d std\socket.d std\socketstream.d \
 	std\perf.d std\container.d std\conv.d \
 	std\zip.d std\cstream.d std\loader.d \
@@ -144,8 +147,8 @@
 	std\windows\registry.d \
 	std\windows\syserror.d
 
+SRCS = $(SRCS_1) $(SRCS_2)
 
-
 DOCS=	$(DOC)\object.html \
 	$(DOC)\core_atomic.html \
 	$(DOC)\core_bitop.html \
@@ -327,7 +330,8 @@
 		etc\c\zlib\zlib.lib $(DRUNTIMELIB)
 
 unittest : $(SRCS) phobos.lib
-	$(DMD) $(UDFLAGS) -L/co -unittest unittest.d $(SRCS) phobos.lib
+	$(DMD) $(UDFLAGS) -L/co -c -unittest -ofunittest1.obj $(SRCS_1)
+	$(DMD) $(UDFLAGS) -L/co -unittest unittest.d $(SRCS_2) unittest1.obj $(DRUNTIMELIB)
 	unittest
 
 #unittest : unittest.exe