mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix i18npool build on Windows.

Browse Source
This commit is contained in:
Jan Holesovsky
2011-08-19 09:32:18 +02:00
parent 8348732753
commit 534b3bccfd
6 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
RepositoryExternal.mk
View File

@@ -372,6 +372,29 @@ endef
else # !SYSTEM_ICU else # !SYSTEM_ICU
# icudata and icui18n is called icudt and icuin on Windows :-(
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudt \
icuin \
icule \
icutu \
icuuc \
))
define gb_LinkTarget__use_icudt
$(call gb_LinkTarget_add_linked_libs,$(1),\
icudt \
)
endef
define gb_LinkTarget__use_icuin
$(call gb_LinkTarget_add_linked_libs,$(1),\
icuin \
)
endef
else
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudata \ icudata \
icui18n \ icui18n \
@@ -392,6 +415,8 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
) )
endef endef
endif
define gb_LinkTarget__use_icule define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_linked_libs,$(1),\ $(call gb_LinkTarget_add_linked_libs,$(1),\
icule \ icule \

3
RepositoryFixes.mk
View File

@@ -123,8 +123,9 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl
# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
gb_Library_NOILIBFILENAMES += icule icuuc \ gb_Library_NOILIBFILENAMES += \
graphite2_off \ graphite2_off \
icudt icuin icule icuuc \
msvcprt \ msvcprt \
nspr4 \ nspr4 \
nss3 \ nss3 \

8
i18npool/Executable_gencoll_rule.mk
View File

@@ -41,11 +41,19 @@ $(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
ifeq ($(OS),WNT)
$(eval $(call gb_Executable_use_externals,gencoll_rule,\
icudt \
icuin \
icuuc \
))
else
$(eval $(call gb_Executable_use_externals,gencoll_rule,\ $(eval $(call gb_Executable_use_externals,gencoll_rule,\
icudata \ icudata \
icui18n \ icui18n \
icuuc \ icuuc \
)) ))
endif
$(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\ $(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\
i18npool/source/collator/gencoll_rule \ i18npool/source/collator/gencoll_rule \

8
i18npool/Executable_genindex_data.mk
View File

@@ -40,11 +40,19 @@ $(eval $(call gb_Executable_add_linked_libs,genindex_data,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
ifeq ($(OS),WNT)
$(eval $(call gb_Executable_use_externals,gencoll_rule,\
icudt \
icuin \
icuuc \
))
else
$(eval $(call gb_Executable_use_externals,genindex_data,\ $(eval $(call gb_Executable_use_externals,genindex_data,\
icudata \ icudata \
icui18n \ icui18n \
icuuc \ icuuc \
)) ))
endif
$(eval $(call gb_Executable_add_exception_objects,genindex_data,\ $(eval $(call gb_Executable_add_exception_objects,genindex_data,\
i18npool/source/indexentry/genindex_data \ i18npool/source/indexentry/genindex_data \

7
i18npool/Library_i18npool.mk
View File

@@ -56,10 +56,17 @@ $(eval $(call gb_Library_add_linked_libs,i18npool,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_externals,i18npool,\
icuin \
icuuc \
))
else
$(eval $(call gb_Library_use_externals,i18npool,\ $(eval $(call gb_Library_use_externals,i18npool,\
icui18n \ icui18n \
icuuc \ icuuc \
)) ))
endif
$(eval $(call gb_Library_add_exception_objects,i18npool,\ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/breakiterator/breakiterator_cjk \ i18npool/source/breakiterator/breakiterator_cjk \

2
i18npool/source/collator/Makefile
View File

@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # instead of those above.
txtlist := $(wildcard $(SRC_ROOT)/i18npool/source/collator/data/*.txt) txtlist := $(wildcard $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/*.txt)
all : lrl_include.hxx $(patsubst %.txt,collator_%.cxx,$(notdir $(txtlist))) all : lrl_include.hxx $(patsubst %.txt,collator_%.cxx,$(notdir $(txtlist)))