openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1490324 - in /openoffice/trunk/main: RepositoryFixes.mk solenv/gbuild/platform/windows.mk solenv/inc/wntmsci11.mk soltools/mkdepend/makefile.mk
Date Thu, 06 Jun 2013 15:25:10 GMT
Author: hdu
Date: Thu Jun  6 15:25:09 2013
New Revision: 1490324

URL: http://svn.apache.org/r1490324
Log:
#i122378# fix the dbgutil-enabled build on Windows

crt-debug libraries use different structure layouts than their
regular counterparts so mixing causes binary incompatibilities
which must be avoided. Always using the regular libs achieves this.

Modified:
    openoffice/trunk/main/RepositoryFixes.mk
    openoffice/trunk/main/solenv/gbuild/platform/windows.mk
    openoffice/trunk/main/solenv/inc/wntmsci11.mk
    openoffice/trunk/main/soltools/mkdepend/makefile.mk

Modified: openoffice/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1490324&r1=1490323&r2=1490324&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Thu Jun  6 15:25:09 2013
@@ -76,12 +76,8 @@ gb_Library_FILENAMES := $(patsubst rdf:i
 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
@@ -136,12 +132,8 @@ gb_Library_FILENAMES := $(patsubst z:iz%
 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

Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1490324&r1=1490323&r2=1490324&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Thu Jun  6 15:25:09 2013
@@ -484,7 +484,7 @@ ifeq ($(USE_SYSTEM_STL),YES)
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_STLEXT := msvcprt.lib
 else
-gb_Library_STLEXT := msvcprtd.lib
+gb_Library_STLEXT := msvcprt.lib
 endif
 else
 ifeq ($(gb_PRODUCT),$(true))

Modified: openoffice/trunk/main/solenv/inc/wntmsci11.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmsci11.mk?rev=1490324&r1=1490323&r2=1490324&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/trunk/main/solenv/inc/wntmsci11.mk Thu Jun  6 15:25:09 2013
@@ -285,13 +285,13 @@ LINKFLAGSOPT=
 UWINAPILIB*=uwinapi.lib
 .IF "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=msvcrtd.lib
+LIBCMT=msvcrt.lib
 .ELSE  # "$(USE_STLP_DEBUG)" != ""
 LIBCMT=msvcrt.lib
 .ENDIF # "$(USE_STLP_DEBUG)" != ""
 .ELSE # "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT=libcmtd.lib
+LIBCMT=libcmt.lib
 CDEFS+=-D_DEBUG
 .ELSE  # "$(USE_STLP_DEBUG)" != ""
 LIBCMT=libcmt.lib
@@ -312,13 +312,13 @@ STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kern
 .IF "$(USE_SYSTEM_STL)" == "YES"
 .IF "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT+= msvcprtd.lib
+LIBCMT+= msvcprt.lib
 .ELSE
 LIBCMT+= msvcprt.lib
 .ENDIF
 .ELSE # "$(DYNAMIC_CRT)"==""
 .IF "$(USE_STLP_DEBUG)" != ""
-LIBCMT+= libcpmtd.lib
+LIBCMT+= libcpmt.lib
 .ELSE
 LIBCMT+= libcpmt.lib
 .ENDIF "$(USE_STLP_DEBUG)" == ""

Modified: openoffice/trunk/main/soltools/mkdepend/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/soltools/mkdepend/makefile.mk?rev=1490324&r1=1490323&r2=1490324&view=diff
==============================================================================
--- openoffice/trunk/main/soltools/mkdepend/makefile.mk (original)
+++ openoffice/trunk/main/soltools/mkdepend/makefile.mk Thu Jun  6 15:25:09 2013
@@ -59,12 +59,7 @@ APP1OBJS=$(OBJFILES)
 APP1RPATH=NONE
 
 .IF "$(COM)"=="MSC"
-.IF "$(dbgutil)"==""
 APP1STDLIBS+=msvcprt.lib
-.ELSE
-APP1STDLIBS+=msvcprtd.lib
-CDEFS+=-D_DEBUG
-.ENDIF                        # "$(DBG_UTIL)"==""
 .ENDIF                        # "$(COM)"=="MSC"
 
 .IF "$(OS)"=="SOLARIS"



Mime
View raw message