From 1f93d3bd4e724e6cdfe7fe7b544e445898095850 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Sat, 2 Aug 2003 19:39:02 +0000
Subject: [PATCH] Link generated .res files into mingw builds. Use -mwindows
 when linking GUI mingw programs. Bug #203443 r=leaf sr=bryner

---
 config/rules.mk                      | 10 ++++-----
 embedding/tests/winEmbed/Makefile.in | 31 ++++++++++++++++------------
 webshell/tests/viewer/Makefile.in    |  4 ++++
 xpfe/bootstrap/Makefile.in           |  4 ++++
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 5e52d5be804..05e3b8b8f58 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -829,9 +829,9 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_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) $(EXE_DEF_FILE)
+	$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(RESFILE) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(EXE_DEF_FILE)
 else # ! CPP_PROG_LINK
-	$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
+	$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
 endif # OS2
@@ -853,14 +853,14 @@ ifdef RESFILE
 endif
 endif
 
-$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
+$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) $(RESFILE) Makefile Makefile.in
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(EXTRA_LIBS) /ST:0x100000
 else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
-	$(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS)
+	$(HOST_LD) /NOLOGO /OUT:$@ /PDB:$(PDBFILE) $(HOST_OBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS)
 else
-	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
+	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(RESFILE) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif
 endif
 
diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in
index aedf1e7a34c..6cdf79d9b43 100644
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -75,19 +75,6 @@ LOCAL_INCLUDES	= -I$(srcdir)
 
 OS_LIBS		+= $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)
 
-#
-# Control the default heap size.
-# This is the heap returned by GetProcessHeap().
-# As we use the CRT heap, the default size is too large and wastes VM.
-#
-# The default heap size is 1MB on Win32.
-# The heap will grow if need be.
-#
-# Set it to 256k.  See bug 127069.
-#
-LDFLAGS += /HEAP:0x40000
-
-
 include $(topsrcdir)/config/config.mk
 
 # Force applications to be built non-statically
@@ -115,6 +102,24 @@ endif # BUILD_STATIC_LIBS
 
 include $(topsrcdir)/config/rules.mk
 
+#
+# Control the default heap size.
+# This is the heap returned by GetProcessHeap().
+# As we use the CRT heap, the default size is too large and wastes VM.
+#
+# The default heap size is 1MB on Win32.
+# The heap will grow if need be.
+#
+# Set it to 256k.  See bug 127069.
+#
+ifndef GNU_CC
+LDFLAGS += /HEAP:0x40000
+endif
+
+# Get rid of console window
+ifdef GNU_CC
+LDFLAGS += -mwindows
+endif
 
 ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index 66414561e0d..d988aab69fa 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -117,6 +117,10 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 RESFILE		= viewer.res
 EXTRA_DSO_LIBS	+= xpwidgets_s dbgrobot widget_windows
+# Get rid of console window
+ifdef GNU_CC
+LDFLAGS		+= -mwindows
+endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 01d15f15178..5b65042c9e7 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -330,6 +330,10 @@ ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
 endif
+# Get rid of console window
+ifdef GNU_CC
+LDFLAGS += -mwindows
+endif
 endif
 
 CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)