diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 18:12:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 15:19:55 +0100 |
| commit | 827430c8c0417396b3c1d2a049ccddb818c89646 (patch) | |
| tree | 2b249c14dcbfb725469b4dd70c125d00486d2a84 /external | |
| parent | 1924d05e706e6308b4de3b6103ebb73976866d66 (diff) | |
Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.
Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2_win32.mk | 26 | ||||
| -rw-r--r-- | external/libxml2/Module_libxml2.mk | 1 |
2 files changed, 0 insertions, 27 deletions
diff --git a/external/libxml2/ExternalPackage_xml2_win32.mk b/external/libxml2/ExternalPackage_xml2_win32.mk deleted file mode 100644 index c97fd89aa32f..000000000000 --- a/external/libxml2/ExternalPackage_xml2_win32.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,xml2_win32,xml2)) - -$(eval $(call gb_ExternalPackage_use_external_project,xml2_win32,xml2)) - -# duplicate copy next to executables due to stupid Win32 DLL search order -# where a libxml2.dll in C:\Windows is loaded before one in URE lib dir -# see 5a5dab5167d136c315e81448ea8eca59e60067da - -ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,xml2_win32,$(LIBO_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) -else # COM=MSC -$(eval $(call gb_ExternalPackage_add_file,xml2_win32,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) -endif -endif # OS=WNT - -# vim: set noet sw=4 ts=4: diff --git a/external/libxml2/Module_libxml2.mk b/external/libxml2/Module_libxml2.mk index 9efb17c26830..f6bca3f80e4f 100644 --- a/external/libxml2/Module_libxml2.mk +++ b/external/libxml2/Module_libxml2.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,libxml2)) $(eval $(call gb_Module_add_targets,libxml2,\ ExternalPackage_xml2 \ - ExternalPackage_xml2_win32 \ ExternalProject_xml2 \ UnpackedTarball_xml2 \ )) |