diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-12 16:08:38 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-09-20 23:05:40 +0200 |
| commit | 0b4a9f6cd19e0a50b440aeac606ec6e08b57f199 (patch) | |
| tree | dff43af7011493952e7cab392a229d159f4f29a7 /odk | |
| parent | cf914d77a0837feec567d0c0b67ac08bd9f2b610 (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/28873
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit f09fd93be5d3c73d94bf67818f067a70b1594c35)
Diffstat (limited to 'odk')
| -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 |