diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-09 18:40:40 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-05-26 23:29:46 +0200 |
| commit | fe13c39f3adb7f6eff5131dbee02347193a716dd (patch) | |
| tree | 8b37c4f50370f63cade620bd18950423f7aee23c | |
| parent | 68bad2aaa61859d444cd9b722c77fc48c7d5a551 (diff) | |
extensions: fix MSVC 2017 build of Library_so_activex_x64
Change-Id: Ia98c2ba085d6b7705b53dafd5368d69f0e0727c5
(cherry picked from commit 869a249cebaf58d13812194297561fc361dd3a36)
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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: |