diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-09-24 15:00:48 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-09-24 15:01:03 +0200 |
| commit | a147095aee3d1b1e4ee937944cf253ab61f96da1 (patch) | |
| tree | 86c058b3080e537b553a5e17ace9fabdd7dbb57a /libwpd | |
| parent | 084db5f74e9d9c32632df6d15e6cff1c43c2c5a7 (diff) | |
Link the windows build of libwpd against the shared library runtimes
Change-Id: I9dfa2ffb8aeb5b57435f6d67ab662174b794e5b4
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/UnpackedTarball_wpd.mk | 2 | ||||
| -rw-r--r-- | libwpd/libwpd-0.9.5-msc.patch | 106 |
2 files changed, 108 insertions, 0 deletions
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk index 238394886f06..61f0ffa73ae1 100644 --- a/libwpd/UnpackedTarball_wpd.mk +++ b/libwpd/UnpackedTarball_wpd.mk @@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,wpd,0)) wpd_patches := # By mistake libwpd-0.9.5 changed ABI, change back wpd_patches += libwpd-0.9.5-ABI.patch +# Link the static library against the dll runtime and not the static one +wpd_patches += libwpd-0.9.5-msc.patch $(eval $(call gb_UnpackedTarball_add_patches,wpd,\ $(foreach patch,$(wpd_patches),libwpd/$(patch)) \ diff --git a/libwpd/libwpd-0.9.5-msc.patch b/libwpd/libwpd-0.9.5-msc.patch new file mode 100644 index 000000000000..4fd979de64d1 --- /dev/null +++ b/libwpd/libwpd-0.9.5-msc.patch @@ -0,0 +1,106 @@ +--- build/win32/libwpd.vcproj ++++ build/win32/libwpd.vcproj +@@ -42,7 +42,7 @@ + Optimization="0" + PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" + BasicRuntimeChecks="3" +- RuntimeLibrary="1" ++ RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\Debug/libwpd.pch" + AssemblerListingLocation=".\Debug/" +@@ -115,7 +115,7 @@ + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" + StringPooling="true" +- RuntimeLibrary="0" ++ RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\Release/libwpd.pch" +--- build/win32/libwpdstream.vcproj ++++ build/win32/libwpdstream.vcproj +@@ -43,7 +43,7 @@ + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" +- RuntimeLibrary="0" ++ RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + PrecompiledHeaderFile=".\Release/libwpdstream.pch" + AssemblerListingLocation=".\Release/" +@@ -114,7 +114,7 @@ + Optimization="0" + PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" +- RuntimeLibrary="1" ++ RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/libwpdstream.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" +diff --git a/build/win32/wpd2html.vcproj b/build/win32/wpd2html.vcproj +index a41eef2..bdc44cc 100644 +--- build/win32/wpd2html.vcproj ++++ build/win32/wpd2html.vcproj +@@ -46,7 +46,7 @@ + Optimization="4" + AdditionalIncludeDirectories="..\..\src\lib" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE" +- RuntimeLibrary="0" ++ RuntimeLibrary="2" + PrecompiledHeaderFile=".\Release/wpd2html.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" +@@ -134,7 +134,7 @@ + AdditionalIncludeDirectories="..\..\src\lib" + PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE" + BasicRuntimeChecks="3" +- RuntimeLibrary="1" ++ RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/wpd2html.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" +diff --git a/build/win32/wpd2raw.vcproj b/build/win32/wpd2raw.vcproj +index a41318a..9a057e5 100644 +--- build/win32/wpd2raw.vcproj ++++ build/win32/wpd2raw.vcproj +@@ -47,7 +47,7 @@ + Optimization="4" + AdditionalIncludeDirectories="..\..\src\lib" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE" +- RuntimeLibrary="0" ++ RuntimeLibrary="2" + PrecompiledHeaderFile=".\Release/wpd2raw.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" +@@ -136,7 +136,7 @@ + AdditionalIncludeDirectories="..\..\src\lib" + PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE" + BasicRuntimeChecks="3" +- RuntimeLibrary="1" ++ RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/wpd2raw.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" +diff --git a/build/win32/wpd2text.vcproj b/build/win32/wpd2text.vcproj +index 8c02ed1..f4ae836 100644 +--- build/win32/wpd2text.vcproj ++++ build/win32/wpd2text.vcproj +@@ -47,7 +47,7 @@ + AdditionalIncludeDirectories="..\..\src\lib" + PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_CONSOLE" + BasicRuntimeChecks="3" +- RuntimeLibrary="1" ++ RuntimeLibrary="3" + PrecompiledHeaderFile=".\Debug/wpd2text.pch" + AssemblerListingLocation=".\Debug/" + ObjectFile=".\Debug/" +@@ -136,7 +136,7 @@ + Optimization="4" + AdditionalIncludeDirectories="..\..\src\lib" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE" +- RuntimeLibrary="0" ++ RuntimeLibrary="2" + PrecompiledHeaderFile=".\Release/wpd2text.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" |