mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

register uwinapi for URE layer (auto-install it while at it)

Browse Source 
Hopefully the VERSION_INDEPENDENT_COMP_ID is not actually important?

Change-Id: Iad6e4eacffddf630768d89dbed391839144115ca
This commit is contained in:
Michael Stahl 2013-09-09 21:19:16 +02:00
parent 1c70dc6fa2
commit 6ec243f58d
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Repository.mk
View File

@ -453,6 +453,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
unsafe_uno \ unsafe_uno \
$(if $(URELIBS),urelibs) \ $(if $(URELIBS),urelibs) \
$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
$(if $(filter $(OS),WNT), \
uwinapi \
) \
)) ))
$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
@ -563,9 +566,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
$(if $(filter $(OS),ANDROID), \ $(if $(filter $(OS),ANDROID), \
lo-bootstrap \ lo-bootstrap \
) \ ) \
$(if $(filter $(OS),WNT), \
uwinapi \
) \
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)

10
scp2/source/ooo/ure.scp
View File

@ -521,16 +521,6 @@ End
#endif #endif
#if defined WNT
File gid_File_Dl_Uwinapi
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("uwinapi");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "EABC9FE3-B296-430F-8513-A3617FFB630D";
End
#endif
// Public JARs: // Public JARs:
#if defined ENABLE_JAVA #if defined ENABLE_JAVA