Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Link generated .res files into mingw builds.

Browse Source 
Use -mwindows when linking GUI mingw programs.
Bug #203443 r=leaf sr=bryner
This commit is contained in:
cls%seawood.org 2003-08-02 19:39:02 +00:00
parent b05376f6a4
commit a8b11eb498
4 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/rules.mk
View File

@ -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

31
embedding/tests/winEmbed/Makefile.in
View File

@ -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

4
webshell/tests/viewer/Makefile.in
View File

@ -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)

4
xpfe/bootstrap/Makefile.in
View File

@ -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)