Skip to content

C
core
Kaydet (Commit) b8bd2554 authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

let's have only one orcus library in solver 

Change-Id: Ida46affca95fcd582206d79ff7a5b4d48ed92e12
üst d1062032
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
RepositoryFixes.mk
Dosyayı görüntüle @ b8bd2554
......@@ -91,8 +91,6 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT)
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst orcus:liborcus%,orcus:liborcus-0.2%,$(gb_StaticLibrary_FILENAMES))
# Libraries not provided by mingw(-w64), available only in the Windows
# SDK. So if these actually are liked with somewhere, we can't
# cross-compile that module then using MinGW. That needs to be fixed
......
liborcus/Package_liborcus.mk
Dosyayı görüntüle @ b8bd2554
......@@ -14,7 +14,6 @@ $(eval $(call gb_Package_use_external_project,liborcus,liborcus))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib))
else
$(eval $(call gb_Package_add_file,liborcus,lib/liborcus-0.2.a,src/liborcus/.libs/liborcus-0.2.a))
$(eval $(call gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.2.a))
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment