summaryrefslogtreecommitdiff
path: root/stlport
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-19 07:29:28 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-19 07:29:28 +0000
commit3e408852075dff84a6fd998a9acba3c422603da4 (patch)
treea916913398b7b8f65f5a414040e1f592294425b6 /stlport
parent641c2d4883d3bc64ef80e4ac4e9631608befe934 (diff)
CWS-TOOLING: integrate CWS ause099
2009-01-29 12:30:57 +0100 hjs r267116 : #i98365# fix unsetting g+s bit 2009-01-23 14:21:19 +0100 hjs r266819 : #i40246# - cleanup 2009-01-23 14:14:07 +0100 hjs r266818 : #i40246# - fix quoting of final echo line 2009-01-23 12:42:33 +0100 hjs r266807 : #i98365# leave higher bits alone 2009-01-23 11:23:42 +0100 rt r266799 : Header 2009-01-22 19:14:25 +0100 hjs r266753 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:22:18 +0100 hjs r266737 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:54 +0100 hjs r266736 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:24 +0100 hjs r266735 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:08:33 +0100 hjs r266734 : #i40246# renamed variable 2009-01-22 16:05:26 +0100 hjs r266733 : #i40246# renamed variable 2009-01-20 17:46:54 +0100 hjs r266610 : #i98290# cleanup 2009-01-19 19:32:19 +0100 hjs r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39) 2008-12-08 21:00:09 +0100 hjs r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37) 2008-11-27 18:25:18 +0100 hjs r264513 : #i40246# - support multiple patches per archive 2008-11-17 19:00:12 +0100 hjs r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35)
Diffstat (limited to 'stlport')
-rw-r--r--stlport/makefile.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 0c434812dec7..43028ece04b5 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -66,18 +66,18 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
.EXPORT : CC CXX
.IF "$(COMID)"=="gcc3"
TARFILE_NAME=STLport-4.5
- PATCH_FILE_NAME=STLport-4.5.patch
+ PATCH_FILES=STLport-4.5.patch
.ELIF "$(GUI)"=="WNT"
.IF "$(CCNUMVER)"<="001300000000"
TARFILE_NAME=STLport-4.0
- PATCH_FILE_NAME=STLport-4.0.patch
+ PATCH_FILES=STLport-4.0.patch
.ELSE
TARFILE_NAME=STLport-4.5-0119
- PATCH_FILE_NAME=STLport-4.5-0119.patch
+ PATCH_FILES=STLport-4.5-0119.patch
.ENDIF
.ELSE
TARFILE_NAME=STLport-4.0
- PATCH_FILE_NAME=STLport-4.0.patch
+ PATCH_FILES=STLport-4.0.patch
# To disable warnings from within STLport headers on unxsoli4 and
# unxsols4, STLport-4.0.patch had to be extended mechanically by
#
@@ -167,7 +167,7 @@ OUT2INC= \
.IF "$(OS)"=="IRIX"
TARFILE_NAME=STLport-4.5
-PATCH_FILE_NAME=STLport-4.5.patch
+PATCH_FILES=STLport-4.5.patch
BUILD_ACTION=gmake
BUILD_FLAGS=-f gcc-3.0.mak
BUILD_FLAGS+= -j$(MAXPROCESS)