diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2009-11-05 14:21:50 +0000 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2009-11-05 14:21:50 +0000 |
| commit | 40487924f7f7e60fdc353b0cffd9178155387831 (patch) | |
| tree | 8ae8acddd4dc945c1b65958b96d1ecf4d42d29b1 /odk/settings | |
| parent | b7f5132b041b7e66d1403b04e12c5f9d34f318d1 (diff) | |
#i106627# extend and adapt env for VC9, building manifest, change macro
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 4b1b8216bec6..49614d731927 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -80,12 +80,12 @@ PATH_SEPARATOR=; # use this for release version CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa -ifeq "$(CPP_VC8)" "true" +ifeq "$(CPP_MANIFEST)" "true" #CC_FLAGS+=-EHa -Zc:wchar_t- -LINK_MANIFEST_VC8_ONLY=mt -manifest $@.manifest "-outputresource:$@;2" +LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2" else #CC_FLAGS+= -LINK_MANIFEST_VC8_ONLY= +LINK_MANIFEST= endif ifeq "$(DEBUG)" "yes" CC_FLAGS+=-Zi |