diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 16:19:51 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 20:18:11 +0100 |
| commit | fca25e4c4cc0b95227d967b7418ec77888980ba3 (patch) | |
| tree | 1c4cec35ce98c8e2627d1ca8b0b7e342457e8faf /soltools | |
| parent | 354f09c75e883fbc3fc9302310941d0211762796 (diff) | |
Trying to remove the stlport mention from the code
Diffstat (limited to 'soltools')
| -rwxr-xr-x | soltools/util/makefile.pmk | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index bf51cf851b4c..003cf1c203c2 100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -31,14 +31,6 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility -# avoid STLPort -NO_DEFAULT_STL=TRUE -SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) -.IF "$(STLPORT4)" != "" -SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) -SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) -.ENDIF - .IF "$(OS)"=="SOLARIS" # hack due to #i53089# .IF "$(COMPATH:+"x")" != "$(COMPATH:+"x":s/binx//)" @@ -46,7 +38,5 @@ HELP_COMPATH:=$(subst,/binx, $(COMPATH:+"x")) .ELSE # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" HELP_COMPATH:=$(COMPATH) .ENDIF # "$(COMPATH:+"x")" == "$(COMPATH:s/binx//)/binx" -#SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/stlport4 -#SOLARLIB+=-L$(HELP_COMPATH)/prod/lib/stlport4 SOLARINC+=-I$(HELP_COMPATH)/prod/include/CC/Cstd .ENDIF |