diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:33:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:33:43 +0000 |
| commit | d8c4e62585bdbab03edbf5e85fe0dd81a280ac53 (patch) | |
| tree | da0cb7dc99a3fe9e641ce6292ee4ae3cbb787b60 /stlport | |
| parent | 6f6a3a5839a90dadb3bd9cfb3a06f56420518727 (diff) | |
INTEGRATION: CWS ooo20040704 (1.26.16); FILE MERGED
2004/07/09 15:03:34 cmc 1.26.16.2: #i30891# system stl stuff
2004/06/28 15:19:26 cmc 1.26.16.1: #i30801# allow using system stl if possible
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 116defa7b5f7..f495653da829 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.26 $ +# $Revision: 1.27 $ # -# last change: $Author: hr $ $Date: 2004-02-02 20:28:14 $ +# last change: $Author: rt $ $Date: 2004-09-08 16:33:43 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,6 +69,14 @@ TARGET=so_stlport .INCLUDE : settings.mk +.IF "$(USE_SYSTEM_STL)"=="YES" +$(INCCOM)$/stlport$/hash_map : systemstl/hash_map + @echo "You choose to build without stlport, so some headers will be used to bring the sgi extensions into the std namespace" + +-$(MKDIR) $(INCCOM)$/stlport + +$(COPY) systemstl/* $(INCCOM)$/stlport +.ENDIF + + # --- Files -------------------------------------------------------- .EXPORT : CC CXX .IF "$(COMID)"=="gcc3" |