diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:45:45 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:45:45 +0000 |
commit | b6c04de4c9b6b68b28a63eddcfa4d3b50f37f7e6 (patch) | |
tree | eb3c36b3344aa3420e790744196e340c6d287a44 /store/util | |
parent | INTEGRATION: CWS mingwport03 (1.9.56); FILE MERGED (diff) | |
download | core-b6c04de4c9b6b68b28a63eddcfa4d3b50f37f7e6.tar.gz core-b6c04de4c9b6b68b28a63eddcfa4d3b50f37f7e6.zip |
INTEGRATION: CWS mingwport03 (1.17.8); FILE MERGED
2007/03/19 15:44:31 vg 1.17.8.2: RESYNC: (1.17-1.18); FILE MERGED
2006/09/07 09:27:51 vg 1.17.8.1: #i53572# MinGW port
Diffstat (limited to 'store/util')
-rw-r--r-- | store/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/store/util/makefile.mk b/store/util/makefile.mk index 3d840e73f527..63aa23a8fb54 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: rt $ $Date: 2007-01-31 08:42:48 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:45:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,9 @@ SHL1STDLIBS+=$(LIBSTLPORT) # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so .IF "$(COMID)"=="gcc3" +.IF "$(GUI)"=="WNT" +SHL1STDLIBS+= -lsupc++ +.ELSE .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" SHL1STDLIBS+= -lsupc++ .ELIF "$(OS)"=="MACOSX" @@ -86,6 +89,7 @@ SHL1STDLIBS+= -lsupc++ SHL1STDLIBS+= -lsupc++ -lgcc_s .ENDIF .ENDIF +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def |