diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-27 01:00:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-27 01:06:34 +0200 |
| commit | b2bcb2eb214e44cc55e97480deba9e7d353769d5 (patch) | |
| tree | 598ed1c797c802eec757f3a7f4d4a75c297461e5 | |
| parent | 349015b18e285b9642e0b16a5e4db61ef347a6a8 (diff) | |
libxml2: deliver libxml2.dll second time into program
Change-Id: I5a823cf7dafc2f04e705de6f4c30ec365922a096
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index 7102dfdf70ff..b60f3d006fb9 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -19,8 +19,12 @@ $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2. else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) +$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) else # COM=MSC $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) +# duplicate copy next to executables due to idiotic Win32 DLL search order +# see 5a5dab5167d136c315e81448ea8eca59e60067da +$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.7.6)) |