[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 2 commits - extensions/Library_so_activex_x64.mk

[Michael Stahl (via logerrit)]

 extensions/Library_so_activex_x64.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0c6b9f1fba7b57a2dbb803723535e2262b70a512
Author:     Michael Stahl <mstahl at redhat.com>
AuthorDate: Thu Mar 9 18:42:09 2017 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun May 26 23:30:21 2019 +0200

    oops, forgot to commit that
    
    Change-Id: I7b0a08ca47996f80112f68daef3e2ba5e3be221b
    (cherry picked from commit 15d46079a5b6429dba0d501e7db218188294587a)

diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index e1c4b9a8f9ba..64f644098a8f 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
 $(eval $(call gb_Library_add_libs,so_activex_x64,\
 	$(if $(filter 140,$(VCVER)),\
 		$(ATL_LIB)/amd64/atls.lib, \
-		$(subst /x86,/x64,$(ATL_LIB)/amd64/atls.lib)) \
+		$(subst /x86,/x64,$(ATL_LIB)/atls.lib)) \
 ))
 
 # vim:set noet sw=4 ts=4:
commit fe13c39f3adb7f6eff5131dbee02347193a716dd
Author:     Michael Stahl <mstahl at redhat.com>
AuthorDate: Thu Mar 9 18:40:40 2017 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun May 26 23:29:46 2019 +0200

    extensions: fix MSVC 2017 build of Library_so_activex_x64
    
    Change-Id: Ia98c2ba085d6b7705b53dafd5368d69f0e0727c5
    (cherry picked from commit 869a249cebaf58d13812194297561fc361dd3a36)

diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index d330ca8a3bf0..e1c4b9a8f9ba 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -50,7 +50,9 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
 ))
 
 $(eval $(call gb_Library_add_libs,so_activex_x64,\
-	$(ATL_LIB)/amd64/atls.lib \
+	$(if $(filter 140,$(VCVER)),\
+		$(ATL_LIB)/amd64/atls.lib, \
+		$(subst /x86,/x64,$(ATL_LIB)/amd64/atls.lib)) \
 ))
 
 # vim:set noet sw=4 ts=4: