summaryrefslogtreecommitdiff
path: root/setup_native/Library_regactivex.mk
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-02-17 12:22:01 +0100
committerAndras Timar <atimar@suse.com>2013-02-17 12:25:44 +0100
commitc13c500630746ba035e0b48c0cbd276aa436db2b (patch)
treef476281b7720357055e3e08edf1f32c71f88fa65 /setup_native/Library_regactivex.mk
parent850b4c7e2d5535dcf76cebea85b4f14c1c7aeaea (diff)
CustomActions should be statically linked with MSVCRT
Change-Id: I100b7ff7e3aa505098ce8b3333d1aa8faca50370
Diffstat (limited to 'setup_native/Library_regactivex.mk')
-rw-r--r--setup_native/Library_regactivex.mk14
1 files changed, 13 insertions, 1 deletions
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk
index e48a2822f5c2..4f561a5084c4 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -9,8 +9,17 @@
$(eval $(call gb_Library_Library,regactivex))
+$(eval $(call gb_Library_add_defs,regactivex,\
+ -U_DLL \
+))
+
+$(eval $(call gb_Library_add_cxxflags,regactivex,\
+ /MT \
+))
+
$(eval $(call gb_Library_add_ldflags,regactivex,\
/DEF:$(SRCDIR)/setup_native/source/win32/customactions/regactivex/regactivex.def \
+ /NODEFAULTLIB \
))
$(eval $(call gb_Library_add_exception_objects,regactivex,\
@@ -18,7 +27,10 @@ $(eval $(call gb_Library_add_exception_objects,regactivex,\
))
$(eval $(call gb_Library_use_system_win32_libs,regactivex,\
- msi \
+ libcmt \
+ libcpmt \
+ kernel32 \
+ msi \
))
# vim: set noet sw=4 ts=4: