You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/27 17:58:30 UTC
svn commit: r1486650 - in /openoffice/trunk/main: RepositoryFixes.mk
solenv/gbuild/gbuild.mk solenv/gbuild/platform/windows.mk
solenv/inc/wntmsci11.mk
Author: hdu
Date: Mon May 27 15:58:29 2013
New Revision: 1486650
URL: http://svn.apache.org/r1486650
Log:
#i122378# allow linking against MSVC TR1's STL libraries instead of stlport
the standard C++ library on MSVC is available in LIBCPMT.LIB and MSVCPRT.LIB
(the static and dynamic C++ runtime libraries for multithreaded environments).
Modified:
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/solenv/gbuild/gbuild.mk
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/inc/wntmsci11.mk
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1486650&r1=1486649&r2=1486650&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Mon May 27 15:58:29 2013
@@ -74,11 +74,21 @@ gb_Library_FILENAMES := $(patsubst xml2:
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES))
+endif
+else
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
endif
+endif
+
gb_Library_NOILIBFILENAMES:=\
icule \
icuuc \
@@ -124,11 +134,21 @@ gb_Library_FILENAMES := $(patsubst xslt:
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprtd%,$(gb_Library_FILENAMES))
+endif
+else
ifeq ($(gb_PRODUCT),$(true))
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
else
gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
endif
+endif
+
gb_Library_NOILIBFILENAMES:=\
advapi32 \
gdi32 \
Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1486650&r1=1486649&r2=1486650&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Mon May 27 15:58:29 2013
@@ -157,13 +157,17 @@ gb_GLOBALDEFS := \
-DENABLE_LAYOUT=0 \
-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-DSOLAR_JAVA \
- -DSTLPORT_VERSION=$(STLPORT_VER) \
-DSUPD=$(UPD) \
-DVCL \
$(gb_OSDEFS) \
$(gb_COMPILERDEFS) \
$(gb_CPUDEFS) \
+ifneq ($(USE_SYSTEM_STL),YES)
+gb_GLOBALDEFS += \
+ -DSTLPORT_VERSION=$(STLPORT_VER)
+endif
+
ifeq ($(gb_PRODUCT),$(true))
gb_GLOBALDEFS += \
-DPRODUCT \
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1486650&r1=1486649&r2=1486650&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Mon May 27 15:58:29 2013
@@ -479,11 +479,21 @@ gb_Library_FILENAMES :=\
gb_Library_DLLEXT := .dll
gb_Library_MAJORVER := 3
gb_Library_RTEXT := MSC$(gb_Library_DLLEXT)
+
+ifeq ($(USE_SYSTEM_STL),YES)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := msvcprt.lib
+else
+gb_Library_STLEXT := msvcprtd.lib
+endif
+else
ifeq ($(gb_PRODUCT),$(true))
gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT)
else
gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT)
endif
+endif
+
gb_Library_OOOEXT := $(gb_Library_DLLEXT)
gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
Modified: openoffice/trunk/main/solenv/inc/wntmsci11.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmsci11.mk?rev=1486650&r1=1486649&r2=1486650&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/trunk/main/solenv/inc/wntmsci11.mk Mon May 27 15:58:29 2013
@@ -309,6 +309,21 @@ STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kern
STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib
+.IF "$(USE_SYSTEM_STL)" == "YES"
+.IF "$(DYNAMIC_CRT)"!=""
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBCMT+= msvcprtd.lib
+.ELSE
+LIBCMT+= msvcprt.lib
+.ENDIF
+.ELSE # "$(DYNAMIC_CRT)"==""
+.IF "$(USE_STLP_DEBUG)" != ""
+LIBCMT+= libcpmtd.lib
+.ELSE
+LIBCMT+= libcpmt.lib
+.ENDIF "$(USE_STLP_DEBUG)" == ""
+.ENDIF # "$(DYNAMIC_CRT)"!=""
+.ELSE # !USE_SYSTEM_STL
.IF "$(USE_STLP_DEBUG)" != ""
LIBSTLPORT=stlport_vc71_stldebug.lib
LIBSTLPORTST=stlport_vc71_stldebug_static.lib
@@ -316,6 +331,7 @@ LIBSTLPORTST=stlport_vc71_stldebug_stati
LIBSTLPORT=stlport_vc71.lib
LIBSTLPORTST=stlport_vc71_static.lib
.ENDIF
+.ENDIF
.IF "$(PROF_EDITION)" == ""
ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl