[Libreoffice-commits] .: configure.in solenv/inc

[Fridrich Strba]

 configure.in         |    2 +-
 solenv/inc/wntmsc.mk |   32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

New commits:
commit d46eac2875814c183c5c1bcb879b01e76de9969f
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Feb 2 09:02:39 2011 -0700

    Initial support of system stl on Windows

diff --git a/configure.in b/configure.in
index 49ea9bc..a3c5fd2 100755
--- a/configure.in
+++ b/configure.in
@@ -3040,7 +3040,7 @@ dnl ===================================================================
 dnl system stl sanity tests
 dnl ===================================================================
 HAVE_GCC_VISIBILITY_BROKEN=
-if test "$USE_SYSTEM_STL" = "YES"; then
+if test "$_os" != "WINNT" -a "$USE_SYSTEM_STL" = "YES"; then
    AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
    AC_LANG_PUSH([C++])
 
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 64038fe..db65506 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -310,17 +310,37 @@ 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)" != ""
+LIBCPMT=msvcprt.lib
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ELSE # "$(DYNAMIC_CRT)"!=""
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBCPMT=libcpmtd.lib
+CDEFS+=-D_DEBUG
+.ELSE  # "$(USE_STLP_DEBUG)" != ""
+LIBCPMT=libcpmt.lib
+.ENDIF # "$(USE_STLP_DEBUG)" != ""
+.ENDIF # "$(DYNAMIC_CRT)"!=""
+.ELSE # "$(USE_SYSTEM_STL)"=="YES"
+LIBCPMT=
+.ENDIF # "$(USE_SYSTEM_STL)"=="YES"
+
 STDOBJVCL=$(L)/salmain.obj
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
-STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
-STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
 
+.IF "$(USE_SYSTEM_STL)"!="YES"
 .IF "$(USE_STLP_DEBUG)" != ""
 LIBSTLPORT=stlport_vc71_stldebug.lib
 LIBSTLPORTST=stlport_vc71_stldebug_static.lib
@@ -328,6 +348,10 @@ LIBSTLPORTST=stlport_vc71_stldebug_static.lib
 LIBSTLPORT=stlport_vc71.lib
 LIBSTLPORTST=stlport_vc71_static.lib
 .ENDIF
+.ELSE # "$(USE_SYSTEM_STL)"!="YES"
+LIBSTLPORT=
+LIBSTLPORTST=
+.ENDIF # "$(USE_SYSTEM_STL)"!="YES"
 
 LIBMGR=lib $(NOLOGO)
 IMPLIB=lib