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

fix bug 118044, windows static build bustage. sr=waterson r=darin, timeless

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@111903 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cathleen%netscape.com
2002-01-11 00:33:37 +00:00
parent 3062b0e3b5
commit 5971d227ad
7 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/extensions/inspector/base/src/inBitmapURI.cpp
View File

@@ -29,7 +29,7 @@
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#define DEFAULT_IMAGE_SIZE 16
void extractAttributeValue(const char * searchString, const char * attributeName, char ** result);
static void extractAttributeValue(const char * searchString, const char * attributeName, char ** result);
////////////////////////////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ inBitmapURI::GetSpec(char* *aSpec)
// containing just the attribute value. i.e you could pass in this string with
// an attribute name of size, this will return 32
// Assumption: attribute pairs in the string are separated by '&'.
void extractAttributeValue(const char * searchString, const char * attributeName, char ** result)
static void extractAttributeValue(const char * searchString, const char * attributeName, char ** result)
{
//NS_ENSURE_ARG_POINTER(extractAttributeValue);

2
mozilla/extensions/inspector/build/src/makefile.win
View File

@@ -47,7 +47,7 @@ CPP_OBJS= \
.\$(OBJDIR)\nsInspectorModule.obj \
$(NULL)
LLIBS= \
SUB_LIBRARIES = \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\rdfutil_s.lib \
$(DIST)\lib\inspector_s.lib \

1
mozilla/mailnews/mapi/mapiDll/makefile.win
View File

@@ -40,6 +40,7 @@ MODULE = mozMapi32
EXPORT_LIBRARY = $(MODULE)
LIBRARY_NAME = $(MODULE)
DEFFILE = Mapi32.def
META_COMPONENT = mail
REQUIRES = MapiProxy \
msgMapi \

2
mozilla/mailnews/mapi/mapihook/build/makefile.win
View File

@@ -37,8 +37,8 @@
DEPTH=..\..\..\..
MODULE = MapiProxy
EXPORT_LIBRARY = $(MODULE)
LIBRARY_NAME = $(MODULE)
META_COMPONENT = mail
DEFFILE = MapiProxy.def
include <$(DEPTH)\config\config.mak>

6
mozilla/mailnews/mapi/mapihook/src/makefile.win
View File

@@ -38,9 +38,9 @@
DEPTH=..\..\..\..
MODULE = msgMapi
MAKE_OBJ_TYPE = DLL
LIBRARY_NAME=$(MODULE)
MODULE_NAME = $(MODULE)
LIBRARY_NAME =$(MODULE)
MODULE_NAME =msgMapiModule
META_COMPONENT =mail
REQUIRES = xpcom \
string \

11
mozilla/modules/staticmod/meta.mak
View File

@@ -51,15 +51,20 @@ LLIBS = $(DIST)\lib\gkgfx.lib \
$(DIST)\lib\unicharutil_s.lib \
$(LIBNSPR)
WIN_LIBS = rpcrt4.lib \
ole32.lib
!ifdef MOZ_GECKO_DLL
LLIBS = $(LLIBS) \
$(DIST)\lib\png.lib \
$(DIST)\lib\mng.lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\expat.lib \
$(DIST)\lib\nsldap32v40.lib
$(DIST)\lib\nsldap32v40.lib
WIN_LIBS = comctl32.lib \
WIN_LIBS = $(WIN_LIBS)
comctl32.lib \
comdlg32.lib \
uuid.lib \
ole32.lib \
@@ -132,7 +137,7 @@ export::
!endif
install:: $(DLL)
libs:: $(DLL)
$(MAKE_INSTALL) $(DLL) $(DIST)/bin/components
clobber::

1
mozilla/xpfe/bootstrap/makefile.win
View File

@@ -125,6 +125,7 @@ WIN_LIBS= \
ole32.lib \
oleaut32.lib \
version.lib \
winspool.lib \
$(NULL)
include <$(DEPTH)\config\rules.mak>