diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-09 21:19:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:13 +0200 |
| commit | 6ec243f58d992ae9458c2ccd81f08a3d0ccf59bf (patch) | |
| tree | 07c2342c5dae4a7e37b27d139be8adecac0c637b | |
| parent | 1c70dc6fa267078aa3b0ed716b5a2c7f7d267163 (diff) | |
register uwinapi for URE layer (auto-install it while at it)
Hopefully the VERSION_INDEPENDENT_COMP_ID is not actually important?
Change-Id: Iad6e4eacffddf630768d89dbed391839144115ca
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/Repository.mk b/Repository.mk index d1f2db0b1b95..df62e78dd902 100644 --- a/Repository.mk +++ b/Repository.mk @@ -453,6 +453,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ unsafe_uno \ $(if $(URELIBS),urelibs) \ $(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, \ @@ -563,9 +566,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ - $(if $(filter $(OS),WNT), \ - uwinapi \ - ) \ )) ifeq ($(OS),WNT) diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index c37134b1e80c..12b55a546b00 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -521,16 +521,6 @@ End #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: #if defined ENABLE_JAVA |