Author: damjan Date: Wed Mar 7 04:37:48 2018 New Revision: 1826069 URL: http://svn.apache.org/viewvc?rev=1826069&view=rev Log: Patch main/icc to build on Win64.
Patch by: me Added: openoffice/trunk/main/icc/SampleICC-1.3.2-Win64.patch Modified: openoffice/trunk/main/icc/makefile.mk Added: openoffice/trunk/main/icc/SampleICC-1.3.2-Win64.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/icc/SampleICC-1.3.2-Win64.patch?rev=1826069&view=auto ============================================================================== --- openoffice/trunk/main/icc/SampleICC-1.3.2-Win64.patch (added) +++ openoffice/trunk/main/icc/SampleICC-1.3.2-Win64.patch Wed Mar 7 04:37:48 2018 @@ -0,0 +1,11 @@ +--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 2018-03-07 06:19:39.296824700 +0200 ++++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h 2018-03-07 06:33:33.075513600 +0200 +@@ -80,7 +80,7 @@ + #endif + + //PC, visual C++ +-#if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86) ++#if defined(_MSC_VER) && !defined(__MWERKS__) && (defined(_M_IX86) || defined(_M_AMD64)) + + //Define how 64 bit integers are represented + #define ICCUINT64 unsigned __int64 Modified: openoffice/trunk/main/icc/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/icc/makefile.mk?rev=1826069&r1=1826068&r2=1826069&view=diff ============================================================================== --- openoffice/trunk/main/icc/makefile.mk (original) +++ openoffice/trunk/main/icc/makefile.mk Wed Mar 7 04:37:48 2018 @@ -34,7 +34,7 @@ TARGET=icc TARFILE_NAME=SampleICC-1.3.2 TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab -PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME).format-security.patch +PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME).format-security.patch SampleICC-1.3.2-Win64.patch CONVERTFILES= \ IccProfLib$/IccTagProfSeqId.h \