diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 13:37:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 13:37:51 +0000 |
| commit | 52d86f9369466a65e7d601e17774205b7c4fc451 (patch) | |
| tree | 72caaedd9cecfe82ae65820365f8b4a2b269bc91 /cli_ure/source | |
| parent | 373b6e648006447a3143285d334bec8f4f03627a (diff) | |
INTEGRATION: CWS jl12 (1.6.6); FILE MERGED
2004/08/30 14:25:37 jl 1.6.6.3: RESYNC: (1.6-1.7); FILE MERGED
2004/08/30 13:13:26 jl 1.6.6.2: #i33134# #i33485#
2004/08/20 12:44:49 jl 1.6.6.1: #i33102#
Diffstat (limited to 'cli_ure/source')
| -rw-r--r-- | cli_ure/source/native/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk index 7ba42f8964ac..f3dccba62fc6 100644 --- a/cli_ure/source/native/makefile.mk +++ b/cli_ure/source/native/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: vg $ $Date: 2004-08-23 09:10:56 $ +# last change: $Author: rt $ $Date: 2004-09-20 14:37:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -125,11 +125,12 @@ UNOTYPES = \ com.sun.star.registry.XRegistryKey CFLAGS += -clr -AI $(OUT)$/bin +#see Microsoft Knowledge Base Article - 814472 +LINKFLAGS += /NOENTRY /NODEFAULTLIB:nochkclr.obj /INCLUDE:__DllMainCRTStartup@12 SLOFILES = \ $(SLO)$/native_bootstrap.obj \ - $(SLO)$/assembly_cppuhelper.obj - + $(SLO)$/assembly_cppuhelper.obj SHL1OBJS = $(SLOFILES) |