diff options
| -rw-r--r-- | bs2.vcproj | 4 | ||||
| -rw-r--r-- | common/stdafx.h | 10 | ||||
| -rw-r--r-- | scumm.vcproj | 4 | ||||
| -rw-r--r-- | scummvm.vcproj | 4 | ||||
| -rw-r--r-- | simon.vcproj | 4 | ||||
| -rw-r--r-- | sky.vcproj | 4 |
6 files changed, 20 insertions, 10 deletions
diff --git a/bs2.vcproj b/bs2.vcproj index 76fe980eb6..1d0cd44b19 100644 --- a/bs2.vcproj +++ b/bs2.vcproj @@ -21,6 +21,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" @@ -69,6 +70,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" @@ -116,6 +118,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" @@ -163,6 +166,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" diff --git a/common/stdafx.h b/common/stdafx.h index 2f17591dd4..f1293440aa 100644 --- a/common/stdafx.h +++ b/common/stdafx.h @@ -35,16 +35,6 @@ #elif defined(WIN32) -#ifdef _MSC_VER -# pragma warning( disable : 4068 ) // turn off "unknown pragma" warning -# pragma warning( disable : 4244 ) // turn off "conversion from 'type1' to 'type2', possible loss of data" warning -# pragma warning( disable : 4390 ) // turn off "empty controlled statement found" warning -#endif - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - #if !defined(_WIN32_WCE) diff --git a/scumm.vcproj b/scumm.vcproj index 1868081c66..43619692d6 100644 --- a/scumm.vcproj +++ b/scumm.vcproj @@ -20,6 +20,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD" @@ -67,6 +68,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" @@ -115,6 +117,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" @@ -163,6 +166,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB,BYPASS_COPY_PROT,USE_ADLIB" diff --git a/scummvm.vcproj b/scummvm.vcproj index 45c3b43f33..9657de6b4a 100644 --- a/scummvm.vcproj +++ b/scummvm.vcproj @@ -20,6 +20,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,sound,common" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ALLOW_GDI,BYPASS_COPY_PROT" @@ -77,6 +78,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="2" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,sound,common" @@ -134,6 +136,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="2" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,sound,common" @@ -191,6 +194,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,sound,common" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ALLOW_GDI,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD" diff --git a/simon.vcproj b/simon.vcproj index 3fba5779d9..912eaf5ab5 100644 --- a/simon.vcproj +++ b/simon.vcproj @@ -20,6 +20,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" @@ -68,6 +69,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD" @@ -114,6 +116,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB,BYPASS_COPY_PROT,USE_ADLIB" @@ -161,6 +164,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" diff --git a/sky.vcproj b/sky.vcproj index 930ec9c22c..3a42c191c2 100644 --- a/sky.vcproj +++ b/sky.vcproj @@ -20,6 +20,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" @@ -68,6 +69,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" @@ -115,6 +117,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" Optimization="0" AdditionalIncludeDirectories=".,common" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" @@ -162,6 +165,7 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" + AdditionalOptions=" /wd4068 /wd4244 /wd4390" InlineFunctionExpansion="1" OptimizeForProcessor="2" AdditionalIncludeDirectories=".,common" |