diff options
| author | Andras Timar <atimar@suse.com> | 2013-02-17 12:22:01 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-02-17 12:25:44 +0100 |
| commit | c13c500630746ba035e0b48c0cbd276aa436db2b (patch) | |
| tree | f476281b7720357055e3e08edf1f32c71f88fa65 /setup_native/Library_shlxtmsi.mk | |
| parent | configure.ac: automatically find versioned servlet-api.jar (diff) | |
| download | core-c13c500630746ba035e0b48c0cbd276aa436db2b.tar.gz core-c13c500630746ba035e0b48c0cbd276aa436db2b.zip | |
CustomActions should be statically linked with MSVCRT
Change-Id: I100b7ff7e3aa505098ce8b3333d1aa8faca50370
Diffstat (limited to 'setup_native/Library_shlxtmsi.mk')
| -rw-r--r-- | setup_native/Library_shlxtmsi.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk index d124e762c7a6..a6037029094c 100644 --- a/setup_native/Library_shlxtmsi.mk +++ b/setup_native/Library_shlxtmsi.mk @@ -11,8 +11,17 @@ $(eval $(call gb_Library_Library,shlxtmsi)) $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers)) +$(eval $(call gb_Library_add_defs,shlxtmsi,\ + -U_DLL \ +)) + +$(eval $(call gb_Library_add_cxxflags,shlxtmsi,\ + /MT \ +)) + $(eval $(call gb_Library_add_ldflags,shlxtmsi,\ /DEF:$(SRCDIR)/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def \ + /NODEFAULTLIB \ )) $(eval $(call gb_Library_add_exception_objects,shlxtmsi,\ @@ -32,7 +41,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxtmsi,\ )) $(eval $(call gb_Library_use_system_win32_libs,shlxtmsi,\ - msi \ + libcmt \ + libcpmt \ + msi \ + kernel32 \ advapi32 \ shell32 \ psapi \ |