From af5104709856cf2bd63e86138ac2658419d329a4 Mon Sep 17 00:00:00 2001
From: spider <spider>
Date: Tue, 7 Apr 1998 20:41:34 +0000
Subject: [PATCH] Changes to support building under win95.

---
 cmd/winfe/mkfiles32/mozilla.mak         | 23 +++++++++++++++++++----
 cmd/winfe/prefs/brpref/src/makefile.win |  2 ++
 cmd/winfe/prefs/edpref/src/makefile.win |  6 ++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/cmd/winfe/mkfiles32/mozilla.mak b/cmd/winfe/mkfiles32/mozilla.mak
index b60b25b47bb6..2a0baa9a802a 100644
--- a/cmd/winfe/mkfiles32/mozilla.mak
+++ b/cmd/winfe/mkfiles32/mozilla.mak
@@ -25,6 +25,12 @@
 DEPTH = ..\..\..
 include <$(DEPTH)\config\config.mak>
 
+!if "$(WINOS)" == "WIN95"
+QUIET=
+!else
+QUIET=@
+!endif
+
 .SUFFIXES: .cpp .c .rc
 
 !if !defined(MOZ_SRC)
@@ -403,8 +409,12 @@ LINK_LIBS= \
     $(DIST)\lib\jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib \
     $(DIST)\lib\dbm$(MOZ_BITS).lib \
 !endif
+!if "$(WINOS)" == "WIN95"
+    $(DIST)\lib\xpcom$(MOZ_BITS).lib
+!else
     $(DIST)\lib\xpcom$(MOZ_BITS).lib \
     $(NULL)
+!endif
 
 ##      Specify MFC libs before other libs and before .obj files,
 ##              such that _CrtDumpMemoryLeaks will be called
@@ -1829,15 +1839,16 @@ install:    \
 !ENDIF
 !endif
 
+!if "$(_MSC_VER)" == "1100"
 REBASE=rebase.exe
-!if [for %i in (. %PATH%) do @if exist %i\$(REBASE) echo %i\$(REBASE) > rebase.yes]
+!if [for %i in (. %PATH%) do $(QUIET)if exist %i\$(REBASE) echo %i\$(REBASE) > rebase.yes]
 !endif
 !if exist(rebase.yes)
-!if [for %i in ($(OUTDIR)\*.dll) do @echo %i >> rebase.lst]
+!if [for %i in ($(OUTDIR)\*.dll) do $(QUIET)echo %i >> rebase.lst]
 !endif
-!if [for %i in ($(OUTDIR)\java\bin\*.dll) do @echo %i >> rebase.lst]
+!if [for %i in ($(OUTDIR)\java\bin\*.dll) do $(QUIET)echo %i >> rebase.lst]
 !endif
-!if [for %i in ($(OUTDIR)\spellchk\*.dll) do @echo %i >> rebase.lst]
+!if [for %i in ($(OUTDIR)\spellchk\*.dll) do $(QUIET)echo %i >> rebase.lst]
 !endif
 !endif
 
@@ -1849,6 +1860,10 @@ rebase:
 !if exist(rebase.yes)
 	del rebase.yes
 !endif
+!else
+rebase:
+
+!endif
 
 
 $(OUTDIR)\java\bin\jpw32$(VERSION_NUMBER).dll:   $(DIST)\bin\jpw32$(VERSION_NUMBER).dll
diff --git a/cmd/winfe/prefs/brpref/src/makefile.win b/cmd/winfe/prefs/brpref/src/makefile.win
index dce329753ef3..fbf6e5e7de1d 100644
--- a/cmd/winfe/prefs/brpref/src/makefile.win
+++ b/cmd/winfe/prefs/brpref/src/makefile.win
@@ -65,5 +65,7 @@ LINCS=-I$(XPDIST)\public\dllcom -I$(XPDIST)\public\winprefs \
 
 libs:: $(DLL)
        $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+!if "$(WINOS)" != "WIN95"
 	   @$(DIST)\bin\dllreg $(DIST)\bin\$(DLLNAME).dll
+!endif
        $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
diff --git a/cmd/winfe/prefs/edpref/src/makefile.win b/cmd/winfe/prefs/edpref/src/makefile.win
index 1befa08a9873..72766311923c 100644
--- a/cmd/winfe/prefs/edpref/src/makefile.win
+++ b/cmd/winfe/prefs/edpref/src/makefile.win
@@ -15,6 +15,10 @@ IGNORE_MANIFEST=1
 # Reserved.
 
 
+DEPTH  	= ../../../../..
+ 
+!include "$(MOZ_SRC)\ns\config\config.mak"
+
 !if "$(MOZ_BITS)" == "16"
 DLL_CFLAGS=/GA /GEd /GEf /D_WINDLL
 
@@ -65,6 +69,8 @@ LINCS=-I$(XPDIST)\public\dllcom -I$(XPDIST)\public\winprefs \
 
 libs:: $(DLL)
        $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+!if "$(WINOS)" != "WIN95"
 	   @$(DIST)\bin\dllreg $(DIST)\bin\$(DLLNAME).dll
+!endif
        $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib