Don't use the dummy functional on windows
since MSVC headers contain all the SGI extensions we use
This commit is contained in:
parent
ef2942e54d
commit
ad6ae59025
1 changed files with 3 additions and 3 deletions
|
@ -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)"
|
||||
|
||||
|
|
Loading…
Reference in a new issue