diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 13:06:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 13:06:16 +0000 |
| commit | 8520d12318b41d5c8360b80e321bd49db057a80f (patch) | |
| tree | dae58f624917f894e90672e618288c326de20b75 /cli_ure/source | |
| parent | cc07b296fe79fc38149d75e1d4b524177948f077 (diff) | |
INTEGRATION: CWS ause043 (1.12.4); FILE MERGED
2006/05/15 12:41:59 hjs 1.12.4.6: RESYNC: (1.14-1.15); FILE MERGED
2006/03/02 14:12:19 hjs 1.12.4.5: RESYNC: (1.13-1.14); FILE MERGED
2005/12/22 13:14:18 hjs 1.12.4.4: RESYNC: (1.12-1.13); FILE MERGED
2005/11/16 14:14:54 hjs 1.12.4.3: #i56702# added missing types
2005/11/15 16:13:55 hjs 1.12.4.2: #i56702# set NO_OFFUH to check completeness
2005/11/09 12:54:21 hjs 1.12.4.1: #i56702# remove overrides for default uno header generation
Diffstat (limited to 'cli_ure/source')
| -rw-r--r-- | cli_ure/source/native/makefile.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk index 12d9d0e8030f..85f36716697d 100644 --- a/cli_ure/source/native/makefile.mk +++ b/cli_ure/source/native/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: rt $ $Date: 2006-03-09 10:53:11 $ +# last change: $Author: vg $ $Date: 2006-05-24 14:06:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -84,17 +84,15 @@ LINKFLAGS += /delayload:cppuhelper3MSC.dll \ UWINAPILIB= -UNOUCRRDB = $(SOLARBINDIR)$/udkapi.rdb -UNOUCRDEP = $(UNOUCRRDB) -UNOUCROUT = $(OUT)$/inc -INCPRE += $(OUT)$/inc - +NO_OFFUH=TRUE CPPUMAKERFLAGS = UNOTYPES = \ com.sun.star.lang.XSingleComponentFactory \ com.sun.star.loader.CannotActivateFactoryException \ + com.sun.star.container.XHierarchicalNameAccess \ com.sun.star.registry.CannotRegisterImplementationException \ - com.sun.star.registry.XRegistryKey + com.sun.star.registry.XRegistryKey \ + com.sun.star.registry.XSimpleRegistry CFLAGS += -clr -AI $(OUT)$/bin #see Microsoft Knowledge Base Article - 814472 |