From c13c500630746ba035e0b48c0cbd276aa436db2b Mon Sep 17 00:00:00 2001
From: Andras Timar <atimar@suse.com>
Date: Sun, 17 Feb 2013 12:22:01 +0100
Subject: CustomActions should be statically linked with MSVCRT

Change-Id: I100b7ff7e3aa505098ce8b3333d1aa8faca50370
---
 setup_native/Library_instooofiltmsi.mk | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'setup_native/Library_instooofiltmsi.mk')

diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index 0c744845a28e..677e59003b17 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -9,14 +9,27 @@
 
 $(eval $(call gb_Library_Library,instooofiltmsi))
 
-ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,instooofiltmsi,\
+	-U_DLL \
+))
+
+$(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\
+	/MT \
+))
+
 $(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
 	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def \
+	/NODEFAULTLIB \
 ))
-endif
 
 $(eval $(call gb_Library_add_exception_objects,instooofiltmsi,\
     setup_native/source/win32/customactions/indexingfilter/restartindexingservice \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,instooofiltmsi,\
+	libcmt \
+	libcpmt \
+	kernel32 \
+))
+
 # vim: set noet sw=4 ts=4:
-- 
cgit v1.2.3