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/07 02:27:01 UTC
svn commit: r1826062 - in /openoffice/trunk/main/icu: createmakWin64.cfg makefile.mk

Author: damjan
Date: Wed Mar  7 02:27:01 2018
New Revision: 1826062

URL: http://svn.apache.org/viewvc?rev=1826062&view=rev
Log:
Get main/icu building on Win64.

Patch by: me


Added:
    openoffice/trunk/main/icu/createmakWin64.cfg
      - copied, changed from r1826001, openoffice/trunk/main/icu/createmak.cfg
Modified:
    openoffice/trunk/main/icu/makefile.mk

Copied: openoffice/trunk/main/icu/createmakWin64.cfg (from r1826001, openoffice/trunk/main/icu/createmak.cfg)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/icu/createmakWin64.cfg?p2=openoffice/trunk/main/icu/createmakWin64.cfg&p1=openoffice/trunk/main/icu/createmak.cfg&r1=1826001&r2=1826062&rev=1826062&view=diff
==============================================================================
--- openoffice/trunk/main/icu/createmak.cfg (original)
+++ openoffice/trunk/main/icu/createmakWin64.cfg Wed Mar  7 02:27:01 2018
@@ -133,7 +133,7 @@ CPP_PROJ=-MD -O2 $(CTOOLSFLAGS)
 
 [CommonLinkFlags]
 PDBOUT=/pdb:"<PDBFILE>" /out:"<OUTFILE>"
-COMMONLINKFLAGS=/incremental:no /machine:I386 /nologo $(PDBOUT) /SAFESEH /NXCOMPAT /DYNAMICBASE
+COMMONLINKFLAGS=/incremental:no /machine:X64 /nologo $(PDBOUT) /NXCOMPAT /DYNAMICBASE
 COMMONLINKFLAGS_CONSOLE=$(COMMONLINKFLAGS) /subsystem:console
 COMMONLINKFLAGS_DLL=$(COMMONLINKFLAGS) /dll
 
@@ -156,7 +156,7 @@ LINK32_FLAGS=icuuc.lib icuin.lib $(COMMO
 LINK32_FLAGS=..\..\lib\icuuc.lib ..\..\lib\icule.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\iculx.lib"
 
 [LinkFlags_stubdata]
-LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:I386 $(PDBOUT) /implib:"..\..\lib\icudata.lib"
+LINK32_FLAGS=kernel32.lib user32.lib /nologo /dll /incremental:yes /machine:X64 $(PDBOUT) /implib:"..\..\lib\icudata.lib"
 
 [LinkFlags_test_cintltst]
 LINK32_FLAGS=icuuc.lib icuin.lib icutest.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib\\"

Modified: openoffice/trunk/main/icu/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/icu/makefile.mk?rev=1826062&r1=1826061&r2=1826062&view=diff
==============================================================================
--- openoffice/trunk/main/icu/makefile.mk (original)
+++ openoffice/trunk/main/icu/makefile.mk Wed Mar  7 02:27:01 2018
@@ -197,7 +197,11 @@ ICU_BUILD_VERSION=Release
 ICU_BUILD_LIBPOST=
 .ENDIF
 
+.IF "$(CPUNAME)"=="INTEL"
 CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmak.cfg .
+.ELIF "$(CPUNAME)"=="X86_64"
+CONFIGURE_ACTION+= $(PERL) ..$/..$/..$/..$/..$/createmak.pl ..$/..$/..$/..$/..$/createmakWin64.cfg .
+.ENDIF
 
 .IF "$(CCNUMVER)"<="001400000000"
 BUILD_ACTION=cd allinone && nmake /f all.mak EXFLAGS="-EHsc" && cd ..$/..