diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-16 09:57:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-16 09:57:14 +0000 |
| commit | 035b9720e7acd9a9777b0d8207afb416051782b0 (patch) | |
| tree | a26d4709814b31046f1f06f45fe23c74347fbf41 /stlport/makefile.mk | |
| parent | c59a93863d0a7704124f51a33ed17d9f7c2043c1 (diff) | |
#i6886#,#101685#: merge OOO_STABLE_1_PORTS (1.9.2.3-1.9.2.3.2.1) -> HEAD
Diffstat (limited to 'stlport/makefile.mk')
| -rw-r--r-- | stlport/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 834117c9f30e..2d74dcbb0aa1 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: hjs $ $Date: 2002-08-08 14:54:14 $ +# last change: $Author: hr $ $Date: 2002-08-16 10:57:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -109,7 +109,12 @@ BUILD_FLAGS=-f vc7.mak .IF "$(COMID)"=="gcc3" BUILD_FLAGS=-f gcc-3.0.mak .ELSE # "$(COMID)"=="gcc3" -BUILD_FLAGS=-f gcc.mak +# MacOS X/Darwin need a special makefile +.IF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-apple-macosx.mak +.ELSE # "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc.mak +.ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(COMID)"=="gcc3" BUILD_ACTION=make .ENDIF |