diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:00:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:00:03 +0000 |
| commit | 3e924977786ec989b254ea36407a5917eea229bb (patch) | |
| tree | 950af9d279c96583842497dc2ef8b1184f36c195 /connectivity | |
| parent | ca78775506bb9fc3d1e8c52e40101f141ef2196a (diff) | |
INTEGRATION: CWS mingwport03 (1.21.142); FILE MERGED
2007/03/19 15:59:23 vg 1.21.142.3: RESYNC: (1.22-1.23); FILE MERGED
2006/11/07 13:08:50 vg 1.21.142.2: RESYNC: (1.21-1.22); FILE MERGED
2006/09/07 10:22:06 vg 1.21.142.1: #i53572# MinGW port
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mozab/makefile.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 575c924ce505..328718e1ad46 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: obo $ $Date: 2007-03-09 08:59:26 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:00:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,10 +66,14 @@ MOZ_REG_LIB := $(MOZ_LIB)$/mozreg.lib .ENDIF .ENDIF -.IF "$(COM)"=="MSC" +.IF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom +.ELSE LIB += $(MOZ_LIB) MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib -.ELSE "$(COM)"=="MSC" +.ENDIF +.ELSE "$(OS)"=="WNT" MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom .ENDIF #End of mozilla specific stuff. @@ -176,7 +180,7 @@ SHL2STDLIBS=\ .IF "$(GUI)"=="WNT" SHL2STDLIBS += \ - shell32.lib + $(SHELL32LIB) .ENDIF # "$(GUI)"=="WNT" SHL2DEPN= |