[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/settings

[Damjan Jovanovic]

 odk/settings/settings.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 7a13aeb63e3246f31c653d4c7dc9e5f7d5404339
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Tue Mar 6 06:14:02 2018 +0000

    Win64 has the "mscx" CPPU_ENV.
    
    Patch by: me

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 0976ec27b988..f22d2d1eedb2 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -57,6 +57,8 @@ JAVABIN=bin
 ifeq "$(PLATFORM)" "windows"
 # Settings for Windows using Microsoft compiler/linker
 
+PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 's/^i.86$$/i386/')
+
 OS=WIN
 PS=\\
 ICL=$$
@@ -119,8 +121,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
 
+ifeq "$(PROCTYPE)" "i386"
 CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
 CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
+endif
+ifeq "$(PROCTYPE)" "x86_64"
+CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
+CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
+endif
 CC_OUTPUT_SWITCH=-Fo
 
 LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv