INTEGRATION: CWS pchfix04 (1.14.12); FILE MERGED

2007/04/25 20:37:32 hjs 1.14.12.10: RESYNC: (1.17-1.24); FILE MERGED
2007/01/26 19:03:23 hjs 1.14.12.9: RESYNC: (1.16-1.17); FILE MERGED
2007/01/25 17:58:49 hjs 1.14.12.8: #i72289# different set of compiler switches to solve conflict with pch
2006/12/22 11:17:07 hjs 1.14.12.7: RESYNC: (1.15-1.16); FILE MERGED
2006/12/11 14:18:38 kaib 1.14.12.6: RESYNC: (1.14-1.15); FILE MERGED
2006/11/16 17:33:01 kaib 1.14.12.5: #i71519# Fixed minor pch bugs on win32 with the new gcc code
2006/11/15 21:39:21 mkretzschmar 1.14.12.4: #i71588# Use PCHs on unxlngi6
2006/11/15 21:21:21 mkretzschmar 1.14.12.3: #i71588# Build (but don't use yet) PCHs on unxlngi6
2006/11/15 21:05:34 mkretzschmar 1.14.12.2: #i71588# Preparatory simplification for PCH support on GCC
2006/11/15 20:17:27 mkretzschmar 1.14.12.1: #i71581# Use -I$(INCPCH) and not -I$(PRJ)$/inc$/pch

solenv/inc/wntmsci10.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: wntmsci10.mk,v $
 #
-#   $Revision: 1.26 $
+#   $Revision: 1.27 $
 #
-#   last change: $Author: rt $ $Date: 2007-04-26 15:06:34 $
+#   last change: $Author: kz $ $Date: 2007-05-10 15:12:12 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -93,7 +93,8 @@ CFLAGS+= -Ob1
 .ENDIF
 
 # flags to enable build with symbols; required for crashdump feature
-CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)$/_ooo_st_$(TARGET).PDB
+#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)$/_ooo_st_$(TARGET).PDB
+CFLAGSENABLESYMBOLS=-Z7 -Yd
 
 .IF "$(bndchk)" != ""
 .IF "$(debug)" == ""
@@ -115,9 +116,9 @@ RSCDEFS+=-DFULL_DESK
 CFLAGSEXCEPTIONS=-GX
 CFLAGS_NO_EXCEPTIONS=
 
-CFLAGS_CREATE_PCH=-I$(PRJ)$/inc$/pch -Fo$(SLO)$/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pchname.pch -DPRECOMPILED_HEADERS
-CFLAGS_USE_PCH=-I$(PRJ)$/inc$/pch -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pchname.pch -DPRECOMPILED_HEADERS
-CFLAGS_USE_EXCEPTIONS_PCH=-I$(PRJ)$/inc$/pch -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pchname_ex.pch -DPRECOMPILED_HEADERS
+CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)$/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
+CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
+CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
 .IF "$(CALL_CDECL)"=="TRUE"
 CFLAGSCALL=-Gd
 .ELSE			# "$(CALL_CDECL)"=="TRUE"