You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2018/03/06 06:14:03 UTC
svn commit: r1825956 - /openoffice/trunk/main/odk/settings/settings.mk
Author: damjan
Date: Tue Mar 6 06:14:02 2018
New Revision: 1825956
URL: http://svn.apache.org/viewvc?rev=1825956&view=rev
Log:
Win64 has the "mscx" CPPU_ENV.
Patch by: me
Modified:
openoffice/trunk/main/odk/settings/settings.mk
Modified: openoffice/trunk/main/odk/settings/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1825956&r1=1825955&r2=1825956&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/settings.mk (original)
+++ openoffice/trunk/main/odk/settings/settings.mk Tue Mar 6 06:14:02 2018
@@ -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_HOM
# 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