INTEGRATION: CWS jl34 (1.11.6); FILE MERGED
2006/06/06 09:22:52 jl 1.11.6.2: RESYNC: (1.11-1.12); FILE MERGED 2006/05/17 11:31:07 jl 1.11.6.1: #65488# remove linker switch for .NET 1
This commit is contained in:
parent
1fe8983e9c
commit
c3c20663b8
1 changed files with 4 additions and 3 deletions
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.13 $
|
||||
# $Revision: 1.14 $
|
||||
#
|
||||
# last change: $Author: hr $ $Date: 2006-06-20 00:57:29 $
|
||||
# last change: $Author: obo $ $Date: 2006-07-13 08:34:32 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -81,10 +81,11 @@ UNOTYPES = \
|
|||
|
||||
CFLAGS +=-AI$(BIN)
|
||||
|
||||
|
||||
# When compiling for CLR, disable "warning C4339: use of undefined type detected
|
||||
# in CLR meta-data - use of this type may lead to a runtime exception":
|
||||
.IF "$(COMEX)"=="10"
|
||||
CFLAGS += -clr:noAssembly,initialAppDomain -wd4339
|
||||
CFLAGS += -clr:noAssembly -wd4339
|
||||
.ELSE
|
||||
CFLAGS += -clr:noAssembly -wd4339
|
||||
.ENDIF
|
||||
|
|
Loading…
Reference in a new issue