scp2: fix windows build
913bf64b0b
had some issues with redland
stuff that is built as Library on windows, and the libxslt package is
actually called "xslt" for unknown reasons; unfortunately the buildbot
did not actually try to create an installation set so it was not
detected.
Change-Id: I0437f09228f62b21036a6c26e3d17029d1aab79e
This commit is contained in:
parent
dd8961ade2
commit
ae8e579515
2 changed files with 4 additions and 18 deletions
|
@ -986,7 +986,7 @@ endef
|
|||
ifneq ($(OS),ANDROID)
|
||||
|
||||
ifeq ($(COM),MSC)
|
||||
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
|
||||
raptor2 \
|
||||
rasqal \
|
||||
rdf \
|
||||
|
|
|
@ -275,23 +275,7 @@ File gid_File_Lib_Xslt
|
|||
LIB_FILE_BODY;
|
||||
Styles = (FILELIST);
|
||||
Dir = FILELIST_DIR;
|
||||
Name = "libxslt.filelist";
|
||||
End
|
||||
File gid_File_Lib_eXslt
|
||||
PACKED_LIB_FILE_BODY;
|
||||
#ifdef UNX
|
||||
#ifdef MACOSX
|
||||
Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX));
|
||||
#else
|
||||
Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0));
|
||||
#endif
|
||||
#else
|
||||
#ifdef _gcc3
|
||||
Name = "libexslt-0.dll";
|
||||
#else
|
||||
Name = "libexslt.dll";
|
||||
#endif
|
||||
#endif
|
||||
Name = "xslt.filelist";
|
||||
End
|
||||
#endif
|
||||
|
||||
|
@ -369,6 +353,7 @@ End
|
|||
#endif
|
||||
|
||||
#ifndef SYSTEM_REDLAND
|
||||
#ifndef WNT
|
||||
File gid_File_Lib_Raptor
|
||||
LIB_FILE_BODY;
|
||||
Styles = (FILELIST);
|
||||
|
@ -389,5 +374,6 @@ File gid_File_Lib_Rdf
|
|||
Dir = FILELIST_DIR;
|
||||
Name = "redland.filelist";
|
||||
End
|
||||
#endif // WNT
|
||||
#endif // SYSTEM_REDLAND
|
||||
|
||||
|
|
Loading…
Reference in a new issue