openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1847883 - /openoffice/trunk/main/solenv/gbuild/platform/windows.mk
Date Sat, 01 Dec 2018 08:11:49 GMT
Author: damjan
Date: Sat Dec  1 08:11:49 2018
New Revision: 1847883

URL: http://svn.apache.org/viewvc?rev=1847883&view=rev
Log:
Define BOOST_MEM_FN_ENABLE_CDECL only on Win32,
as it breaks the build on Win64.

Patch by: me


Modified:
    openoffice/trunk/main/solenv/gbuild/platform/windows.mk

Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1847883&r1=1847882&r2=1847883&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Sat Dec  1 08:11:49 2018
@@ -62,7 +62,6 @@ gb_COMPILERDEFS := \
 	-D_CRT_SECURE_NO_DEPRECATE \
 	-D_MT \
 	-D_DLL \
-	-DBOOST_MEM_FN_ENABLE_CDECL \
 	-DCPPU_ENV=$(COMNAME) \
 	-DFULL_DESK \
 	-DM1500 \
@@ -75,6 +74,10 @@ ifeq ($(CPUNAME),X86_64)
 gb_CPUDEFS += -D_AMD64_=1
 endif
 
+ifeq ($(CPUNAME),INTEL)
+gb_COMPILERDEFS += -DBOOST_MEM_FN_ENABLE_CDECL
+endif
+
 gb_RCDEFS := \
      -DWINVER=0x0400 \
 	 -DWIN32 \



Mime
View raw message