diff options
| author | Eike Rathke <erack@redhat.com> | 2012-08-06 19:23:09 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-08-06 19:36:16 +0200 |
| commit | 15b95b224588743d629c7a9a305352357eb96a07 (patch) | |
| tree | 29fa5639b439f17653630181ddc37103fc4af3e0 | |
| parent | 284bc79cc482e95b216b6eeb9c166022880d662b (diff) | |
LanguageTag Windows build
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 3 | ||||
| -rw-r--r-- | i18npool/Library_i18nisolang1.mk | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5efe5eb9f67e..08b3aa6d6b66 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -442,7 +442,8 @@ endef else # !SYSTEM_GLIB $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - glib \ + glib-2.0 \ + gmodule-2.0 \ )) define gb_LinkTarget__use_glib @@ -453,6 +454,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\ glib-2.0 \ + gmodule-2.0 \ ) endef diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 12108f3cfe90..b5ecb1c5cbbc 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -129,8 +129,11 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) # 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 += \ + glib-2.0 \ + gmodule-2.0 \ graphite2_off \ icudt icuin icule icuuc \ + langtag \ lcms2 \ msvcprt \ nspr4 \ diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index db0cdf244594..066f6f9a79d9 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -57,4 +57,6 @@ $(eval $(call gb_Library_use_external,i18nisolang1,glib)) $(eval $(call gb_Library_use_external,i18nisolang1,liblangtag)) +$(eval $(call gb_Library_use_external,i18nisolang1,libxml2)) + # vim: set noet sw=4 ts=4: |