diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:14:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 11:14:48 +0000 |
| commit | 8e6e78d439a8a1567f59e2e752838453a7cb5d3e (patch) | |
| tree | d3dac40d981845c6cbb4d4830064050291b65fe4 /cli_ure | |
| parent | d00131a90e9875662f351628a1b85590a22899e7 (diff) | |
INTEGRATION: CWS jl104 (1.4.6); FILE MERGED
2008/06/18 14:25:02 jl 1.4.6.1: #i88078# cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/uno_bridge/makefile.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk index b3b81024d00f..a41c11c60f26 100644 --- a/cli_ure/source/uno_bridge/makefile.mk +++ b/cli_ure/source/uno_bridge/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # # This file is part of OpenOffice.org. # @@ -42,7 +42,6 @@ USE_DEFFILE = TRUE .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk -.IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)" == "MSC10" .IF "$(COM)" == "MSC" # When compiling for CLR, disable "warning C4339: use of undefined type detected @@ -56,8 +55,6 @@ CFLAGSCXX += -clr:oldSyntax -AI $(DLLDEST) -AI $(SOLARBINDIR) -wd4339 .IF "$(debug)" != "" CFLAGS += -Ob0 .ENDIF -.ENDIF - |