diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-12 16:08:38 +0200 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-09-17 09:12:31 +0000 |
| commit | 9e2f22dfab467b41d552fdaeabf9445c5ad34a47 (patch) | |
| tree | 38077484d3f16d38f5e6a4fef2eb32239cfe8e1b | |
| parent | 9cc175e5f36d5900f1b88b9a6c6e4790a6f4da68 (diff) | |
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/28872
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: jan iversen <jani@documentfoundation.org>
| -rw-r--r-- | odk/settings/settings.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index b5bee39e0a56..5dd54f6f649c 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 |