icc/SampleICC-1.3.2-Win64.patch | 11 +++++++ icc/makefile.mk | 2 - salhelper/source/makefile.mk | 2 + salhelper/source/mscx.map | 58 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-)
New commits: commit 4fd38c7a96b91bdce3804a490e6f4b643000c212 Author: Damjan Jovanovic <dam...@apache.org> Date: Wed Mar 7 04:37:48 2018 +0000 Patch main/icc to build on Win64. Patch by: me diff --git a/icc/SampleICC-1.3.2-Win64.patch b/icc/SampleICC-1.3.2-Win64.patch new file mode 100644 index 000000000000..ad1c8a54f81c --- /dev/null +++ b/icc/SampleICC-1.3.2-Win64.patch @@ -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 diff --git a/icc/makefile.mk b/icc/makefile.mk index 40e849058e27..3b6d3102c75f 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -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 \ commit fbff6744fa4f49e5a3389a1c1d174b2a9914a211 Author: Damjan Jovanovic <dam...@apache.org> Date: Wed Mar 7 04:15:14 2018 +0000 Add a linker map file for salhelper on Win64. Patch by: me diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index 440bc6c2b11e..2f9ed8485e98 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -64,6 +64,8 @@ DEF1NAME= $(SHL1TARGET) .IF "$(COMNAME)"=="msci" SHL1VERSIONMAP=msci.map +.ELIF "$(COMNAME)"=="mscx" +SHL1VERSIONMAP=mscx.map .ELIF "$(GUI)"=="OS2" SHL1VERSIONMAP=gcc3os2.map .ELIF "$(COMNAME)"=="sunpro5" diff --git a/salhelper/source/mscx.map b/salhelper/source/mscx.map new file mode 100644 index 000000000000..a9d950b11e89 --- /dev/null +++ b/salhelper/source/mscx.map @@ -0,0 +1,58 @@ +############################################################### +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +############################################################### +UDK_3_0_0 { + global: +GetVersionInfo +??0ORealDynamicLoader@salhelper@@IEAA@PEAPEAV01@AEBVOUString@rtl@@1PEAX2@Z +??1ORealDynamicLoader@salhelper@@MEAA@XZ +??_7ORealDynamicLoader@salhelper@@6B@ +?acquire@ORealDynamicLoader@salhelper@@QEAAKXZ +?getApi@ORealDynamicLoader@salhelper@@QEBAPEAXXZ +?newInstance@ORealDynamicLoader@salhelper@@SAPEAV12@PEAPEAV12@AEBVOUString@rtl@@1@Z +?release@ORealDynamicLoader@salhelper@@QEAAKXZ +??1SimpleReferenceObject@salhelper@@MEAA@XZ +??2SimpleReferenceObject@salhelper@@SAPEAX_K@Z +??2SimpleReferenceObject@salhelper@@SAPEAX_KAEBUnothrow_t@std@@@Z +??3SimpleReferenceObject@salhelper@@SAXPEAX@Z +??3SimpleReferenceObject@salhelper@@SAXPEAXAEBUnothrow_t@std@@@Z + local: + *; +}; + +UDK_3.1 { + global: + ??_7SimpleReferenceObject@salhelper@@6B@; + + ??0Condition@salhelper@@QEAA@AEAVMutex@osl@@@Z; + ??1Condition@salhelper@@UEAA@XZ; + + ??0ConditionModifier@salhelper@@QEAA@AEAVCondition@1@@Z; + ??1ConditionModifier@salhelper@@QEAA@XZ + + ??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@@Z; + ??0ConditionWaiter@salhelper@@QEAA@AEAVCondition@1@K@Z; + ??1ConditionWaiter@salhelper@@QEAA@XZ + + ??0timedout@ConditionWaiter@salhelper@@QEAA@XZ; + ??0timedout@ConditionWaiter@salhelper@@QEAA@AEBU012@@Z; + ??1timedout@ConditionWaiter@salhelper@@UEAA@XZ; + ??4timedout@ConditionWaiter@salhelper@@QEAAAEAU012@AEBU012@@Z; +} UDK_3_0_0; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits