[Libreoffice-commits] .: Branch 'integration/dev300_m101' - RepositoryFixes.mk

[Tor Lillqvist]

 RepositoryFixes.mk |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 787ff726b3fc657c044a0debc1bae822e93873b2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Mar 17 14:23:37 2011 +0200

    No stlport used any more on Windows

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b685703..7e1bae4 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -71,11 +71,6 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
 gb_Library_NOILIBFILENAMES:=\
     icuuc \
     sot \
@@ -113,11 +108,7 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-ifeq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
-else
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
-endif
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
 gb_Library_NOILIBFILENAMES:=\
     advapi32 \
     gdi32 \