зеркало из https://github.com/mozilla/gecko-dev.git
Use HOST_EXTRA_LIBS for linking HOST_PROGRAMS.
Do not define WinMain() for gcc builds. Bug #298417 r=bsmedberg a=chofmann
This commit is contained in:
Родитель
0d50a390c3
Коммит
fa9b3fbffb
|
@ -896,15 +896,15 @@ endif # BeOS
|
|||
|
||||
$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(EXTRA_LIBS) -ST:0x100000
|
||||
$(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) -ST:0x100000
|
||||
else
|
||||
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(EXTRA_LIBS)
|
||||
$(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||||
endif
|
||||
|
||||
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) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||||
else
|
||||
$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||||
endif
|
||||
|
|
|
@ -59,7 +59,7 @@ HOST_CSRCS = \
|
|||
HOST_LIBS = $(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX)
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
|
||||
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,ws2_32)
|
||||
ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER)))
|
||||
WIN32_EXE_LDFLAGS += -NODEFAULTLIB:LIBC
|
||||
else
|
||||
|
|
|
@ -1071,7 +1071,7 @@ int DoUpdate()
|
|||
return rv;
|
||||
}
|
||||
|
||||
#if defined(XP_WIN) && !defined(DEBUG)
|
||||
#if defined(XP_WIN) && !defined(DEBUG) && !defined(__GNUC__)
|
||||
// We need WinMain in order to not be a console app. This function is unused
|
||||
// if we are a console application.
|
||||
int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR args, int )
|
||||
|
|
Загрузка…
Ссылка в новой задаче