diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 13:06:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-18 13:06:38 +0000 |
| commit | 66852b8671f2bc16256aaed6c533e0e2ff148406 (patch) | |
| tree | 4fa6e3d82374b5baa640a8ed81865b7d212af10f /autodoc/source | |
| parent | f30b6b13f52d4cfdf2fb758928ee1edf941c2ca6 (diff) | |
INTEGRATION: CWS adc17 (1.8.50); FILE MERGED
2007/09/04 15:40:19 np 1.8.50.3: #i80569#
2007/08/31 14:45:33 np 1.8.50.2: #i80569# remove wrong pchs.
2007/08/10 12:28:37 np 1.8.50.1: #i80569# fix concurring pchs.
Diffstat (limited to 'autodoc/source')
| -rw-r--r-- | autodoc/source/mkinc/fullcpp.mk | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk index 4d2334f0c397..ad4681f410ee 100644 --- a/autodoc/source/mkinc/fullcpp.mk +++ b/autodoc/source/mkinc/fullcpp.mk @@ -4,9 +4,9 @@ # # $RCSfile: fullcpp.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2005-09-07 18:10:59 $ +# last change: $Author: vg $ $Date: 2007-09-18 14:06:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,27 +39,24 @@ # Has to be included AFTER settings.mk ! - -.IF "$(GUI)"=="WNT" - # RTTI +.IF "$(GUI)"=="WNT" CFLAGS+= -GR +.ENDIF +.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || $(COM) == "GCC" +CFLAGSCXX+= -frtti +.ENDIF + -.IF "$(NP_LOCALBUILD)"!="" # Precompiled Headers -PCH_NAME= autodoc +.IF "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT" + +PCH_NAME=autodoc .IF "$(debug)"=="" CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch .ELSE -CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD -.ENDIF - -.ENDIF - -.ENDIF - -.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" -CFLAGSCXX+= -frtti +CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd .ENDIF +.ENDIF # "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT" |