odk/settings/settings.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
New commits: commit f09fd93be5d3c73d94bf67818f067a70b1594c35 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Sep 12 16:08:38 2016 +0200 tdf#91966: In SDK, set CPPU_ENV=mscx for 64-bit Windows Change-Id: Ib93b2db40f43f98d8369cb91ca35692cc92f023b (cherry picked from commit 3aaa820446f1ad3d3b0ddc557238b6fb3496dd54) Reviewed-on: https://gerrit.libreoffice.org/28873 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index b5bee39..5dd54f6 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -113,8 +113,14 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu # define for used compiler necessary for UNO # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x -CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci -CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci +ifeq "$(PROCTYPE)" "x86_64" +CPPU_ENV=mscx +else +CPPU_ENV=msci +endif + +CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=$(CPPU_ENV) +CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=$(CPPU_ENV) CC_OUTPUT_SWITCH=-Fo LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits