Trying to remove the stlport mention from the code

5 files changed, 15 insertions, 37 deletions

diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 621ca2e4bc42..de0b57934f7f 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -37,15 +37,11 @@ END {
         print "UDK_3_0_0 {"
         print "global:"
         print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-        if (ENVIRON["USE_SYSTEM_STL"] != "YES")
-            print "_ZN4_STL7num_put*; # for STLport"
         print "};"
     }
 }
 state == 2 {
     print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
-    if (ENVIRON["USE_SYSTEM_STL"] != "YES")
-        print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
 # #i66636# - ???
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index 36be3c27ba05..aa3929950063 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -1061,7 +1061,7 @@ PREDEFINED             = LINUX \
                          GCC \
                          C341 \
                          X86_64 \
-                         _STLP_DEBUG \
+                         _DEBUG_RUNTIME \
                          VER=C341 \
                          NPTL \
                          GLIBC=2 \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d8a92a689db8..203a44fc79f2 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -479,7 +479,7 @@ DBG_LEVEL*=0
 optimize!=true
 dbgutil!=true
 DBG_LEVEL*=1
-USE_STLP_DEBUG*=TRUE
+USE_DEBUG_RUNTIME*=TRUE
 .ENDIF
 
 .IF "$(debug)"!=""
@@ -856,8 +856,8 @@ LIB:=$(LB);$(BIN);$(ILIB)
 CPUNAME=CPUNAME_HAS_TO_BE_SET_IN_ENVIRONMENT
 .ENDIF
 
-.IF "$(USE_STLP_DEBUG)" != ""
-SCPCDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+SCPCDEFS+=-D_DEBUG_RUNTIME
 .ENDIF
 
 .IF "$(UDK_MAJOR)"!=""
@@ -883,8 +883,8 @@ UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I
 
 CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
 
-.IF "$(USE_STLP_DEBUG)" != "" && "$(GUI)"!="OS2"
-CDEFS+=-D_STLP_DEBUG
+.IF "$(USE_DEBUG_RUNTIME)" != "" && "$(GUI)"!="OS2"
+CDEFS+=-D_DEBUG_RUNTIME
 .ENDIF
 
 .IF "$(CDEFS_PRESET)" != ""
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 17d9422939f5..134395567966 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -39,9 +39,6 @@ LINKOUTPUT_FILTER=
 # -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
 #  compiling STLport sources too, either internally or externally.
 CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
-.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES"
-CDEFS+=-DX_LOCALE
-.ENDIF
 .IF "$(GUIBASE)"=="aqua"
 # MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
 # build can assume functions/libraries of that version to be available
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index cbe7b3ee382c..7a10abe25e02 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -296,38 +296,23 @@ LINKFLAGSOPT=
 
 UWINAPILIB*=uwinapi.lib
 .IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
 LIBCMT=msvcrtd.lib
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
-CDEFS+=-D_DEBUG
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
-.ENDIF # "$(DYNAMIC_CRT)"!=""
-
-.IF "$(USE_SYSTEM_STL)"=="YES"
-.IF "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
 LIBCPMT=msvcprtd.lib
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
+.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=msvcrt.lib
 LIBCPMT=msvcprt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
 .ELSE # "$(DYNAMIC_CRT)"!=""
-.IF "$(USE_STLP_DEBUG)" != ""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmtd.lib
 LIBCPMT=libcpmtd.lib
 CDEFS+=-D_DEBUG
-.ELSE  # "$(USE_STLP_DEBUG)" != ""
+.ELSE  # "$(USE_DEBUG_RUNTIME)" != ""
+LIBCMT=libcmt.lib
 LIBCPMT=libcpmt.lib
-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(USE_DEBUG_RUNTIME)" != ""
 .ENDIF # "$(DYNAMIC_CRT)"!=""
-.ELSE # "$(USE_SYSTEM_STL)"=="YES"
-LIBCPMT=
-.ENDIF # "$(USE_SYSTEM_STL)"=="YES"
 
 STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=