Index: glib/makefile.msc.in
===================================================================
--- glib/makefile.msc.in	(revision 6099)
+++ glib/makefile.msc.in	(working copy)
@@ -51,22 +51,22 @@
 	gfileutils.obj		\
 	ghash.obj		\
 	ghook.obj		\
-	gkeyfile.obj		\
-	gmappedfile.obj	\
 	giochannel.obj		\
 	giowin32.obj		\
+	gkeyfile.obj		\
 	glist.obj		\
 	gmain.obj		\
+	gmappedfile.obj	\
 	gmarkup.obj		\
 	gmem.obj		\
 	gmessages.obj		\
 	gnode.obj		\
 	goption.obj	\
+	gpattern.obj	\
 	gprimes.obj		\
+	gprintf.obj	\
 	gqsort.obj		\
 	gqueue.obj		\
-	gpattern.obj	\
-	gprintf.obj	\
 	grand.obj		\
 	gregex.obj		\
 	grel.obj		\
@@ -130,7 +130,7 @@
 	gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \
 	$(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
 
-gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-0.dll
 	$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib
 
 ################ other stuff
@@ -139,3 +139,5 @@
 	del ..\config.h
 	del ..\glibconfig.h
 
+
+
Index: makefile.msc
===================================================================
--- makefile.msc	(revision 6099)
+++ makefile.msc	(working copy)
@@ -1,7 +1,8 @@
 ## Makefile for building the GLib dlls with Microsoft C
 ## Use: nmake -f makefile.msc
 
-PARTS = glib gmodule gthread gobject gio tests
+#PARTS = glib gmodule gthread gobject gio tests
+PARTS = glib gmodule gthread gobject
 
 all : \
 	config.h \
Index: win32-fixup.pl
===================================================================
--- win32-fixup.pl	(revision 6099)
+++ win32-fixup.pl	(working copy)
@@ -6,6 +6,7 @@
 $binary_age = 0;
 $interface_age = 0;
 $gettext_package = "glib20";
+$current_minus_age = 0;
 
 sub process_file
 {
@@ -22,6 +23,7 @@
 	    s/\@GLIB_INTERFACE_AGE\@/$interface_age/g;
 	    s/\@GLIB_BINARY_AGE\@/$binary_age/g;
 	    s/\@GETTEXT_PACKAGE\@/$gettext_package/g;
+	    s/\@LT_CURRENT_MINUS_AGE@/$current_minus_age/g;
 	    print OUTPUT;
 	}
 }
@@ -29,7 +31,11 @@
 process_file ("config.h.win32");
 process_file ("glibconfig.h.win32");
 process_file ("glib/makefile.msc");
+process_file ("glib/glib.rc");
 process_file ("gmodule/makefile.msc");
+process_file ("gmodule/gmodule.rc");
 process_file ("gobject/makefile.msc");
+process_file ("gobject/gobject.rc");
 process_file ("gthread/makefile.msc");
+process_file ("gthread/gthread.rc");
 process_file ("tests/makefile.msc");