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 16:59:52 UTC
svn commit: r1826001 - in /openoffice/trunk/main: odk/settings/settings.mk
solenv/win64/win64.patch
Author: damjan
Date: Tue Mar 6 16:59:52 2018
New Revision: 1826001
URL: http://svn.apache.org/viewvc?rev=1826001&view=rev
Log:
Revert 1825956 and put it into the win64.patch file instead,
as it may break building 32 bit AOO on 64 bit Windows.
Patch by: me
Modified:
openoffice/trunk/main/odk/settings/settings.mk
openoffice/trunk/main/solenv/win64/win64.patch
Modified: openoffice/trunk/main/odk/settings/settings.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1826001&r1=1826000&r2=1826001&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/settings.mk (original)
+++ openoffice/trunk/main/odk/settings/settings.mk Tue Mar 6 16:59:52 2018
@@ -57,8 +57,6 @@ 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=$$
@@ -121,14 +119,8 @@ 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
Modified: openoffice/trunk/main/solenv/win64/win64.patch
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/win64/win64.patch?rev=1826001&r1=1826000&r2=1826001&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/win64/win64.patch (original)
+++ openoffice/trunk/main/solenv/win64/win64.patch Tue Mar 6 16:59:52 2018
@@ -252,3 +252,31 @@ Index: solenv/inc/wnt.mk
# --- changes for W32-tcsh - should move into settings.mk ---
JAVAC=javac
JAVA=java
+Index: main/odk/settings/settings.mk
+===================================================================
+--- main/odk/settings/settings.mk (revision 1825955)
++++ main/odk/settings/settings.mk (revision 1825956)
+@@ -57,6 +57,8 @@
+ 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 @@
+ # 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