diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 11:26:40 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 11:26:40 +0000 |
| commit | 6c4bfb4ac66f0c624cda70fe55dcff90199257a2 (patch) | |
| tree | d0a815b3daaa8c7b85f80176c6a0a68016a19f84 /odk/settings | |
| parent | 3dc9af06a769da982539942bf170d3b8481ca945 (diff) | |
INTEGRATION: CWS jsc15 (1.20.46); FILE MERGED
2006/11/27 07:45:54 jsc 1.20.46.1: #i68136# extend script to support VC 2005 Express
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 786367ddd468..535fcd633c34 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -77,7 +77,14 @@ EMPTYSTRING= PATH_SEPARATOR=; # use this for release version -CC_FLAGS=-c -GX -MT -Zm500 -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR +CC_FLAGS=-c -MT -Zm500 -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR +ifeq "$(CPP_VC8)" "true" +CC_FLAGS+=-EHa -Zc:wchar_t- +LINK_MANIFEST_VC8_ONLY=mt -manifest $@.manifest -outputresource:$@;2 +else +CC_FLAGS+=-GX +LINK_MANIFEST_VC8_ONLY= +endif ifeq "$(DEBUG)" "yes" CC_FLAGS+=-Zi endif |