Kaydet (Commit) e052c90c authored tarafından Kurt Zenker's avatar Kurt Zenker

INTEGRATION: CWS pchfix04 (1.3.8); FILE MERGED

2007/04/25 20:46:32 hjs 1.3.8.4: RESYNC: (1.3-1.8); FILE MERGED
2007/01/25 17:58:49 hjs 1.3.8.3: #i72289# different set of compiler switches to solve conflict with pch
2007/01/16 14:30:27 hjs 1.3.8.2: #i72621# remove INCLUDE from CFLAGS
2006/12/15 12:54:39 hjs 1.3.8.1: #i72621# fixed mp issue; .net 2005 support
üst 91bc3776
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# #
# $RCSfile: wntmsci11.mk,v $ # $RCSfile: wntmsci11.mk,v $
# #
# $Revision: 1.9 $ # $Revision: 1.10 $
# #
# last change: $Author: rt $ $Date: 2007-04-26 13:57:59 $ # last change: $Author: kz $ $Date: 2007-05-10 15:12:27 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
...@@ -81,7 +81,7 @@ CXX+= /NMttNoLines ...@@ -81,7 +81,7 @@ CXX+= /NMttNoLines
# lookup": # lookup":
# -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 # -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
CFLAGS+=-c -nologo -Gs $(NOLOGO) $(MINUS_I)$(INCLUDE) CFLAGS+=-c -nologo -Gs $(NOLOGO)
CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
...@@ -96,7 +96,8 @@ CFLAGS+= -Ob1 ...@@ -96,7 +96,8 @@ CFLAGS+= -Ob1
.ENDIF .ENDIF
# flags to enable build with symbols; required for crashdump feature # 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 "$(bndchk)" != ""
.IF "$(debug)" == "" .IF "$(debug)" == ""
...@@ -118,6 +119,9 @@ RSCDEFS+=-DFULL_DESK ...@@ -118,6 +119,9 @@ RSCDEFS+=-DFULL_DESK
CFLAGSEXCEPTIONS=-EHa CFLAGSEXCEPTIONS=-EHa
CFLAGS_NO_EXCEPTIONS= CFLAGS_NO_EXCEPTIONS=
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" .IF "$(CALL_CDECL)"=="TRUE"
CFLAGSCALL=-Gd CFLAGSCALL=-Gd
.ELSE # "$(CALL_CDECL)"=="TRUE" .ELSE # "$(CALL_CDECL)"=="TRUE"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment