summaryrefslogtreecommitdiff
path: root/odk/settings
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-02-03 16:15:17 +0000
committerKurt Zenker <kz@openoffice.org>2006-02-03 16:15:17 +0000
commit69fe0c3e4b2bfbce7f43ea851e8507a4b8e1998c (patch)
tree47768485d75fb6c3232200c3f43887e0f97341ad /odk/settings
parentde8972745d9e76e589349ad0f5376273bce37ccb (diff)
INTEGRATION: CWS jsc5 (1.17.14); FILE MERGED
2006/02/01 09:18:51 jsc 1.17.14.1: #i61438# extend compiler flags for Windows
Diffstat (limited to 'odk/settings')
-rw-r--r--odk/settings/settings.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 09e69929feb1..0826d2d7b725 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -77,7 +77,7 @@ EMPTYSTRING=
PATH_SEPARATOR=;
# use this for release version
-CC_FLAGS=-c -GX -MT
+CC_FLAGS=-c -GX -MT -Zm500 -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR
ifeq "$(DEBUG)" "yes"
CC_FLAGS+=-Zi
endif