[Libreoffice-commits] .: RepositoryExternal.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Mon Dec 26 15:32:20 PST 2011
RepositoryExternal.mk | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 472a7db1ef118147d949b13c66bb86411dbc7a75
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Dec 27 00:16:36 2011 +0100
register hunspell as static library
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6b9ebc0..ac2a95b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -192,6 +192,10 @@ endef
else # !SYSTEM_HUNSPELL
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
+))
+
define gb_LinkTarget__use_hunspell
$(call gb_LinkTarget_add_defs,$(1),\
-DHUNSPELL_STATIC \
@@ -200,8 +204,8 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/hunspell \
)
-$(call gb_LinkTarget_add_libs,$(1),\
- $(if $(filter WNT,$(OS)),libhunspell.lib,-lhunspell-1.3) \
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
)
endef
More information about the Libreoffice-commits
mailing list