Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding mingw makefile changes.

Browse Source 
Bug #134113 r=bryner


git-svn-id: svn://10.0.0.236/trunk@139140 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
2003-03-08 05:57:15 +00:00
parent 53edbaf8b6
commit dac8d1a090
35 changed files with 108 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/config/static-config.mk
View File

@@ -94,14 +94,14 @@ STATIC_EXTRA_LIBS += $(MOZ_XINERAMA_LIBS)
endif
ifdef MOZ_CALENDAR
STATIC_EXTRA_LIBS += -lmozical -lmozicalss
STATIC_EXTRA_LIBS += $(call EXPAND_MOZLIBNAME,mozicalss mozical)
endif
# Component Makefile always brings in this.
# STATIC_EXTRA_LIBS += $(TK_LIBS)
ifeq ($(OS_ARCH),WINNT)
STATIC_EXTRA_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib winspool.lib
STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
endif

2
mozilla/embedding/components/build/Makefile.in
View File

@@ -90,7 +90,7 @@ endif
ifeq ($(MOZ_GFX_TOOLKIT),windows)
LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win
OS_LIBS += winspool.lib comdlg32.lib
OS_LIBS += $(call EXPAND_LIBNAME,winspool comdlg32)
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

2
mozilla/embedding/tests/Makefile.in
View File

@@ -26,8 +26,10 @@ include $(DEPTH)/config/autoconf.mk
DIRS = winEmbed
ifndef GNU_CC
ifndef NO_MFC
DIRS += mfcembed/components mfcembed
endif
endif
include $(topsrcdir)/config/rules.mk

9
mozilla/embedding/tests/winEmbed/Makefile.in
View File

@@ -70,12 +70,9 @@ LIBS = \
$(MOZ_JS_LIBS) \
$(NULL)
OS_LIBS += \
ole32.lib \
comdlg32.lib \
shell32.lib \
version.lib \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
OS_LIBS += $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)
#
# Control the default heap size.

5
mozilla/extensions/inspector/build/src/Makefile.in
View File

@@ -64,15 +64,18 @@ LOCAL_INCLUDES += -I$(srcdir)/../../base/src/win
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)inscreencap_s.$(LIB_SUFFIX) \
$(NULL)
ifdef GNU_CC
OS_LIBS += -lgdi32
endif
endif
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(PNG_LIBS) \
$(ZLIB_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/extensions/wallet/build/Makefile.in
View File

@@ -54,7 +54,7 @@ EXTRA_DSO_LDOPTS = \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += shell32.lib
OS_LIBS += $(call EXPAND_LIBNAME,shell32)
endif
include $(topsrcdir)/config/rules.mk

11
mozilla/gfx/src/windows/Makefile.in
View File

@@ -80,7 +80,11 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../shared \
$(NULL)
OS_LIBS += winspool.lib comdlg32.lib
_OS_LIBS = winspool comdlg32
ifdef GNU_CC
_OS_LIBS += gdi32
endif
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
GARBAGE += nsCompressedCharMap.cpp
@@ -106,9 +110,10 @@ install:: fontEncoding.properties
DEFINES += -DSTRICT
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)
@@ -119,7 +124,7 @@ LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/include
else
LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/inc
endif
EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW/lib/ddraw.lib
EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW)/lib/ddraw.lib
OS_LIBS += ole32.lib
endif

2
mozilla/js/src/Makefile.in
View File

@@ -240,7 +240,7 @@ LDFLAGS += -lm
endif
# Prevent floating point errors caused by VC++ optimizations
ifeq ($(OS_ARCH),WINNT)
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
CFLAGS += /Op
endif # WINNT

2
mozilla/mailnews/Makefile.in
View File

@@ -29,8 +29,10 @@ include $(DEPTH)/config/autoconf.mk
DIRS = public base db/msgdb news local mime compose imap addrbook import extensions
ifeq ($(OS_ARCH),WINNT)
ifndef GNU_CC
DIRS += mapi
endif
endif
include $(topsrcdir)/config/rules.mk

2
mozilla/mailnews/addrbook/src/Makefile.in
View File

@@ -112,6 +112,7 @@ EXPORTS = \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
ifndef GNU_CC
EXPORTS += \
nsAbOutlookCard.h \
nsAbOutlookDirFactory.h \
@@ -128,6 +129,7 @@ CPPSRCS += \
$(NULL)
endif
endif
ifdef MOZ_LDAP_XPCOM
REQUIRES += mozldap \

6
mozilla/mailnews/base/build/Makefile.in
View File

@@ -85,15 +85,15 @@ EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../src
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../src
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += shell32.lib
OS_LIBS += $(call EXPAND_LIBNAME,shell32)
endif

2
mozilla/mailnews/import/Makefile.in
View File

@@ -31,9 +31,11 @@ DIRS = public src text comm4x
ifeq ($(OS_ARCH),WINNT)
DIRS += eudora
ifneq ($(_MSC_VER),1100)
ifndef GNU_CC
DIRS += oexpress outlook
endif
endif
endif
include $(topsrcdir)/config/rules.mk

2
mozilla/modules/libpr0n/decoders/icon/Makefile.in
View File

@@ -70,7 +70,7 @@ EXTRA_DSO_LDOPTS = \
LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM)
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += shell32.lib
OS_LIBS += $(call EXPAND_LIBNAME,shell32 gdi32)
endif
include $(topsrcdir)/config/rules.mk

6
mozilla/modules/plugin/base/src/Makefile.in
View File

@@ -119,8 +119,12 @@ endif
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
CXXFLAGS += -fexceptions
else
CXXFLAGS += -GX
OS_LIBS += version.lib
endif
OS_LIBS += $(call EXPAND_LIBNAME,version)
endif
ifeq ($(OS_ARCH), OpenVMS)

10
mozilla/modules/plugin/samples/default/windows/Makefile.in
View File

@@ -47,6 +47,8 @@ CPPSRCS = \
utils.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
# plugins should always be shared, even in the "static" build
FORCE_SHARED_LIB = 1
@@ -58,8 +60,14 @@ NO_INSTALL = 1
include $(topsrcdir)/config/rules.mk
_OS_LIBS = version
ifdef GNU_CC
CXXFLAGS += -fexceptions
_OS_LIBS += gdi32
else
CXXFLAGS += -GX
OS_LIBS += version.lib
endif
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
install-plugin: $(SHARED_LIBRARY)
ifdef SHARED_LIBRARY

6
mozilla/modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
View File

@@ -36,11 +36,15 @@ REQUIRES = plugin \
CPPSRCS = plugin.cpp
SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(srcdir)/basic.def
RESFILE = basic.res
ifdef GNU_CC
OS_LIBS += -lgdi32
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DMOZILLA_STRICT_API

6
mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
View File

@@ -41,11 +41,15 @@ CPPSRCS = plugin.cpp \
XPIDLSRCS = nsIScriptablePluginSample.idl
SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(srcdir)/npscriptable.def
RESFILE = npscriptable.res
ifdef GNU_CC
OS_LIBS += -lgdi32
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DMOZILLA_STRICT_API

2
mozilla/modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
View File

@@ -36,7 +36,7 @@ REQUIRES = plugin \
CPPSRCS = plugin.cpp
SHARED_LIBRARY_LIBS = ../../common/plugingate_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(srcdir)/npwinless.def
RESFILE = npwinless.res

2
mozilla/modules/zlib/src/Makefile.in
View File

@@ -32,8 +32,10 @@ LIBRARY_NAME = mozz
GRE_MODULE = 1
ifeq ($(OS_ARCH),WINNT)
ifndef GNU_CC
MAPFILE = $(LIBRARY_NAME).map
DEFFILE = $(srcdir)/zlib.def
endif
DEFINES += -DZLIB_DLL=1
endif

2
mozilla/netwerk/base/src/Makefile.in
View File

@@ -75,7 +75,9 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
CPPSRCS += nsURLHelperWin.cpp
CPPSRCS += nsNativeConnectionHelper.cpp
ifndef GNU_CC
CPPSRCS += nsAutodialWin.cpp
endif
else
CPPSRCS += nsURLHelperUnix.cpp
endif

6
mozilla/netwerk/build/Makefile.in
View File

@@ -103,3 +103,9 @@ endif
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
OS_LIBS += -lws2_32
endif
endif

2
mozilla/uriloader/build/Makefile.in
View File

@@ -77,7 +77,7 @@ EXTRA_DSO_LDOPTS += \
endif
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += shell32.lib
OS_LIBS += $(call EXPAND_LIBNAME,shell32)
endif
include $(topsrcdir)/config/rules.mk

4
mozilla/xpcom/build/Makefile.in
View File

@@ -141,9 +141,9 @@ EXTRA_DSO_LDOPTS += -lbe
endif
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LDOPTS += shell32.lib ole32.lib
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid)
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
EXTRA_DSO_LDOPTS += imagehlp.lib
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
endif
endif # WINNT

4
mozilla/xpcom/tests/Makefile.in
View File

@@ -82,8 +82,12 @@ LOCAL_INCLUDES = \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CXX
CXXFLAGS += -fexceptions
else
CXXFLAGS += -GX
endif
endif
libs::
$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res

2
mozilla/xpcom/tests/windows/Makefile.in
View File

@@ -39,6 +39,6 @@ include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
OS_LIBS = rpcrt4.lib uuid.lib
OS_LIBS = $(call EXPAND_LIBNAME,rpcrt4 uuid)
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)

2
mozilla/xpcom/tools/windows/Makefile.in
View File

@@ -30,7 +30,7 @@ SIMPLE_PROGRAMS = rebasedlls$(BIN_SUFFIX)
CPPSRCS = rebasedlls.cpp
OS_LIBS += imagehlp.lib
OS_LIBS += $(call EXPAND_LIBNAME,imagehlp)
include $(topsrcdir)/config/rules.mk

4
mozilla/xpcom/typelib/xpidl/Makefile.in
View File

@@ -58,10 +58,12 @@ CFLAGS += $(LIBIDL_CFLAGS)
# Compile directly against the static lib, so we can use xpidl during the build
# without the shared library path being set.
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
ifeq (WINNT,$(OS_ARCH))
DEFINES += -DEXPORT_XPT_API
ifndef GNU_CC
LDFLAGS += -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRTD
endif
endif
# Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes.
LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) $(LIBIDL_LIBS)

4
mozilla/xpfe/bootstrap/Makefile.in
View File

@@ -216,7 +216,7 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
RCINCLUDE = splash.rc
CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
OS_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib winspool.lib
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
endif
ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
@@ -326,8 +326,10 @@ ifeq ($(OS_ARCH),WINNT)
#
# Set it to 256k. See bug 127069.
#
ifndef GNU_CC
LDFLAGS += /HEAP:0x40000
endif
endif
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

7
mozilla/xpfe/components/build/Makefile.in
View File

@@ -113,12 +113,13 @@ endif
ifeq ($(OS_ARCH),WINNT)
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)urlwidgt_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX) \
$(NULL)
OS_LIBS += ole32.lib shell32.lib
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
LOCAL_INCLUDES += \
-I$(srcdir)/../urlwidget \

2
mozilla/xpinstall/cleanup/Makefile.in
View File

@@ -69,8 +69,10 @@ LDFLAGS += $(TK_LIBS)
endif
ifeq ($(OS_ARCH),WINNT)
ifndef GNU_CC
LDFLAGS += /SUBSYSTEM:WINDOWS
endif
endif
libs::
$(INSTALL) $(srcdir)/cmessage.txt $(DIST)/bin/res

2
mozilla/xpinstall/src/Makefile.in
View File

@@ -105,7 +105,7 @@ CPPSRCS += \
nsWinShortcut.cpp \
$(NULL)
OS_LIBS += ole32.lib version.lib
OS_LIBS += $(call EXPAND_LIBNAME,ole32 version uuid)
endif
LOCAL_INCLUDES = -I$(srcdir)/../public

5
mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in
View File

@@ -36,6 +36,11 @@ CPPSRCS = nsinstall.cpp
LIBS = $(EXTRA_DSO_LIBS)
LOCAL_INCLUDES = -I$(srcdir)
ifdef GNU_CC
OS_LIBS += -lgdi32
endif
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk

2
mozilla/xpinstall/wizard/windows/nsztool/Makefile.in
View File

@@ -39,7 +39,9 @@ NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk
ifndef GNU_CC
LDFLAGS += /SUBSYSTEM:WINDOWS /MACHINE:i386
endif
libs:: $(PROGRAM)
$(INSTALL) $(PROGRAM) $(DIST)/install

8
mozilla/xpinstall/wizard/windows/setup/Makefile.in
View File

@@ -60,13 +60,17 @@ CPPSRCS = \
LIBS = $(EXTRA_DSO_LIBS)
LOCAL_INCLUDES = -I$(srcdir)/../uninstall
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../uninstall
NO_DIST_INSTALL = 1
include $(topsrcdir)/config/rules.mk
OS_LIBS += ole32.lib comdlg32.lib shell32.lib version.lib
_OS_LIBS = ole32 comdlg32 shell32 version
ifdef GNU_CC
_OS_LIBS += gdi32 ws2_32 uuid
endif
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
libs:: $(PROGRAM)
$(INSTALL) $(PROGRAM) $(DIST)/install

6
mozilla/xpinstall/wizard/windows/uninstall/Makefile.in
View File

@@ -44,7 +44,13 @@ CSRCS = \
rdi.c \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)
ifdef GNU_CC
OS_LIBS += -lshell32 -lversion -lgdi32
else
OS_LIBS += shell32.lib version.lib
endif
NO_DIST_INSTALL = 1