From bee83bf4e8e1ca6cac75e404ef795202edaaceb7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 23 Apr 2007 23:08:07 +0000 Subject: [PATCH] revert exceptions; these should not be on --- stepmania/src/StepMania-net2005.vcproj | 6 +++--- stepmania/src/archutils/Win32/arch_setup.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stepmania/src/StepMania-net2005.vcproj b/stepmania/src/StepMania-net2005.vcproj index 9725667a26..0856f0dfbd 100644 --- a/stepmania/src/StepMania-net2005.vcproj +++ b/stepmania/src/StepMania-net2005.vcproj @@ -51,7 +51,7 @@ Optimization="0" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\include;BaseClasses" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE" - ExceptionHandling="1" + ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="2" @@ -160,7 +160,7 @@ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE" StringPooling="true" MinimalRebuild="false" - ExceptionHandling="1" + ExceptionHandling="0" RuntimeLibrary="2" BufferSecurityCheck="false" EnableFunctionLevelLinking="false" @@ -263,7 +263,7 @@ Optimization="0" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\include;BaseClasses" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE" - ExceptionHandling="1" + ExceptionHandling="0" BasicRuntimeChecks="0" RuntimeLibrary="3" UsePrecompiledHeader="2" diff --git a/stepmania/src/archutils/Win32/arch_setup.h b/stepmania/src/archutils/Win32/arch_setup.h index 75be2c4151..78279b3566 100644 --- a/stepmania/src/archutils/Win32/arch_setup.h +++ b/stepmania/src/archutils/Win32/arch_setup.h @@ -48,6 +48,10 @@ #define _CRT_SECURE_NO_DEPRECATE #define _SCL_SECURE_NO_DEPRECATE +#if defined(_MSC_VER) && _MSC_VER >= 1400 // this is needed in VC8 but breaks VC7 +#define _HAS_EXCEPTIONS 0 +#endif + /* Don't include windows.h everywhere; when we do eventually include it, use these: */ #define WIN32_LEAN_AND_MEAN #define VC_EXTRALEAN