[Libreoffice-commits] .: stlport/makefile.mk

[Fridrich Strba]

 stlport/makefile.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4003f98e5ffbd18bd43f30cb151142fcaa86ea04
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Feb 8 10:21:12 2011 +0100

    Don't use the dummy functional on windows
    
    since MSVC headers contain all the SGI extensions we use

diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index c9076df..2803be6 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -36,19 +36,19 @@ TARGET=so_stlport
 
 .IF "$(USE_SYSTEM_STL)"=="YES"
 
-.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+.IF ("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 # System STL when building with SunStudio is just a version of STLport
 # which comes with the compiler
 all:
     @echo "Nothing to do"
-.ELSE #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+.ELSE #("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 #
 # If you choose to build without stlport, some headers will be used to bring the
 # sgi extensions into the std namespace:
 $(INCCOM)$/stlport$/functional: systemstl$/$$(@:f)
     $(MKDIRHIER) $(@:d)
     $(COPY) $< $@
-.ENDIF #"$(OS)"=="SOLARIS" && "$(COM)"!="GCC"
+.ENDIF #("$(OS)"=="SOLARIS" && "$(COM)"!="GCC") | ("$(OS)"=="WNT" && "$(COM)"!="GCC")
 
 .ELSE # "$(USE_SYSTEM_STL)"