diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-05-31 16:04:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-05-31 16:04:13 +0000 |
| commit | 235849c2dba5159873989e04322a64c7f8d476cb (patch) | |
| tree | 12792bd1c0220e83177dffdf4cc3ff856968a7d8 /stlport | |
| parent | 0a8081ee2592dcb86a4c9bc7dd2f7c2aad42011c (diff) | |
INTEGRATION: CWS macosx07 (1.29.10); FILE MERGED
2005/05/05 23:05:25 ericb 1.29.10.1: i48521 stlport changes in makefile.mk for Mac OSX 10.4
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index e45ad5a1926d..4012ac2f9cf5 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: vg $ $Date: 2005-02-24 14:47:13 $ +# last change: $Author: kz $ $Date: 2005-05-31 17:04:13 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,7 +86,7 @@ $(INCCOM)$/stlport$/hash_map : systemstl/hash_map .EXPORT : CC CXX .IF "$(COMID)"=="gcc3" TARFILE_NAME=STLport-4.5 - .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103" + .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103" || "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX104" PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch .ELSE PATCH_FILE_NAME=STLport-4.5.patch |