diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-08 10:21:12 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-08 10:21:12 +0100 |
| commit | ad6ae59025c7bbbcabedffcb81902c3f9a683192 (patch) | |
| tree | aab99c190442380f1c310005635756dd059cb147 /stlport | |
| parent | ef2942e54df89b73626558b76229b2ccadd54936 (diff) | |
Don't use the dummy functional on windows
since MSVC headers contain all the SGI extensions we use
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 c9076df16ed4..2803be6076ab 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)" |