From 86c323408be9a082025d86290e09d817ff710ef0 Mon Sep 17 00:00:00 2001
From: "dmose%mozilla.org"
 <dmose%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 25 Jun 2004 01:00:02 +0000
Subject: [PATCH] Fix MinGW debugging system console output (bug 245903);
 patch=cls, r+sr=dmose, a=bsmedberg

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158451 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/app/Makefile.in          | 4 ----
 mozilla/calendar/sunbird/app/Makefile.in | 4 ----
 mozilla/config/config.mk                 | 8 ++++++++
 mozilla/config/rules.mk                  | 8 ++++----
 mozilla/mail/app/Makefile.in             | 4 ----
 mozilla/xpfe/bootstrap/Makefile.in       | 4 ----
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in
index 0e8e74bdc48..33dc72b6782 100644
--- a/mozilla/browser/app/Makefile.in
+++ b/mozilla/browser/app/Makefile.in
@@ -191,10 +191,6 @@ ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
 endif
-# Get rid of console window
-ifdef GNU_CC
-LDFLAGS += -mwindows
-endif
 endif
 
 $(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
diff --git a/mozilla/calendar/sunbird/app/Makefile.in b/mozilla/calendar/sunbird/app/Makefile.in
index d381de5897b..532c6147b07 100644
--- a/mozilla/calendar/sunbird/app/Makefile.in
+++ b/mozilla/calendar/sunbird/app/Makefile.in
@@ -175,10 +175,6 @@ ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
 endif
-# Get rid of console window
-ifdef GNU_CC
-LDFLAGS += -mwindows
-endif
 endif
 
 $(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 33fa4f1f451..29f724c6939 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -730,8 +730,12 @@ ifeq ($(MOZ_OS2_TOOLS),EMX)
 BIN_FLAGS	+= -Zlinker /PM:VIO
 endif
 ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+WIN32_EXE_LDFLAGS	+= -mconsole
+else
 WIN32_EXE_LDFLAGS	+= /SUBSYSTEM:CONSOLE
 endif
+endif
 else # MOZ_WINCONSOLE
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 LDFLAGS += /PM:PM
@@ -740,10 +744,14 @@ ifeq ($(MOZ_OS2_TOOLS),EMX)
 BIN_FLAGS	+= -Zlinker /PM:PM
 endif
 ifeq ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+WIN32_EXE_LDFLAGS	+= -mwindows
+else
 WIN32_EXE_LDFLAGS	+= /SUBSYSTEM:WINDOWS
 endif
 endif
 endif
+endif
 
 # Flags needed to link against the component library
 ifdef MOZ_COMPONENTLIB
diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk
index 95a0448433d..4de8eed62e7 100644
--- a/mozilla/config/rules.mk
+++ b/mozilla/config/rules.mk
@@ -836,9 +836,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) $(RESFILE) $(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) $(WIN32_EXE_LDFLAGS) $(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) $(RESFILE) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
+	$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
 endif # OS2
@@ -882,9 +882,9 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(LD) /nologo /out:$@ /pdb:$(PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
 else
 ifeq ($(CPP_PROG_LINK),1)
-	$(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
+	$(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
 else
-	$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
+	$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
 endif # CPP_PROG_LINK
 endif # WINNT && !GNU_CC
 endif # OS/2 VACPP
diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index 8ae9c4b8359..eb9a39c84af 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -169,10 +169,6 @@ ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 LDFLAGS += /HEAP:0x40000
 endif
-# Get rid of console window
-ifdef GNU_CC
-LDFLAGS += -mwindows
-endif
 endif
 
 $(PROGRAM): $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 2b9be293e03..2c87b5538f2 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -353,10 +353,6 @@ 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)