From d046b55d1b7e86b76f01b965d8c36a71fcd410f9 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Fri, 20 Mar 2009 22:54:59 +0000 Subject: [PATCH] Change a bunch of project settings to reduce the flood of warnings you get when building in debug mode. Tweak bootup logging a bit. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2706 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/LZO/LZO.vcproj | 6 ----- Externals/wxWidgets/build/msw/wx_base.vcproj | 16 +++++--------- Externals/wxWidgets/build/msw/wx_core.vcproj | 22 +++++-------------- Externals/zlib/zlib.vcproj | 6 ----- Source/Core/Common/Common.vcproj | 6 ----- Source/Core/Core/Core.vcproj | 14 +++--------- Source/Core/Core/Src/Boot/Boot.cpp | 2 ++ Source/Core/Core/Src/Core.cpp | 1 - Source/Core/Core/Src/CoreParameter.cpp | 7 +++--- Source/Core/DebuggerWX/DebuggerWX.vcproj | 10 ++------- Source/Core/DiscIO/DiscIO.vcproj | 8 +------ Source/Core/DolphinWX/DolphinWX.vcproj | 22 +++++++++---------- Source/Core/InputCommon/InputCommon.vcproj | 10 ++------- Source/Core/VideoCommon/VideoCommon.vcproj | 12 +++------- .../Plugin_DSP_HLE/Plugin_DSP_HLE.vcproj | 8 +------ .../Plugin_PadSimple/Plugin_PadSimple.vcproj | 4 +--- .../Plugin_PadSimpleEvnt.vcproj | 8 +------ .../Plugin_VideoDX9/Plugin_VideoDX9.vcproj | 6 ----- .../Plugin_VideoOGL/Plugin_VideoOGL.vcproj | 8 +------ .../Plugin_Wiimote/Plugin_Wiimote.vcproj | 2 -- .../Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj | 2 +- 21 files changed, 43 insertions(+), 137 deletions(-) diff --git a/Externals/LZO/LZO.vcproj b/Externals/LZO/LZO.vcproj index dc42831380..4c6269dee3 100644 --- a/Externals/LZO/LZO.vcproj +++ b/Externals/LZO/LZO.vcproj @@ -52,7 +52,6 @@ FloatingPointModel="0" UsePrecompiledHeader="0" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="4" /> @@ -216,7 +214,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="4" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" /> @@ -295,7 +292,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="4" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" /> @@ -373,7 +369,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" WarningLevel="4" - WarnAsError="false" SuppressStartupBanner="true" /> + + @@ -5798,10 +5796,6 @@ /> - - - - @@ -17024,6 +17008,10 @@ /> + + @@ -129,7 +128,6 @@ PrecompiledHeaderThrough="stdafx.h" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -203,7 +201,6 @@ PrecompiledHeaderThrough="stdafx.h" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -278,7 +275,6 @@ PrecompiledHeaderThrough="stdafx.h" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -349,7 +345,6 @@ PrecompiledHeaderThrough="stdafx.h" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -420,7 +415,6 @@ PrecompiledHeaderThrough="stdafx.h" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index 9b14b65e42..545c87efa9 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -1,7 +1,7 @@ @@ -117,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\Core\Core\Src\Debugger;..\Common\Src;..\DiscIO\Src;..\..\Core\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\LZO;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\zlib" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -126,7 +125,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -201,7 +199,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -278,7 +275,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -352,7 +348,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -426,7 +421,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -501,7 +495,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -578,7 +571,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index b1e033d3a2..95fcc970c0 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -177,6 +177,8 @@ bool CBoot::BootUp() SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter; + NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str()); + g_symbolDB.Clear(); VideoInterface::PreInit(_StartupPara.bNTSC); switch (_StartupPara.m_BootType) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index fe169e7d8e..5ca17d1b5e 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -206,7 +206,6 @@ bool Init() SCoreStartupParameter &_CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; g_CoreStartupParameter = _CoreParameter; - NOTICE_LOG(BOOT, "Starting core"); // FIXME DEBUG_LOG(BOOT, dump_params()); Host_SetWaitCursor(true); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index db1e3ed141..301964a55e 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -194,10 +194,11 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false); m_strSRAM = GC_SRAM_FILE; m_strBios = FULL_GC_SYS_DIR + Region + DIR_SEP GC_IPL; - if (!File::Exists(m_strBios.c_str())) { - WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str()); + //if (!File::Exists(m_strBios.c_str())) { + // WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str()); + // We always HLE the boot. bHLEBios = true; - } + //} return true; } diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index 771380fb23..9e479a75fd 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -47,13 +47,12 @@ Optimization="0" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="4" /> @@ -112,13 +111,12 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\Common\Src" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="2" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" /> @@ -181,7 +179,6 @@ EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" /> @@ -245,7 +242,6 @@ RuntimeLibrary="0" UsePrecompiledHeader="2" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" /> @@ -308,7 +304,6 @@ EnableEnhancedInstructionSet="2" UsePrecompiledHeader="2" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" /> @@ -371,7 +366,6 @@ RuntimeLibrary="0" UsePrecompiledHeader="2" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" /> diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index 5ce4872e26..28f9dbf16d 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -1,7 +1,7 @@ - - - - @@ -1123,6 +1115,14 @@ RelativePath=".\Src\ISOProperties.h" > + + + + diff --git a/Source/Core/InputCommon/InputCommon.vcproj b/Source/Core/InputCommon/InputCommon.vcproj index eaaa42a312..1aa686e530 100644 --- a/Source/Core/InputCommon/InputCommon.vcproj +++ b/Source/Core/InputCommon/InputCommon.vcproj @@ -1,7 +1,7 @@ @@ -139,7 +138,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -227,7 +225,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -316,7 +313,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -405,7 +401,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> @@ -494,7 +489,6 @@ UsePrecompiledHeader="2" AssemblerListingLocation="$(IntDir)\" WarningLevel="3" - WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="stdafx.h" /> diff --git a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj index 732db63072..974da1b8c2 100644 --- a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj +++ b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj @@ -1,7 +1,7 @@ diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj index d027695bb5..9b61e38d04 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj @@ -73,7 +73,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" CompileAs="0" @@ -183,7 +182,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" CompileAs="0" @@ -282,7 +280,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="4" CompileAs="0" @@ -382,7 +379,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" CompileAs="0" @@ -491,7 +487,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" CompileAs="0" @@ -601,7 +596,6 @@ ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" - WarnAsError="false" SuppressStartupBanner="true" DebugInformationFormat="3" CompileAs="0" diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj index 13d77f68f5..48af623807 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj @@ -1,7 +1,7 @@