mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS mingwport03 (1.17.8); FILE MERGED

Browse Source 
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
This commit is contained in:
Vladimir Glazounov 2007-03-26 12:45:45 +00:00
parent c97c39a3c4
commit b6c04de4c9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
store/util/makefile.mk
View File

@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $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 Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # 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 # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so
.IF "$(COMID)"=="gcc3" .IF "$(COMID)"=="gcc3"
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= -lsupc++
.ELSE
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
SHL1STDLIBS+= -lsupc++ SHL1STDLIBS+= -lsupc++
.ELIF "$(OS)"=="MACOSX" .ELIF "$(OS)"=="MACOSX"
@ -86,6 +89,7 @@ SHL1STDLIBS+= -lsupc++
SHL1STDLIBS+= -lsupc++ -lgcc_s SHL1STDLIBS+= -lsupc++ -lgcc_s
.ENDIF .ENDIF
.ENDIF .ENDIF
.ENDIF
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def