the changes that don't really work to make gfx2 build properly on windows

gfx2/src/makefile.win

@@ -24,28 +24,27 @@
 DEPTH	= ..\..
 include <$(DEPTH)/config/config.mak>
 
-#MODULE		= gfx2
-#LIBRARY_NAME= gfx2
-#DLL		    = $(OBJDIR)\$(LIBRARY_NAME).dll
+MODULE		= gfx2
+LIBRARY_NAME= gfx2
+DLL		    = $(OBJDIR)\$(LIBRARY_NAME).dll
+MAKE_OBJ_TYPE = DLL
 
-#MAKE_OBJ_TYPE = DLL
+OBJS = \
+	.\$(OBJDIR)\gfxImageContainer.obj \
+	$(NULL)
+
+LLIBS	= \
+	$(DIST)\lib\gfx2_s.lib \
+ 	$(DIST)\lib\xpcom.lib \
+	$(NULL)
 
 DIRS		= windows
 
-#OBJS = \
-#	.\$(OBJDIR)\nsRect.obj \
-#	$(NULL)
-
-#LLIBS	= \
-#	$(DIST)\lib\gfx2_s.lib \
-# 	$(DIST)\lib\xpcom.lib \
-#	$(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
-#install:: $(DLL)
-#	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
+install:: $(DLL)
+	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 
-#clobber::
-#	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-#	rm -f $(PDBFILE).pdb
+clobber::
+	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
+	rm -f $(PDBFILE).pdb

gfx2/src/windows/makefile.win

@@ -25,9 +25,10 @@ DEPTH=..\..\..
 include <$(DEPTH)/config/config.mak>
 
 MODULE		= gfx2
-LIBRARY_NAME= gfx2
-DLL		    = $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME= gfx2_s
+LIBRARY=$(LIBRARY_NAME)
+#DLL		    = $(OBJDIR)\$(LIBRARY_NAME).dll
+#MAKE_OBJ_TYPE = DLL
 
 XPIDL_MODULE= gfx2win
 
@@ -53,11 +54,11 @@ LLIBS	= \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
+#install:: $(DLL)
+#	$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
 
-#install:: $(LIBRARY)
-#	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib