solenv/gbuild/platform/com_MSC_defs.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
New commits: commit 967c060b7d887b2181bae11adbad91105190d12f Author: David Ostrovsky <[email protected]> Date: Tue Jan 6 23:05:53 2015 +0100 Fix --enable-pch option on msvc 64bit compiler When /Zmxxx option is provided to 64 bit compiler it throws on us weird error messages, no matter what the value is passed. It was mentioned in the knowledge base, that removing it entirely fixes the problem. Change-Id: I95296ad8811d0065498f0ef55ae503d4a07b914b Reviewed-on: https://gerrit.libreoffice.org/13779 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 7590a7b..43c9198 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -153,7 +153,6 @@ gb_CFLAGS := \ -wd4706 \ -wd4800 \ -Zc:wchar_t- \ - -Zm500 \ gb_CXXFLAGS := \ -Gd \ @@ -184,7 +183,6 @@ gb_CXXFLAGS := \ -wd4800 \ -wd4913 \ -Zc:wchar_t- \ - -Zm500 \ ifneq ($(MSVC_USE_DEBUG_RUNTIME),) gb_CXXFLAGS += \ @@ -217,6 +215,14 @@ ifeq ($(CPUNAME),X86_64) gb_CXXFLAGS += \ -wd4267 \ +else + +gb_CXXFLAGS += \ + -Zm500 \ + +gb_CFLAGS += \ + -Zm500 \ + endif # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
