From 11b13e95fedcb4bbd486f30feb0eebb4685aa1bc Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com"
 <seawood%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 1 Jan 2002 00:03:57 +0000
Subject: [PATCH] nsRect's win32 signature requires libraries need to link
 against libgkgfx for debug builds. Added support for processing .rc to win32
 gmake build. Bug #58981

git-svn-id: svn://10.0.0.236/trunk@111203 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/autoconf.mk.in                 |  1 +
 mozilla/config/rules.mk                       | 23 +++++++++++++++----
 mozilla/configure.in                          |  1 +
 mozilla/db/mork/src/Makefile.in               |  4 ++++
 mozilla/docshell/build/Makefile.in            |  5 ++++
 mozilla/dom/src/build/Makefile.in             |  5 ++++
 mozilla/editor/libeditor/build/Makefile.in    |  5 ++++
 mozilla/embedding/browser/build/Makefile.in   |  5 ++++
 mozilla/embedding/tests/mfcembed/Makefile.in  |  2 +-
 mozilla/gfx2/src/Makefile.in                  |  5 ++++
 .../modules/libpr0n/decoders/bmp/Makefile.in  |  8 ++++++-
 .../modules/libpr0n/decoders/gif/Makefile.in  |  5 ++++
 .../modules/libpr0n/decoders/icon/Makefile.in |  5 ++++
 .../modules/libpr0n/decoders/jpeg/Makefile.in |  5 ++++
 .../modules/libpr0n/decoders/mng/Makefile.in  |  5 ++++
 .../modules/libpr0n/decoders/png/Makefile.in  |  5 ++++
 .../modules/libpr0n/decoders/ppm/Makefile.in  |  5 ++++
 mozilla/modules/libpr0n/src/Makefile.in       |  5 ++++
 mozilla/modules/plugin/base/src/Makefile.in   |  5 +++-
 mozilla/webshell/tests/viewer/Makefile.in     |  9 +++++---
 mozilla/xpfe/appshell/src/Makefile.in         |  1 +
 mozilla/xpfe/bootstrap/Makefile.in            |  6 ++++-
 .../xpinstall/wizard/windows/ds32/Makefile.in |  1 -
 23 files changed, 108 insertions(+), 13 deletions(-)

diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 122b37a01d5..6fb7ba66514 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -169,6 +169,7 @@ ASFLAGS		= @ASFLAGS@
 AS_DASH_C_FLAG	= @AS_DASH_C_FLAG@
 LD		= @LD@
 DLLTOOL		= @DLLTOOL@
+RC		= @RC@
 WINDRES		= @WINDRES@
 USE_SHORT_LIBNAME = @USE_SHORT_LIBNAME@
 IMPLIB		= @IMPLIB@
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 1b6cb1a34d8..a73236eba01 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -188,11 +188,19 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 
+ifdef LIBRARY_NAME
+PDBFILE=$(LIBRARY_NAME).pdb
+ifdef MOZ_DEBUG
+MAPFILE=$(LIBRARY_NAME).map
+CODFILE=$(LIBRARY_NAME).cod
+endif
+else
 PDBFILE=$*.pdb
 ifdef MOZ_DEBUG
 MAPFILE=$*.map
 CODFILE=$*.cod
 endif
+endif
 
 ifdef DEFFILE
 CFLAGS += /DEF:$(DEFFILE)
@@ -265,7 +273,7 @@ ALL_TRASH = \
 	$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
 	$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
 	$(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) \
-	$(PBDFILE) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \
+	$(PDBFILE) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \
 	$(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) \
 	$(PROGRAM:$(BIN_SUFFIX)=.exp) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.exp) \
 	$(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \
@@ -729,12 +737,12 @@ alltags:
 # PROGRAM = Foo
 # creates OBJS, links with LIBS to create Foo
 #
-$(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) $(EXE_DEF_FILE) Makefile Makefile.in
+$(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) Makefile Makefile.in
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LD) -OUT:$@ $(LDFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(EXE_DEF_FILE) /ST:0x100000
 else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
-	$(LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(PROGOBJS) $(LDFLAGS) $(LIBS) $(OS_LIBS)
+	$(LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(PROGOBJS) $(RESFILE) $(LDFLAGS) $(LIBS) $(OS_LIBS)
 else
 ifeq ($(CPP_PROG_LINK),1)
 	$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
@@ -897,7 +905,7 @@ ifdef NO_LD_ARCHIVE_FLAGS
 SUB_SHLOBJS = $(SUB_LOBJS)
 endif
 
-$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in
+$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in
 	rm -f $@
 ifneq ($(OS_ARCH),OS2)
 ifneq ($(OS_ARCH),OpenVMS)
@@ -907,7 +915,7 @@ ifdef SHARED_LIBRARY_LIBS
 	@for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done
 endif # SHARED_LIBRARY_LIBS
 endif # NO_LD_ARCHIVE_FLAGS
-	$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
+	$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 	@rm -f foodummyfilefoo $(SUB_SHLOBJS)
 else
 	@touch no-such-file.vms; rm -f no-such-file.vms $(SUB_LOBJS)
@@ -1027,6 +1035,11 @@ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.mm Makefile.in
 %.i: %.c
 	$(CC) -C -E $(COMPILE_CFLAGS) $< > $*.i
 
+%.res: %.rc
+	@echo Creating Resource file: $@
+	$(RC) $(RCFLAGS) -r $(DEFINES) $(INCLUDES) $(OUTOPTION)$@ $<
+
+
 # need 3 separate lines for OS/2
 %: %.pl
 	rm -f $@
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 0ebce7b5494..cc434cfae04 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -4149,6 +4149,7 @@ AC_SUBST(ASFLAGS)
 AC_SUBST(AS_DASH_C_FLAG)
 AC_SUBST(LD)
 AC_SUBST(DLLTOOL)
+AC_SUBST(RC)
 AC_SUBST(WINDRES)
 AC_SUBST(USE_SHORT_LIBNAME)
 AC_SUBST(IMPLIB)
diff --git a/mozilla/db/mork/src/Makefile.in b/mozilla/db/mork/src/Makefile.in
index 13c39294f16..14a5b4a514b 100644
--- a/mozilla/db/mork/src/Makefile.in
+++ b/mozilla/db/mork/src/Makefile.in
@@ -77,5 +77,9 @@ CPPSRCS		= \
 		morkZone.cpp \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= morkSearchRowCursor.cpp
+endif
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/docshell/build/Makefile.in b/mozilla/docshell/build/Makefile.in
index 4bf726e5795..ce6e9a514dd 100644
--- a/mozilla/docshell/build/Makefile.in
+++ b/mozilla/docshell/build/Makefile.in
@@ -50,6 +50,10 @@ REQUIRES	= xpcom \
 		  find \
 		  $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 CPPSRCS		= \
 		nsDocShellModule.cpp		\
 		$(NULL)
@@ -60,6 +64,7 @@ SHARED_LIBRARY_LIBS= \
 
 EXTRA_DSO_LDOPTS= \
 		$(LIBS_DIR) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in
index b6f5e63d168..1cbee0e4d12 100644
--- a/mozilla/dom/src/build/Makefile.in
+++ b/mozilla/dom/src/build/Makefile.in
@@ -48,6 +48,10 @@ REQUIRES	= xpcom \
 IS_COMPONENT    = 1
 MODULE_NAME	= DOM_components
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 CPPSRCS		= \
 		nsDOMFactory.cpp \
 		nsScriptNameSpaceManager.cpp \
@@ -59,6 +63,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
diff --git a/mozilla/editor/libeditor/build/Makefile.in b/mozilla/editor/libeditor/build/Makefile.in
index fbcb668ac58..03aa076b0e1 100644
--- a/mozilla/editor/libeditor/build/Makefile.in
+++ b/mozilla/editor/libeditor/build/Makefile.in
@@ -34,7 +34,12 @@ EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS)	 \
 		$(MOZ_UNICHARUTIL_LIBS)  \
 		$(MOZ_COMPONENT_LIBS)    \
 		$(MOZ_JS_LIBS)           \
diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in
index eb867712713..0312af85957 100644
--- a/mozilla/embedding/browser/build/Makefile.in
+++ b/mozilla/embedding/browser/build/Makefile.in
@@ -47,6 +47,10 @@ REQUIRES	= xpcom \
 		  webbrowserpersist \
 		  $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 CPPSRCS		= \
 		nsWebBrowserModule.cpp		\
 		$(NULL)
@@ -57,6 +61,7 @@ SHARED_LIBRARY_LIBS= \
 
 EXTRA_DSO_LDOPTS= \
 		$(LIBS_DIR) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/embedding/tests/mfcembed/Makefile.in b/mozilla/embedding/tests/mfcembed/Makefile.in
index f17f9d53211..f48a59bcc3a 100644
--- a/mozilla/embedding/tests/mfcembed/Makefile.in
+++ b/mozilla/embedding/tests/mfcembed/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PROGRAM		= mfcEmbed$(BIN_SUFFIX)
-RESFILE		= mfcEmbed.res
+RESFILE		= MfcEmbed.res
 
 REQUIRES = \
 	xpcom \
diff --git a/mozilla/gfx2/src/Makefile.in b/mozilla/gfx2/src/Makefile.in
index c1f64f79211..2cab4c5934c 100644
--- a/mozilla/gfx2/src/Makefile.in
+++ b/mozilla/gfx2/src/Makefile.in
@@ -33,6 +33,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGfx2Module
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  gfx \
 		  $(NULL)
@@ -47,6 +51,7 @@ CPPSRCS		= \
 #FORCE_STATIC_LIB = 1
 
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/bmp/Makefile.in b/mozilla/modules/libpr0n/decoders/bmp/Makefile.in
index 4dfe9c57412..ea5d6cccc45 100644
--- a/mozilla/modules/libpr0n/decoders/bmp/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/bmp/Makefile.in
@@ -33,6 +33,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBMPModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  gfx \
 		  gfx2 \
@@ -42,7 +46,9 @@ REQUIRES	= xpcom \
 
 CPPSRCS        = nsBMPDecoder.cpp nsICODecoder.cpp nsBMPModule.cpp
 
-EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS) \
+EXTRA_DSO_LDOPTS = \
+		   $(EXTRA_DSO_LIBS) \
+		   $(MOZ_COMPONENT_LIBS) \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/modules/libpr0n/decoders/gif/Makefile.in b/mozilla/modules/libpr0n/decoders/gif/Makefile.in
index 0043740eda6..d0d0889d2ef 100644
--- a/mozilla/modules/libpr0n/decoders/gif/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/gif/Makefile.in
@@ -32,6 +32,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGIFModule2
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  gfx \
 		  gfx2 \
@@ -41,6 +45,7 @@ REQUIRES	= xpcom \
 CPPSRCS		= GIF2.cpp nsGIFDecoder2.cpp nsGIFModule.cpp
 
 EXTRA_DSO_LDOPTS = $(GIF_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/icon/Makefile.in b/mozilla/modules/libpr0n/decoders/icon/Makefile.in
index 72361258b07..f27a637a30f 100644
--- a/mozilla/modules/libpr0n/decoders/icon/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/icon/Makefile.in
@@ -32,6 +32,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsIconDecoderModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 DIRS		= win
 
 REQUIRES	= xpcom \
@@ -54,6 +58,7 @@ XPIDLSRCS	= nsIIconURI.idl
 SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)imgiconwin_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in b/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in
index 24d9b06948a..d1596342743 100644
--- a/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/jpeg/Makefile.in
@@ -32,6 +32,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsJPEGDecoderModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
@@ -43,6 +47,7 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsJPEGDecoder.cpp nsJPEGFactory.cpp
 
 EXTRA_DSO_LDOPTS = $(JPEG_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/mng/Makefile.in b/mozilla/modules/libpr0n/decoders/mng/Makefile.in
index 3fbb44c13ba..0a131bb9b68 100644
--- a/mozilla/modules/libpr0n/decoders/mng/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/mng/Makefile.in
@@ -30,6 +30,10 @@ EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMNGDecoderModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  gfx \
 		  gfx2 \
@@ -42,6 +46,7 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsMNGDecoder.cpp nsMNGFactory.cpp imgContainerMNG.cpp
 
 EXTRA_DSO_LDOPTS = $(MNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/png/Makefile.in b/mozilla/modules/libpr0n/decoders/png/Makefile.in
index 3b1443fbe8b..3ce1aca589e 100644
--- a/mozilla/modules/libpr0n/decoders/png/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/png/Makefile.in
@@ -32,6 +32,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPNGDecoderModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  gfx \
 		  gfx2 \
@@ -43,6 +47,7 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsPNGDecoder.cpp nsPNGFactory.cpp
 
 EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/decoders/ppm/Makefile.in b/mozilla/modules/libpr0n/decoders/ppm/Makefile.in
index 9175d014313..74670283021 100644
--- a/mozilla/modules/libpr0n/decoders/ppm/Makefile.in
+++ b/mozilla/modules/libpr0n/decoders/ppm/Makefile.in
@@ -32,6 +32,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPPMDecoderModule
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  gfx \
 		  gfx2 \
@@ -41,6 +45,7 @@ REQUIRES	= xpcom \
 CPPSRCS		= nsPPMDecoder.cpp nsPPMFactory.cpp
 
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/libpr0n/src/Makefile.in b/mozilla/modules/libpr0n/src/Makefile.in
index 798cb3b5aae..b06ef6b4196 100644
--- a/mozilla/modules/libpr0n/src/Makefile.in
+++ b/mozilla/modules/libpr0n/src/Makefile.in
@@ -32,6 +32,10 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsImageLib2Module
 
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	= gkgfx
+endif
+
 REQUIRES	= xpcom \
 		  string \
 		  necko \
@@ -50,6 +54,7 @@ CPPSRCS		= \
 			imgRequestProxy.cpp
 
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index cceddce2a51..06948258d46 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -89,9 +89,12 @@ EXPORTS		= \
 		nsIPluginInstanceOwner.h \
 		$(NULL)
 
-EXTRA_DSO_LIBS  += gkgfx
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_DSO_LIBS	+= gkgfx
+endif
 
 EXTRA_DSO_LDOPTS = \
+		$(EXTRA_DSO_LIBS) \
 		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in
index 45ff7fb5393..29e08d41729 100644
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@@ -106,6 +106,11 @@ XP_DIST_LIBS		= \
 			-lgkgfx \
 			$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+RESFILE		= viewer.res
+XP_DIST_LIBS	+= -lxpwidgets_s -lDebugRobot
+endif
+
 ifdef MOZ_OJI
 XP_DIST_LIBS		+= -ljsj
 endif
@@ -114,6 +119,7 @@ XP_DIST_LIBS		+= -lmozutil_s
 endif
 
 XP_DIST_LIBS		+= \
+			$(EXTRA_DSO_LIBS) \
 			$(XPCOM_LIBS) \
 			$(MOZ_JS_LIBS) \
 			$(NULL)
@@ -166,12 +172,9 @@ CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
 GARBAGE			+= $(PROGRAM)_gtk $(PROGRAM)_qt $(PROGRAM)_xlib
 
 ifeq ($(OS_ARCH),WINNT)
-RESFILE		= viewer.res
 OS_LIBS		+= shell32.lib ole32.lib oleaut32.lib oleacc.lib \
 	imm32.lib uuid.lib comdlg32.lib
 LDFLAGS		+= -SUBSYSTEM:CONSOLE
-EXTRA_DSO_LIBS	+= xpwidgets_s
-
 ifdef MOZ_NO_DEBUG_RTL
 CXXFLAGS	+= -DMOZ_NO_DEBUG_RTL
 endif
diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in
index 094af4b46cf..881d378d506 100644
--- a/mozilla/xpfe/appshell/src/Makefile.in
+++ b/mozilla/xpfe/appshell/src/Makefile.in
@@ -86,6 +86,7 @@ DEFINES		+= -D_IMPL_NS_APPSHELL
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
+EXTRA_DSO_LIBS	= gkgfx
 endif
 
 EXTRA_DSO_LDOPTS = \
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 99197820c0f..8015e06d4fb 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -91,10 +91,13 @@ endif
 CPPSRCS		= \
 		nsAppRunner.cpp \
 		nsWindowCreator.cpp \
-		nsSigHandlers.cpp \
 		showOSAlert.cpp \
 		$(NULL)
 
+ifneq ($(OS_ARCH),WINNT)
+CPPSRCS		+= nsSigHandlers.cpp
+endif
+
 XP_LIBS		= \
 		$(EXTRA_DSO_LDOPTS) \
 		$(EXTRA_DSO_LIBS) \
@@ -194,6 +197,7 @@ LIBS += $(MOZ_GTK_LDFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+RESFILE = splash.res
 DEFINES	+= -DWIN32_LEAN_AND_MEAN
 CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
 OS_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib
diff --git a/mozilla/xpinstall/wizard/windows/ds32/Makefile.in b/mozilla/xpinstall/wizard/windows/ds32/Makefile.in
index c6f2a2c784e..93d98d3183a 100644
--- a/mozilla/xpinstall/wizard/windows/ds32/Makefile.in
+++ b/mozilla/xpinstall/wizard/windows/ds32/Makefile.in
@@ -27,7 +27,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PROGRAM		= ds32$(BIN_SUFFIX)
-RESFILE		= ds32.res
 
 USE_NON_MT_LIBS = 1