diff options
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Library_instooofiltmsi.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_qslnkmsi.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_reg4allmsdoc.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_regactivex.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_sdqsmsi.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_sellangmsi.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_shlxtmsi.mk | 4 | ||||
| -rw-r--r-- | setup_native/Library_sn_tools.mk | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk index 770f80f7453c..4d0ae63679f3 100644 --- a/setup_native/Library_instooofiltmsi.mk +++ b/setup_native/Library_instooofiltmsi.mk @@ -29,8 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\ $(eval $(call gb_Library_use_system_win32_libs,instooofiltmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ kernel32 \ )) diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk index 8aa88685884b..f958534f07b1 100644 --- a/setup_native/Library_qslnkmsi.mk +++ b/setup_native/Library_qslnkmsi.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,qslnkmsi,\ $(eval $(call gb_Library_use_system_win32_libs,qslnkmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk index 64aa20f42691..f20fa5ad5aea 100644 --- a/setup_native/Library_reg4allmsdoc.mk +++ b/setup_native/Library_reg4allmsdoc.mk @@ -31,8 +31,8 @@ $(eval $(call gb_Library_add_exception_objects,reg4allmsdoc,\ $(eval $(call gb_Library_use_system_win32_libs,reg4allmsdoc,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk index 3d0a51e0338a..7142b8ee0a7d 100644 --- a/setup_native/Library_regactivex.mk +++ b/setup_native/Library_regactivex.mk @@ -29,8 +29,8 @@ $(eval $(call gb_Library_add_exception_objects,regactivex,\ $(eval $(call gb_Library_use_system_win32_libs,regactivex,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ kernel32 \ msi \ )) diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk index 2f29e16ecbcc..ff9a1bd586a7 100644 --- a/setup_native/Library_sdqsmsi.mk +++ b/setup_native/Library_sdqsmsi.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sdqsmsi,\ $(eval $(call gb_Library_use_system_win32_libs,sdqsmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index 60d4e95a65ff..04f8f6edbc46 100644 --- a/setup_native/Library_sellangmsi.mk +++ b/setup_native/Library_sellangmsi.mk @@ -34,8 +34,8 @@ $(eval $(call gb_Library_add_exception_objects,sellangmsi,\ $(eval $(call gb_Library_use_system_win32_libs,sellangmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ user32 \ diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk index fd0f0899f445..e6780d014b5f 100644 --- a/setup_native/Library_shlxtmsi.mk +++ b/setup_native/Library_shlxtmsi.mk @@ -43,8 +43,8 @@ $(eval $(call gb_Library_use_static_libraries,shlxtmsi,\ $(eval $(call gb_Library_use_system_win32_libs,shlxtmsi,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ msi \ kernel32 \ advapi32 \ diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk index 68aeeedcab99..aa94f2ebcf02 100644 --- a/setup_native/Library_sn_tools.mk +++ b/setup_native/Library_sn_tools.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_use_static_libraries,sn_tools,\ $(eval $(call gb_Library_use_system_win32_libs,sn_tools,\ libcmt \ libcpmt \ - $(if $(filter-out 120,$(VCVER)),libucrt) \ - $(if $(filter-out 120,$(VCVER)),libvcruntime) \ + libucrt \ + libvcruntime \ kernel32 \ msi \ advapi32 \ |